Merge pull request #97 from acrobat/regression-fix

fixes for regression after #72
refactory-id · Aug 29, 2014 · 906a6d7 · 906a6d7
2 parents 509d154 + 71089eb
commit 906a6d7
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/js/bootstrap-markdown.js b/js/bootstrap-markdown.js
@@ -343,6 +343,7 @@
         this.$editor.on('click', '[data-provider="bootstrap-markdown"]', $.proxy(this.__handle, this))
 
         if (this.$element.is(':disabled') || this.$element.is('[readonly]')) {
+          this.$editor.addClass('md-editor-disabled');
           this.disableButtons('all');
         }
 
@@ -359,6 +360,10 @@
           })
         }
 
+        if (options.initialstate === 'preview') {
+          this.showPreview();
+        }
+
       } else {
         this.$editor.show()
       }
@@ -368,10 +373,6 @@
         this.$editor.addClass('active')
       }
 
-      if (options.initialstate === 'preview') {
-        this.showPreview();
-      }
-
       // hide hidden buttons from options
       this.hideButtons(options.hiddenButtons)
 
@@ -447,6 +448,11 @@
       // Attach the editor instances
       replacementContainer.data('markdown',this)
 
+      if (this.$element.is(':disabled') || this.$element.is('[readonly]')) {
+        this.$editor.addClass('md-editor-disabled');
+        this.disableButtons('all');
+      }
+
       return this
     }