Merge branch 'develop'

slab · Oct 17, 2016 · 03280c3 · 03280c3
2 parents 1a2a6c6 + 43bc3ee
commit 03280c3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/quill.js b/core/quill.js
@@ -72,20 +72,20 @@ class Quill {
     this.clipboard = this.theme.addModule('clipboard');
     this.history = this.theme.addModule('history');
     this.theme.init();
-    let contents = this.clipboard.convert(`<div class='ql-editor' style="white-space: normal;">${html}<p><br></p></div>`);
-    this.setContents(contents);
     this.emitter.on(Emitter.events.EDITOR_CHANGE, (type) => {
       if (type === Emitter.events.TEXT_CHANGE) {
         this.root.classList.toggle('ql-blank', this.editor.isBlank());
       }
     });
+    let contents = this.clipboard.convert(`<div class='ql-editor' style="white-space: normal;">${html}<p><br></p></div>`);
+    this.setContents(contents);
     this.history.clear();
-    if (this.options.readOnly) {
-      this.disable();
-    }
     if (this.options.placeholder) {
       this.root.setAttribute('data-placeholder', this.options.placeholder);
     }
+    if (this.options.readOnly) {
+      this.disable();
+    }
   }
 
   addContainer(container, refNode = null) {