Make sure data-placeholder is set before registering emitter listener

joelcarrier · Oct 12, 2016 · 190d0b1 · 190d0b1
1 parent cec838e
commit 190d0b1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/core/quill.js b/core/quill.js
@@ -67,24 +67,24 @@ class Quill {
     });
     this.editor = new Editor(this.scroll, this.emitter);
     this.selection = new Selection(this.scroll, this.emitter);
-    this.emitter.on(Emitter.events.EDITOR_CHANGE, (type) => {
-      if (type === Emitter.events.TEXT_CHANGE) {
-        this.root.classList.toggle('ql-blank', this.editor.isBlank());
-      }
-    });
     this.theme = new options.theme(this, options);
     this.keyboard = this.theme.addModule('keyboard');
     this.clipboard = this.theme.addModule('clipboard');
     this.history = this.theme.addModule('history');
     this.theme.init();
+    if (options.placeholder) {
+      this.root.dataset.placeholder = options.placeholder;
+    }
+    this.emitter.on(Emitter.events.EDITOR_CHANGE, (type) => {
+      if (type === Emitter.events.TEXT_CHANGE) {
+        this.root.classList.toggle('ql-blank', this.editor.isBlank());
+      }
+    });
     this.pasteHTML(`<div class='ql-editor' style="white-space: normal;">${html}<p><br></p></div>`);
     this.history.clear();
     if (options.readOnly) {
       this.disable();
     }
-    if (options.placeholder) {
-      this.root.dataset.placeholder = options.placeholder;
-    }
   }
 
   addContainer(container, refNode = null) {