diff --git a/bigbluebutton-client/resources/prod/lib/bbb_blinker.js b/bigbluebutton-client/resources/prod/lib/bbb_blinker.js index 1eb2bc24632649fca521c878144bfd91a287b40e..223b12e20c1254d7e53f9672c77b78fb99f4c4d5 100755 --- a/bigbluebutton-client/resources/prod/lib/bbb_blinker.js +++ b/bigbluebutton-client/resources/prod/lib/bbb_blinker.js @@ -64,6 +64,28 @@ function determineGlobalModifier() return modifier; } +function determineGlobalAlternateModifier() +{ + var browser = determineBrowser()[0]; + var modifier; + if (browser == "Firefox"){ + modifier = "control+"; + } + else if (browser == "Chrome"){ + modifier = "control+"; + } + else if (browser == "Microsoft Internet Explorer"){ + modifier = "control+shift+"; + } + //else if (browser == "Safari"){ + // modifier = "control+alt"; + //} + else{ + modifier = "control+shift"; + } + return modifier; +} + function determineBrowser() { // Browser name extraction code provided by http://www.javascripter.net/faq/browsern.htm diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml index 1891739534726f1be1799d3ac58f6c03db25e16b..10505e152e7f07c86c1580f8ecc64b721b060acd 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml @@ -80,10 +80,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. private var modifier:String; private var globalModifier:String; + private var globalAlternateModifier:String; private function init():void { modifier = ExternalInterface.call("determineModifier"); globalModifier = ExternalInterface.call("determineGlobalModifier"); + globalAlternateModifier = ExternalInterface.call("determineGlobalAlternateModifier"); ShortcutOptions.initialize(); @@ -194,8 +196,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. || convKey == ResourceUtil.getInstance().getString('bbb.shortcutkey.specialKeys.right') || convKey == ResourceUtil.getInstance().getString('bbb.shortcutkey.specialKeys.down')){ keyList.addItem({shortcut:convKey, func:(ResourceUtil.getInstance().getString(resource[i] + '.function'))}); - } - else{ + } else if (convKey == ResourceUtil.getInstance().getString('bbb.shortcutkey.specialKeys.minus') + || convKey == ResourceUtil.getInstance().getString('bbb.shortcutkey.specialKeys.plus')) { + keyList.addItem({shortcut:globalAlternateModifier + convKey, func:(ResourceUtil.getInstance().getString(resource[i] + '.function'))}); + } else{ keyList.addItem({shortcut:mod + convKey, func:(ResourceUtil.getInstance().getString(resource[i] + '.function'))}); } }