tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Get rid of mentions fix.

pull/502/head
Sebastian 6 years ago
parent
8b4e5cf765
commit
d564802439
4 changed files with 65 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      frontend/app/shared/components/comments/comment.component.html
  2. 7
      frontend/app/shared/components/comments/comments.component.html
  3. 102
      frontend/package-lock.json
  4. 18
      frontend/package.json

7
frontend/app/shared/components/comments/comment.component.html
View File

@ -30,7 +30,6 @@
[(ngModel)]="editingText" [(ngModel)]="editingText"
[mention]="mentionUsers" [mention]="mentionUsers"
[mentionConfig]="mentionConfig" [mentionConfig]="mentionConfig"
[mentionListTemplate]="mentionListTemplate"
(keydown)="updateWhenEnter($event)"></textarea> (keydown)="updateWhenEnter($event)"></textarea>
<div> <div>
@ -58,8 +57,4 @@
<i class="icon-bin2"></i> <i class="icon-bin2"></i>
</button> </button>
</div> </div>
</div> </div>
<ng-template #mentionListTemplate let-item="item">
{{item['contributorEmail']}}
</ng-template>

7
frontend/app/shared/components/comments/comments.component.html
View File

@ -19,16 +19,11 @@
</div> </div>
</div> </div>
<div class="comments-footer"> <div class="comments-footer">
<ng-template #mentionListTemplate let-item="item">
{{item['contributorEmail']}}
</ng-template>
<form [formGroup]="commentForm.form" (ngSubmit)="comment()"> <form [formGroup]="commentForm.form" (ngSubmit)="comment()">
<input class="form-control" name="text" formControlName="text" placeholder="Create a comment" <input class="form-control" name="text" formControlName="text" placeholder="Create a comment"
[mention]="users" [mention]="users"
[mentionConfig]="mentionConfig" [mentionConfig]="mentionConfig"
[mentionListTemplate]="mentionListTemplate"
autocomplete="off" autocomplete="off"
autocorrect="off" autocorrect="off"
autocapitalize="off" /> autocapitalize="off" />

102
frontend/package-lock.json
View File

