changes to shortcut keys so they all work in IE

This commit is contained in:
Chad Pilkey 2017-03-22 19:53:12 -04:00
parent 5fd7384b4f
commit 4515c08654
3 changed files with 27 additions and 20 deletions

View File

@ -482,14 +482,17 @@ bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigat
bbb.accessibility.notes.notesview.input = Notes input bbb.accessibility.notes.notesview.input = Notes input
bbb.shortcuthelp.title = Shortcut Keys bbb.shortcuthelp.title = Shortcut Keys
bbb.shortcuthelp.titleBar = Shortcut Keys Window Title Bar
bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimize the Shortcut Help Window bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimize the Shortcut Help Window
bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maximize the Shortcut Help Window bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maximize the Shortcut Help Window
bbb.shortcuthelp.closeBtn.accessibilityName = Close the Shortcut Help Window bbb.shortcuthelp.closeBtn.accessibilityName = Close the Shortcut Help Window
bbb.shortcuthelp.dropdown.accessibilityName = Shortcut Category
bbb.shortcuthelp.dropdown.general = Global shortcuts bbb.shortcuthelp.dropdown.general = Global shortcuts
bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
bbb.shortcuthelp.dropdown.chat = Chat shortcuts bbb.shortcuthelp.dropdown.chat = Chat shortcuts
bbb.shortcuthelp.dropdown.users = Users shortcuts bbb.shortcuthelp.dropdown.users = Users shortcuts
bbb.shortcuthelp.dropdown.caption = Closed Caption shortcuts bbb.shortcuthelp.dropdown.caption = Closed Caption shortcuts
bbb.shortcuthelp.browserWarning.text = The full list of shortcuts are only supported in Internet Explorer.
bbb.shortcuthelp.headers.shortcut = Shortcut bbb.shortcuthelp.headers.shortcut = Shortcut
bbb.shortcuthelp.headers.function = Function bbb.shortcuthelp.headers.function = Function
@ -532,7 +535,7 @@ bbb.shortcutkey.logout.function = Log out of this meeting
bbb.shortcutkey.raiseHand = 82 bbb.shortcutkey.raiseHand = 82
bbb.shortcutkey.raiseHand.function = Raise your hand bbb.shortcutkey.raiseHand.function = Raise your hand
bbb.shortcutkey.present.upload = 85 bbb.shortcutkey.present.upload = 89
bbb.shortcutkey.present.upload.function = Upload presentation bbb.shortcutkey.present.upload.function = Upload presentation
bbb.shortcutkey.present.previous = 65 bbb.shortcutkey.present.previous = 65
bbb.shortcutkey.present.previous.function = Go to previous slide bbb.shortcutkey.present.previous.function = Go to previous slide
@ -542,19 +545,17 @@ bbb.shortcutkey.present.next = 69
bbb.shortcutkey.present.next.function = Go to next slide bbb.shortcutkey.present.next.function = Go to next slide
bbb.shortcutkey.present.fitWidth = 70 bbb.shortcutkey.present.fitWidth = 70
bbb.shortcutkey.present.fitWidth.function = Fit slides to width bbb.shortcutkey.present.fitWidth.function = Fit slides to width
bbb.shortcutkey.present.fitPage = 80 bbb.shortcutkey.present.fitPage = 82
bbb.shortcutkey.present.fitPage.function = Fit slides to page bbb.shortcutkey.present.fitPage.function = Fit slides to page
bbb.shortcutkey.users.makePresenter = 80 bbb.shortcutkey.users.makePresenter = 89
bbb.shortcutkey.users.makePresenter.function = Make selected person presenter bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
bbb.shortcutkey.users.kick = 75 bbb.shortcutkey.users.kick = 69
bbb.shortcutkey.users.kick.function = Kick selected person from the meeting bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
bbb.shortcutkey.users.mute = 83 bbb.shortcutkey.users.mute = 83
bbb.shortcutkey.users.mute.function = Mute or unmute selected person bbb.shortcutkey.users.mute.function = Mute or unmute selected person
bbb.shortcutkey.users.muteall = 65 bbb.shortcutkey.users.muteall = 65
bbb.shortcutkey.users.muteall.function = Mute or unmute all users bbb.shortcutkey.users.muteall.function = Mute or unmute all users
bbb.shortcutkey.users.focusUsers = 85
bbb.shortcutkey.users.focusUsers.function = Focus to users list
bbb.shortcutkey.users.muteAllButPres = 65 bbb.shortcutkey.users.muteAllButPres = 65
bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
bbb.shortcutkey.users.breakoutRooms = 75 bbb.shortcutkey.users.breakoutRooms = 75
@ -563,12 +564,12 @@ bbb.shortcutkey.users.focusBreakoutRooms = 82
bbb.shortcutkey.users.focusBreakoutRooms.function = Focus to breakout rooms list bbb.shortcutkey.users.focusBreakoutRooms.function = Focus to breakout rooms list
bbb.shortcutkey.users.listenToBreakoutRoom = 76 bbb.shortcutkey.users.listenToBreakoutRoom = 76
bbb.shortcutkey.users.listenToBreakoutRoom.function = Listen to selected breakout room bbb.shortcutkey.users.listenToBreakoutRoom.function = Listen to selected breakout room
bbb.shortcutkey.users.joinBreakoutRoom = 74 bbb.shortcutkey.users.joinBreakoutRoom = 79
bbb.shortcutkey.users.joinBreakoutRoom.function = Join selected breakout room bbb.shortcutkey.users.joinBreakoutRoom.function = Join selected breakout room
bbb.shortcutkey.chat.focusTabs = 89 bbb.shortcutkey.chat.focusTabs = 89
bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
bbb.shortcutkey.chat.focusBox = 66 bbb.shortcutkey.chat.focusBox = 77
bbb.shortcutkey.chat.focusBox.function = Focus to chat box bbb.shortcutkey.chat.focusBox.function = Focus to chat box
bbb.shortcutkey.chat.changeColour = 67 bbb.shortcutkey.chat.changeColour = 67
bbb.shortcutkey.chat.changeColour.function = Focus to font color picker. bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.

