Merge pull request #73 from tremby/wysihtml5

--- This is tiff/wysihtml5#461 which I wrote last year some time, rebased on to your fork. This patch allows the classes set on toolbar buttons to be set in the wysihtml5 configuration, as `classNameCommandDisabled`, `classNameCommandsDisabled`, `classNameCommandActive`, `classNameActionActive`. I already have disabled and active classes provided by Twitter Bootstrap and dont want to trawl through the source files and apply all relevant styles to wysihtml5-specific classes too -- this is a very nice short cut.
Voog · Aug 21, 2014 · 383d7ae · 383d7ae
2 parents 5525a1b + b25f36f
commit 383d7ae
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/dist/wysihtml5x-toolbar.js b/dist/wysihtml5x-toolbar.js
@@ -13478,6 +13478,19 @@ wysihtml5.views.View = Base.extend(
       this._observe();
       if (showOnInit) { this.show(); }
 
+      if (editor.config.classNameCommandDisabled != null) {
+        CLASS_NAME_COMMAND_DISABLED = editor.config.classNameCommandDisabled;
+      }
+      if (editor.config.classNameCommandsDisabled != null) {
+        CLASS_NAME_COMMANDS_DISABLED = editor.config.classNameCommandsDisabled;
+      }
+      if (editor.config.classNameCommandActive != null) {
+        CLASS_NAME_COMMAND_ACTIVE = editor.config.classNameCommandActive;
+      }
+      if (editor.config.classNameActionActive != null) {
+        CLASS_NAME_ACTION_ACTIVE = editor.config.classNameActionActive;
+      }
+
       var speechInputLinks  = this.container.querySelectorAll("[data-wysihtml5-command=insertSpeech]"),
           length            = speechInputLinks.length,
           i                 = 0;

diff --git a/dist/wysihtml5x-toolbar.min.js b/dist/wysihtml5x-toolbar.min.js
diff --git a/dist/wysihtml5x-toolbar.min.map b/dist/wysihtml5x-toolbar.min.map
diff --git a/dist/wysihtml5x.min.js b/dist/wysihtml5x.min.js
diff --git a/src/toolbar/toolbar.js b/src/toolbar/toolbar.js
@@ -34,6 +34,19 @@
       this._observe();
       if (showOnInit) { this.show(); }
 
+      if (editor.config.classNameCommandDisabled != null) {
+        CLASS_NAME_COMMAND_DISABLED = editor.config.classNameCommandDisabled;
+      }
+      if (editor.config.classNameCommandsDisabled != null) {
+        CLASS_NAME_COMMANDS_DISABLED = editor.config.classNameCommandsDisabled;
+      }
+      if (editor.config.classNameCommandActive != null) {
+        CLASS_NAME_COMMAND_ACTIVE = editor.config.classNameCommandActive;
+      }
+      if (editor.config.classNameActionActive != null) {
+        CLASS_NAME_ACTION_ACTIVE = editor.config.classNameActionActive;
+      }
+
       var speechInputLinks  = this.container.querySelectorAll("[data-wysihtml5-command=insertSpeech]"),
           length            = speechInputLinks.length,
           i                 = 0;