Skip to content
This repository was archived by the owner on Jul 24, 2019. It is now read-only.

Toolbar Fixes #68

Open
jordandh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Toolbar Fixes #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
008b6e1
Changed updateToolbar to support commands with arguments.
jordandh May 22, 2013
55d8008
Changed updateToolbar's command value comparison to use == so that a …
jordandh May 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions bootstrap-wysiwyg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down