@ -5,9 +5,9 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@angular-devkit/build-optimizer": { "@angular-devkit/build-optimizer": {
"version": "0.900.5", "version": "0.900.6",
"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.900.5.tgz", "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.900.6.tgz",
"integrity": "sha512-BdmvD58DnAAf6/o/fRzU2l+2g4IwuIJf8x/rd9AGWd7fHrcwgJDhB9rYetB7JqYR8uOWk+AFElDpvNOj8YUy0w==", "integrity": "sha512-K8BDga/E1tUCuUnpnCCAR5yh8lfJqHSBvk1K9P5LgqQNxPvSedghyQ4LYNaeRRVIVmsh4RdsJ7hvmquFrFnTZg==",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "1.2.3", "loader-utils": "1.2.3",
@ -82,9 +82,9 @@
} }
}, },
"@angular-devkit/core": { "@angular-devkit/core": {
"version": "9.0.5", "version": "9.0.6",
"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.5.tgz", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz",
"integrity": "sha512-9TPQPzfSRbV5wVEnfo1d1CS+oVXROfE7VnBRuRMilFnNhuc29wX3zvBQRTreDVyxJetLBEb9sRlcKYGaJzpKPw==", "integrity": "sha512-hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "6.10.2", "ajv": "6.10.2",
@ -159,9 +159,9 @@
"integrity": "sha512-LNtzUrrjqLTlZyhuAEV0sdEV0yi52Ih/p+ozCr/ivhTSSemcPbniTBbJlFZO4NJ2BuS2iEXkXwZs3mm8Fvx5Sg==" "integrity": "sha512-LNtzUrrjqLTlZyhuAEV0sdEV0yi52Ih/p+ozCr/ivhTSSemcPbniTBbJlFZO4NJ2BuS2iEXkXwZs3mm8Fvx5Sg=="
}, },
"@angular/cdk": { "@angular/cdk": {
"version": "9.1.2", "version": "9.1.3",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.2.tgz", "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.3.tgz",
"integrity": "sha512-x5niyE0iYrbVtLYjJFw2MoS+OoSbJn6y/G2pNScviDwyjBBgqRh4YgUox2kMhdPumkvuh+eA6blZoE9qpvSo2w==", "integrity": "sha512-K6XJzfqP+PE0ahyBUYrnoW+3ocwDpPN3dE9a+XRtZ0vM4P/FElweWj5zjNwWktb+uF9yal6oMPWXJNOAfonpPw==",
"requires": { "requires": {
"parse5": "^5.0.0" "parse5": "^5.0.0"
} }
@ -415,12 +415,12 @@
"dev": true "dev": true
}, },
"@ngtools/webpack": { "@ngtools/webpack": {
"version": "9.0.5", "version": "9.0.6",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.0.5.tgz", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.0.6.tgz",
"integrity": "sha512-xe0rGpme04MNRK/PpPOx8cza9k8F/XuAOmxC3Tk4dIgigqIzYsP6v6N/At8vPRDrf88X4ZyR94lL5RrUYf/KNQ==", "integrity": "sha512-1R6xuQKBlVdf1lPsjN9S/BRCxPTRPPDN3E3unX2Nw4wK8XBWwm5CuSeEgp33PCwMpyWPaa7bg25Nz3Zt+DIlSQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@angular-devkit/core": "9.0.5", "@angular-devkit/core": "9.0.6",
"enhanced-resolve": "4.1.1", "enhanced-resolve": "4.1.1",
"rxjs": "6.5.3", "rxjs": "6.5.3",
"webpack-sources": "1.4.3" "webpack-sources": "1.4.3"
@ -882,9 +882,9 @@
"dev": true "dev": true
}, },
"angular-mentions": { "angular-mentions": {
"version": "1.1.3", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.1.3.tgz", "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.1.4.tgz",
"integrity": "sha512-gTe20SQSS62FLW1dOptskeAfeLni9W3IBzTlki3veM+fbMbLeZpqbel7rfHGT15fymm2gTBcrsRyM/wRfItjHQ==", "integrity": "sha512-JGOSAuTxQub2rjtDke0aS+PXH8VTMG5hRwtX3LNYr+JqcoqU8uPobKRSHj/mpvYibPMdFIISmAODCZRuwAfltA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
@ -2019,9 +2019,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001033", "version": "1.0.30001035",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz",
"integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==", "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==",
"dev": true "dev": true
}, },
"canonical-path": { "canonical-path": {
@ -3128,9 +3128,9 @@
} }
}, },
"date-fns": { "date-fns": {
"version": "2.10.0", "version": "2.11.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.10.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz",
"integrity": "sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==" "integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA=="
}, },
"date-format": { "date-format": {
"version": "2.1.0", "version": "2.1.0",
@ -4321,19 +4321,19 @@
} }
}, },
"file-loader": { "file-loader": {
"version": "5.1.0", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
"integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==", "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "^1.4.0", "loader-utils": "^2.0.0",
"schema-utils": "^2.5.0" "schema-utils": "^2.6.5"
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.11.0", "version": "6.12.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
"integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
@ -4373,32 +4373,38 @@
"dev": true "dev": true
}, },
"json5": { "json5": {
"version": "1.0.1", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"minimist": "^1.2.0" "minimist": "^1.2.5"
} }
}, },
"loader-utils": { "loader-utils": {
"version": "1.4.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"big.js": "^5.2.2", "big.js": "^5.2.2",
"emojis-list": "^3.0.0", "emojis-list": "^3.0.0",
"json5": "^1.0.1" "json5": "^2.1.2"
} }
}, },
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
"dev": true
},
"schema-utils": { "schema-utils": {
"version": "2.6.4", "version": "2.6.5",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==", "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "^6.10.2", "ajv": "^6.12.0",
"ajv-keywords": "^3.4.1" "ajv-keywords": "^3.4.1"
} }
}, },
@ -12485,9 +12491,9 @@
"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
}, },
"tslint": { "tslint": {
"version": "6.0.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz", "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz",
"integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==", "integrity": "sha512-fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -15404,9 +15410,9 @@
"dev": true "dev": true
}, },
"zone.js": { "zone.js": {
"version": "0.10.2", "version": "0.10.3",
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
"integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==" "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
} }
} }
} }

