Merge pull request #89 from solomax/patch-2

Update bootstrap-wysiwyg.js
sebfz1 · Feb 21, 2014 · fb25fe7 · fb25fe7
2 parents 3f26dd8 + e84bcbd
commit fb25fe7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...esources/com/googlecode/wicket/jquery/ui/plugins/wysiwyg/resource/js/bootstrap-wysiwyg.js b/...esources/com/googlecode/wicket/jquery/ui/plugins/wysiwyg/resource/js/bootstrap-wysiwyg.js
@@ -26,9 +26,16 @@
             updateToolbar = function () {
                 if (options.activeToolbarClass) {
                     $(options.toolbarSelector).find(toolbarBtnSelector).each(function () {
-                        var command = $(this).data(options.commandRole);
-                        if (document.queryCommandState(command)) {
+                        var commandArr = $(this).data(options.commandRole).split(' '),
+                            command = commandArr[0];
+
+                        // If the command has an argument and its value matches this button. == used for string/number comparison
+                        if (commandArr.length > 1 && document.queryCommandEnabled(command) && document.queryCommandValue(command) == commandArr[1]) {
                             $(this).addClass(options.activeToolbarClass);
+                        // Else if the command has no arguments and it is active
+                        } else if (commandArr.length === 1 && document.queryCommandEnabled(command) && document.queryCommandState(command)) {
+                            $(this).addClass(options.activeToolbarClass);
+                        // Else the command is not active
                         } else {
                             $(this).removeClass(options.activeToolbarClass);
                         }