View File

@ -81,7 +81,7 @@ function determineGlobalAlternateModifier()
// modifier = "control+alt"; // modifier = "control+alt";
//} //}
else{ else{
modifier = "control+shift"; modifier = "control+shift+";
} }
return modifier; return modifier;
} }

View File

@ -71,7 +71,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var chatResource:Array = ['bbb.shortcutkey.chat.focusTabs', 'bbb.shortcutkey.chat.focusBox', 'bbb.shortcutkey.chat.sendMessage', private var chatResource:Array = ['bbb.shortcutkey.chat.focusTabs', 'bbb.shortcutkey.chat.focusBox', 'bbb.shortcutkey.chat.sendMessage',
'bbb.shortcutkey.chat.closePrivate']; 'bbb.shortcutkey.chat.closePrivate'];
private var userResource:Array = ['bbb.shortcutkey.users.focusUsers', 'bbb.shortcutkey.users.makePresenter', 'bbb.shortcutkey.users.mute', private var userResource:Array = ['bbb.shortcutkey.users.makePresenter', 'bbb.shortcutkey.users.mute',
'bbb.shortcutkey.users.kick', 'bbb.shortcutkey.users.muteall', 'bbb.shortcutkey.users.focusBreakoutRooms', 'bbb.shortcutkey.users.kick', 'bbb.shortcutkey.users.muteall', 'bbb.shortcutkey.users.focusBreakoutRooms',
'bbb.shortcutkey.users.listenToBreakoutRoom', 'bbb.shortcutkey.users.joinBreakoutRoom']; 'bbb.shortcutkey.users.listenToBreakoutRoom', 'bbb.shortcutkey.users.joinBreakoutRoom'];
@ -99,6 +99,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function populateModules():void{ private function populateModules():void{
categoryAC.addItem(generalString); categoryAC.addItem(generalString);
if (Capabilities.playerType == "ActiveX") {
if (ShortcutOptions.usersActive) if (ShortcutOptions.usersActive)
categoryAC.addItem(userString); categoryAC.addItem(userString);
@ -107,6 +109,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (ShortcutOptions.chatActive) if (ShortcutOptions.chatActive)
categoryAC.addItem(chatString); categoryAC.addItem(chatString);
} else {
browserWarningText.visible = browserWarningText.includeInLayout = true;
}
} }
private function reloadKeys():void { private function reloadKeys():void {
@ -249,10 +254,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]> ]]>
</mx:Script> </mx:Script>
<common:TabIndexer id="headerIndexer" startIndex="101" tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn]}"/> <common:TabIndexer id="headerIndexer" startIndex="115" tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn]}"/>
<common:TabIndexer startIndex="115" tabIndices="{[categories, keyList]}"/> <common:TabIndexer startIndex="119" tabIndices="{[categories, keyList]}"/>
<mx:ComboBox id="categories" labelField="Please select an area for which to view shortcut keys: " <mx:ComboBox id="categories" accessibilityName="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.dropdown.accessibilityName')}"
editable="false" editable="false"
change="changeArray()"> change="changeArray()">
<mx:ArrayCollection id="categoryAC"> <mx:ArrayCollection id="categoryAC">
@ -264,6 +269,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
--> -->
</mx:ArrayCollection> </mx:ArrayCollection>
</mx:ComboBox> </mx:ComboBox>
<mx:Text id="browserWarningText" visible="false" includeInLayout="false" text="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.browserWarning.text')}" />
<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%"> <mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%">
<mx:columns> <mx:columns>
<mx:DataGridColumn dataField="shortcut" width="150" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/> <mx:DataGridColumn dataField="shortcut" width="150" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/>