18
frontend/package.json
View File

@ -17,7 +17,7 @@
}, },
"dependencies": { "dependencies": {
"@angular/animations": "9.0.6", "@angular/animations": "9.0.6",
"@angular/cdk": "9.1.2", "@angular/cdk": "9.1.3",
"@angular/common": "9.0.6", "@angular/common": "9.0.6",
"@angular/core": "9.0.6", "@angular/core": "9.0.6",
"@angular/forms": "9.0.6", "@angular/forms": "9.0.6",
@ -25,13 +25,13 @@
"@angular/platform-browser-dynamic": "9.0.6", "@angular/platform-browser-dynamic": "9.0.6",
"@angular/platform-server": "9.0.6", "@angular/platform-server": "9.0.6",
"@angular/router": "9.0.6", "@angular/router": "9.0.6",
"angular-mentions": "^1.1.3", "angular-mentions": "1.1.4",
"angular2-chartjs": "0.5.1", "angular2-chartjs": "0.5.1",
"babel-polyfill": "6.26.0", "babel-polyfill": "6.26.0",
"bootstrap": "4.4.1", "bootstrap": "4.4.1",
"core-js": "3.6.4", "core-js": "3.6.4",
"cropperjs": "2.0.0-alpha.1", "cropperjs": "2.0.0-alpha.1",
"date-fns": "^2.10.0", "date-fns": "2.11.0",
"graphiql": "0.17.5", "graphiql": "0.17.5",
"graphql": "14.6.0", "graphql": "14.6.0",
"image-focus": "^1.1.0", "image-focus": "^1.1.0",
@ -47,13 +47,13 @@
"rxjs": "6.5.4", "rxjs": "6.5.4",
"slugify": "1.4.0", "slugify": "1.4.0",
"tslib": "1.11.1", "tslib": "1.11.1",
"zone.js": "0.10.2" "zone.js": "0.10.3"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-optimizer": "0.900.5", "@angular-devkit/build-optimizer": "0.900.6",
"@angular/compiler": "9.0.6", "@angular/compiler": "9.0.6",
"@angular/compiler-cli": "9.0.6", "@angular/compiler-cli": "9.0.6",
"@ngtools/webpack": "9.0.5", "@ngtools/webpack": "9.0.6",
"@types/core-js": "2.5.3", "@types/core-js": "2.5.3",
"@types/jasmine": "3.5.9", "@types/jasmine": "3.5.9",
"@types/marked": "0.7.3", "@types/marked": "0.7.3",
@ -64,13 +64,13 @@
"@types/react-dom": "16.9.5", "@types/react-dom": "16.9.5",
"@types/tinymce": "^4.5.24", "@types/tinymce": "^4.5.24",
"browserslist": "4.9.1", "browserslist": "4.9.1",
"caniuse-lite": "1.0.30001033", "caniuse-lite": "1.0.30001035",
"circular-dependency-plugin": "5.2.0", "circular-dependency-plugin": "5.2.0",
"codelyzer": "5.2.1", "codelyzer": "5.2.1",
"css-loader": "3.4.2", "css-loader": "3.4.2",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
"entities": "^2.0.0", "entities": "^2.0.0",
"file-loader": "5.1.0", "file-loader": "6.0.0",
"html-loader": "0.5.5", "html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0", "html-webpack-plugin": "3.2.0",
"ignore-loader": "0.1.2", "ignore-loader": "0.1.2",
@ -104,7 +104,7 @@
"terser-webpack-plugin": "2.3.5", "terser-webpack-plugin": "2.3.5",
"ts-loader": "6.2.1", "ts-loader": "6.2.1",
"tsconfig-paths-webpack-plugin": "3.2.0", "tsconfig-paths-webpack-plugin": "3.2.0",
"tslint": "6.0.0", "tslint": "6.1.0",
"tslint-immutable": "6.0.1", "tslint-immutable": "6.0.1",
"tslint-webpack-plugin": "2.1.0", "tslint-webpack-plugin": "2.1.0",
"typemoq": "2.1.0", "typemoq": "2.1.0",

Write Preview
Loading…
Cancel
Save