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

Merge pull request #6202 from netchampfaris/quill-div-block

Browse source 
Quill fixes
This commit is contained in:
Faris Ansari 2018-10-05 13:54:09 +05:30 • committed by GitHub
commit 8a6d9752fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frappe/public/js/frappe/form/controls/text_editor.js
View file

@ -3,6 +3,11 @@ import { ImageDrop } from 'quill-image-drop-module';
Quill.register('modules/imageDrop', ImageDrop);
// replace <p> tag with <div>
const Block = Quill.import('blots/block');
Block.tagName = 'DIV';
Quill.register(Block, true);
frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
make_input() {
this.has_input = true;
@ -17,10 +22,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
},
bind_events() {
this.quill.on('text-change', frappe.utils.debounce(() => {
const input_value = this.get_input_value();
if (this.value === input_value) return;
this.quill.on('text-change', frappe.utils.debounce((delta, oldDelta, source) => {
if (!this.is_quill_dirty(source)) return;
const input_value = this.get_input_value();
this.parse_validate_and_set_in_model(input_value);
}, 300));
@ -60,6 +65,12 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
});
},
is_quill_dirty(source) {
if (source === 'api') return false;
let input_value = this.get_input_value();
return this.value !== input_value;
},
get_quill_options() {
return {
modules: {
@ -91,9 +102,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
},
set_formatted_input(value) {
if (!this.quill) return;
if (!(this.quill && value)) return;
if (value === this.get_input_value()) return;
this.quill.setContents(this.quill.clipboard.convert(value));
this.quill.setText('');
this.quill.clipboard.dangerouslyPasteHTML(0, value);
},
get_input_value() {