vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wip

Browse source
This commit is contained in:
Faris Ansari 2018-10-17 16:32:28 +05:30
parent 226c017283
commit a6fc2caed0
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/public/js/frappe/form/controls/comment.js
View file

@ -1,5 +1,8 @@
// import Quill from 'quill/dist/quill';
import 'quill-mention';
// Quill.register('modules/mention', QuillMention);
frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
make_wrapper() {
this.comment_wrapper = !this.no_wrapper ? $(`
@ -68,9 +71,9 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
const options = this._super();
return Object.assign(options, {
theme: 'bubble',
// modules: Object.assign(options.modules, {
// mention: this.get_mention_options()
// })
modules: Object.assign(options.modules, {
mention: this.get_mention_options()
})
});
},

2
package.json
View file

@ -28,7 +28,7 @@
"moment-timezone": "^0.5.21",
"quill": "2.0.0-dev.2",
"quill-image-drop-module": "^1.0.3",
"quill-mention": "^2.0.2",
"quill-mention": "^2.0.4",
"redis": "^2.8.0",
"showdown": "^1.8.6",
"socket.io": "^2.0.4",

8
yarn.lock
View file

@ -3036,10 +3036,10 @@ quill-image-drop-module@^1.0.3:
dependencies:
quill "^1.2.2"
quill-mention@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.2.tgz#8e89e1d6b625d2df1b5a04af9338e35b18e91fce"
integrity sha512-G6VDFWVXO4ERuPamZEk+2VLvngZV18OxEzjPXsSayQij6K/s3RziiLEQ9MmRAr4umQVJ85W2VB7l4dX2qIW0MQ==
quill-mention@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.4.tgz#4b636a4cc68945697d998d00bc035392dc8dc46a"
integrity sha512-nooIgpYPs1B76lqxCPR63Hdk0LEaMTxmXtC4feZz9q0K6gyNGDItrvdEsc+pltEEEro2pkOP8w1ibM1ldvDVvA==
dependencies:
quill "^1.3.4"