@beatnbite authored 6 months ago

I've updated this now with the changes submitted by @beanbrite in Merge #118 and cleaned up the merge.

Author: Steve King

bootstrap-wysiwyg.js

@@ -26,13 +26,12 @@
 			updateToolbar = function () {
 				if (options.activeToolbarClass) {
 					$(options.toolbarSelector).find(toolbarBtnSelector).each(function () {
-						var command = $(this).data(options.commandRole).split(' ')[0];
-						if (document.queryCommandSupported(command)) {
-							if (document.queryCommandState(command)) {
-								$(this).addClass(options.activeToolbarClass);
-							} else {
-								$(this).removeClass(options.activeToolbarClass);
-							}
+						var command = $(this).data(options.commandRole),
+							format = command.match(/formatBlock (.+)/);
+						if (document.queryCommandState(command) || (format && (format[1] == document.queryCommandValue("formatBlock")))) {
+							$(this).addClass(options.activeToolbarClass);
+						} else {
+							$(this).removeClass(options.activeToolbarClass);
 						}
 					});
 				}