diff --git a/bigbluebutton-client/src/SharedNotesModule.mxml b/bigbluebutton-client/src/SharedNotesModule.mxml index efd29a7245..559faa163b 100755 --- a/bigbluebutton-client/src/SharedNotesModule.mxml +++ b/bigbluebutton-client/src/SharedNotesModule.mxml @@ -30,8 +30,6 @@ with BigBlueButton; if not, see . . +* +*/ +package org.bigbluebutton.common +{ + import flash.ui.ContextMenu; + + import flexlib.mdi.containers.MDIWindow; + import flexlib.mdi.managers.MDIManager; + + import mx.utils.ObjectUtil; + + /** + * This class exists so we can properly handle context menus on MDIWindow + * instances. Also, we'll be able in the future to properly handle shortcuts + * such as SHIFT + LEFT/RIGHT ARROW while in a text area (today, besides + * selecting the text, it will move the window). + */ + public class CustomMdiWindow extends MDIWindow { + + private static const IGNORED_MENU_ITEMS:Array = new Array( + MDIWindow.CONTEXT_MENU_LABEL_CLOSE, + MDIManager.CONTEXT_MENU_LABEL_TILE, + MDIManager.CONTEXT_MENU_LABEL_TILE_FILL, + MDIManager.CONTEXT_MENU_LABEL_CASCADE, + MDIManager.CONTEXT_MENU_LABEL_SHOW_ALL ); + + private var _customContextMenuItems:Array = null; + + private function filterContextMenu(item:*, index:int, array:Array):Boolean { + return IGNORED_MENU_ITEMS.indexOf(item.caption) < 0; + } + + override public function updateContextMenu():void { + super.updateContextMenu(); + + var modifiedContextMenuItems:Array = new Array(); + + if (customContextMenuItems != null) { + if (modifiedContextMenuItems.length > 0 && customContextMenuItems.length > 0) { + modifiedContextMenuItems[0].separatorBefore = true; + } + modifiedContextMenuItems = customContextMenuItems.concat(modifiedContextMenuItems); + } + + if (this.contextMenu != null) { + var filteredMenu:Array = this.contextMenu.customItems.filter(filterContextMenu); + if (modifiedContextMenuItems.length > 0 && filteredMenu.length > 0) { + filteredMenu[0].separatorBefore = true; + } + modifiedContextMenuItems = modifiedContextMenuItems.concat(filteredMenu); + } + + var modifiedContextMenu:ContextMenu = new ContextMenu(); + modifiedContextMenu.hideBuiltInItems(); + modifiedContextMenu.customItems = modifiedContextMenuItems; + this.contextMenu = modifiedContextMenu; + } + + override public function set showCloseButton(value:Boolean):void { + super.showCloseButton = value; + + updateContextMenu(); + } + + public function get customContextMenuItems():Array { + return _customContextMenuItems; + } + + public function set customContextMenuItems(value:Array):void { + _customContextMenuItems = value; + + updateContextMenu(); + } + } +} diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LogWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LogWindow.mxml index a1ce7af674..b51e551c2a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LogWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LogWindow.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> - @@ -88,4 +88,4 @@ with BigBlueButton; if not, see . - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml index d7fedf0c99..0323b58519 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml @@ -76,7 +76,6 @@ with BigBlueButton; if not, see . import flash.events.MouseEvent; import flash.geom.Point; - import flexlib.mdi.containers.MDIWindow; import flexlib.mdi.effects.effectsLib.MDIVistaEffects; import mx.collections.ArrayCollection; diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml index 4fa15167c6..4972a9e09f 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> -. - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml index c58dfbccba..f0f0a61e31 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> -. - \ No newline at end of file + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/views/BroadcastWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/views/BroadcastWindow.mxml index ee181b4151..8b2c7e7a19 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/views/BroadcastWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/views/BroadcastWindow.mxml @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public License along with BigBlueButton; if not, see . --> -. . - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml index 80360c149b..2a8fee4ff1 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml @@ -1,405 +1,404 @@ - - - - - - - - - - - - - - - + "NEW MESSAGE" should go here. - // However, the SuperTabNavigator does not cooperate with changes to it's accessibility properties. - } - - private function getTabIndexFor(chatBox:ChatBox):int { - return chatTabs.getChildIndex(chatBox); - } - - private function onTabNavChange():void{ - var tab:Button = chatTabs.getTabAt(chatTabs.selectedIndex); - tab.setStyle("fillColors", new Array(0xFFFFFF, 0xCCCCCC)); - - // An event to remove the "NEW MESSAGE" notification from the accessibilityDescription of the given chat tab (if it exists) should go here. - // However, the SuperTabNavigator does not cooperate with changes to it's accessibility properties. - - var chatBox:IChatTab = chatTabs.getChildAt(chatTabs.selectedIndex) as IChatTab; - chatBox.focusToTextMessageArea(); - } - - private function userHasChatBox(userID:String):Boolean { - var chatBox:ChatBox = chatTabs.getChildByName(userID) as ChatBox; - if (chatBox != null) return true; - return false; - } - - private function getChatBoxForUser(userID:String):ChatBox { - return chatTabs.getChildByName(userID) as ChatBox; - } - - private function handleStartPrivateChatMessageEvent(event:CoreEvent):void { - var userID:String = event.message.chatWith; - var tabIndex:int = getTabIndexFor(openChatBoxFor(userID)); - chatTabs.selectedIndex = tabIndex; - } - - public function openChatBoxFor(chatWithUserID:String, publicChat:Boolean=false):ChatBox { - if (userHasChatBox(chatWithUserID)) { - return getChatBoxForUser(chatWithUserID); - } else { - return createChatBoxFor(chatWithUserID, publicChat); - } - } - - private function createChatBoxFor(chatWithUserID:String, publicChat:Boolean=false):ChatBox { - var chatBox:ChatBox = new ChatBox(); - chatBox.id = chatWithUserID; - chatBox.name = chatWithUserID; - chatBox.chatWithUserID = chatWithUserID; - chatBox.baseIndex = baseIndex; - - if (publicChat) { - chatBox.label = PUBLIC_CHAT_USERNAME - chatBox.publicChat = true; - publicBox = chatBox; // keep a reference to the public chat box - } else { - chatBox.publicChat = false; - chatBox.label = UsersUtil.getUserName(chatWithUserID); - } - - chatBox.chatWithUsername = UsersUtil.getUserName(chatWithUserID); - - if (chatTabs.numChildren >= 2) { - chatTabs.addChildAt(chatBox, chatTabs.numChildren - 1); - } else { - chatTabs.addChild(chatBox); - } - - // set the font size on tab opening - if (tabBox) chatBox.setStyle("fontSize", int(tabBox.cmbFontSize.selectedItem)); - - return chatBox; - } - - private function createAddTabBox():AddChatTabBox { - tabBox = new AddChatTabBox(); - tabBox.chatView = this; - tabBox.id = OPTION_TAB_ID; - tabBox.label = OPTION_TAB_ID; - tabBox.name = OPTION_TAB_ID; - tabBox.chatOptions = chatOptions; - - tabBox.addEventListener(KeyboardEvent.KEY_DOWN, tabBox.accessibleClick); - chatTabs.addChild(tabBox); - - return tabBox; - } - - - // Activates an audio alert for screen-reader users on public message reception - private function publicNotification():void { - publicWaiting = true; - if (Accessibility.active){ - noticeSound.play(); - } - chatTabs.getChildByName(PUBLIC_CHAT_USERID).addEventListener(FocusEvent.FOCUS_IN, publicChatFocus); - chatTabs.getChildByName(PUBLIC_CHAT_USERID).addEventListener(FocusEvent.FOCUS_OUT, publicChatUnfocus); - } - - // Activates an audio alert for screen-reader users on private message reception - private function privateNotification(event:PrivateChatMessageEvent):void{ - if (! UsersUtil.isMe(event.message.fromUserID)) { - if (Accessibility.active){ - noticeSound.play(); - } - } - } - - public function publicChatFocus(event:FocusEvent):void{ - publicFocus = true; - publicWaiting = false; - } - - public function publicChatUnfocus(event:FocusEvent):void { - publicFocus = false; - } - - private function focusPreviousChatTab(e:ShortcutEvent):void{ - if (chatTabs.selectedIndex > 0){ - chatTabs.selectedIndex--; - } - else{ - chatTabs.selectedIndex = chatTabs.numChildren - 1; - } - } - - private function focusNextChatTab(e:ShortcutEvent):void{ - if (chatTabs.selectedIndex < chatTabs.numChildren - 1){ - chatTabs.selectedIndex++; - } - else{ - chatTabs.selectedIndex = 0; - } - } - - private function onTabClose(e:SuperTabEvent):void{ - dispatchEvent(e); - } - - private function onUserClosedTab(e:SuperTabEvent):void{ - var name:String = chatTabs.getChildAt(e.tabIndex).name; - } - - ]]> - - - + + + + + + + + + + + + + + + + "NEW MESSAGE" should go here. + // However, the SuperTabNavigator does not cooperate with changes to it's accessibility properties. + } + + private function getTabIndexFor(chatBox:ChatBox):int { + return chatTabs.getChildIndex(chatBox); + } + + private function onTabNavChange():void{ + var tab:Button = chatTabs.getTabAt(chatTabs.selectedIndex); + tab.setStyle("fillColors", new Array(0xFFFFFF, 0xCCCCCC)); + + // An event to remove the "NEW MESSAGE" notification from the accessibilityDescription of the given chat tab (if it exists) should go here. + // However, the SuperTabNavigator does not cooperate with changes to it's accessibility properties. + + var chatBox:IChatTab = chatTabs.getChildAt(chatTabs.selectedIndex) as IChatTab; + chatBox.focusToTextMessageArea(); + } + + private function userHasChatBox(userID:String):Boolean { + var chatBox:ChatBox = chatTabs.getChildByName(userID) as ChatBox; + if (chatBox != null) return true; + return false; + } + + private function getChatBoxForUser(userID:String):ChatBox { + return chatTabs.getChildByName(userID) as ChatBox; + } + + private function handleStartPrivateChatMessageEvent(event:CoreEvent):void { + var userID:String = event.message.chatWith; + var tabIndex:int = getTabIndexFor(openChatBoxFor(userID)); + chatTabs.selectedIndex = tabIndex; + } + + public function openChatBoxFor(chatWithUserID:String, publicChat:Boolean=false):ChatBox { + if (userHasChatBox(chatWithUserID)) { + return getChatBoxForUser(chatWithUserID); + } else { + return createChatBoxFor(chatWithUserID, publicChat); + } + } + + private function createChatBoxFor(chatWithUserID:String, publicChat:Boolean=false):ChatBox { + var chatBox:ChatBox = new ChatBox(); + chatBox.id = chatWithUserID; + chatBox.name = chatWithUserID; + chatBox.chatWithUserID = chatWithUserID; + chatBox.baseIndex = baseIndex; + + if (publicChat) { + chatBox.label = PUBLIC_CHAT_USERNAME + chatBox.publicChat = true; + publicBox = chatBox; // keep a reference to the public chat box + } else { + chatBox.publicChat = false; + chatBox.label = UsersUtil.getUserName(chatWithUserID); + } + + chatBox.chatWithUsername = UsersUtil.getUserName(chatWithUserID); + + if (chatTabs.numChildren >= 2) { + chatTabs.addChildAt(chatBox, chatTabs.numChildren - 1); + } else { + chatTabs.addChild(chatBox); + } + + // set the font size on tab opening + if (tabBox) chatBox.setStyle("fontSize", int(tabBox.cmbFontSize.selectedItem)); + + return chatBox; + } + + private function createAddTabBox():AddChatTabBox { + tabBox = new AddChatTabBox(); + tabBox.chatView = this; + tabBox.id = OPTION_TAB_ID; + tabBox.label = OPTION_TAB_ID; + tabBox.name = OPTION_TAB_ID; + tabBox.chatOptions = chatOptions; + + tabBox.addEventListener(KeyboardEvent.KEY_DOWN, tabBox.accessibleClick); + chatTabs.addChild(tabBox); + + return tabBox; + } + + + // Activates an audio alert for screen-reader users on public message reception + private function publicNotification():void { + publicWaiting = true; + if (Accessibility.active){ + noticeSound.play(); + } + chatTabs.getChildByName(PUBLIC_CHAT_USERID).addEventListener(FocusEvent.FOCUS_IN, publicChatFocus); + chatTabs.getChildByName(PUBLIC_CHAT_USERID).addEventListener(FocusEvent.FOCUS_OUT, publicChatUnfocus); + } + + // Activates an audio alert for screen-reader users on private message reception + private function privateNotification(event:PrivateChatMessageEvent):void{ + if (! UsersUtil.isMe(event.message.fromUserID)) { + if (Accessibility.active){ + noticeSound.play(); + } + } + } + + public function publicChatFocus(event:FocusEvent):void{ + publicFocus = true; + publicWaiting = false; + } + + public function publicChatUnfocus(event:FocusEvent):void { + publicFocus = false; + } + + private function focusPreviousChatTab(e:ShortcutEvent):void{ + if (chatTabs.selectedIndex > 0){ + chatTabs.selectedIndex--; + } + else{ + chatTabs.selectedIndex = chatTabs.numChildren - 1; + } + } + + private function focusNextChatTab(e:ShortcutEvent):void{ + if (chatTabs.selectedIndex < chatTabs.numChildren - 1){ + chatTabs.selectedIndex++; + } + else{ + chatTabs.selectedIndex = 0; + } + } + + private function onTabClose(e:SuperTabEvent):void{ + dispatchEvent(e); + } + + private function onUserClosedTab(e:SuperTabEvent):void{ + var name:String = chatTabs.getChildAt(e.tabIndex).name; + } + + ]]> + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml index 8f1b8615be..a3e33189b3 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> -. . - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml index 68d56e39f7..1dfe6ab037 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml @@ -20,11 +20,11 @@ with BigBlueButton; if not, see . --> -. . - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml index 14692a3dac..a1378129fe 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> -. toolTip="{actualSize ? ResourceUtil.getInstance().getString('bbb.desktopView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.desktopView.actualSize')}" tabIndex="{baseIndex+4}"/> - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/example/ExampleChatWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/example/ExampleChatWindow.mxml index 44190340a1..440cd20ba3 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/example/ExampleChatWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/example/ExampleChatWindow.mxml @@ -23,15 +23,13 @@ with BigBlueButton; if not, see . - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml index d53efa8204..630d562d51 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml @@ -43,9 +43,7 @@ with BigBlueButton; if not, see . import flash.net.FileReference; import flexlib.mdi.containers.MDICanvas; - import flexlib.mdi.containers.MDIWindow; import flexlib.mdi.events.MDIManagerEvent; - import flexlib.mdi.events.MDIWindowEvent; import flexlib.mdi.managers.MDIManager; import mx.collections.ArrayCollection; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/notes/views/NotesWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/notes/views/NotesWindow.mxml index 5ce874e19e..aee2c3212b 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/notes/views/NotesWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/notes/views/NotesWindow.mxml @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public License along with BigBlueButton; if not, see . --> -. - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/CreatePollWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/CreatePollWindow.mxml index 6a19993906..154ac2fe2c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/CreatePollWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/CreatePollWindow.mxml @@ -18,7 +18,7 @@ $Id: $ - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml index 2aefa685ec..27feb48dbf 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml @@ -20,7 +20,7 @@ $Id: $ --> - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreateWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreateWindow.mxml index 943591a93a..5b0ed2d6ad 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreateWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreateWindow.mxml @@ -18,7 +18,7 @@ $Id: $ - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainWindow.mxml index 3c32c6c309..1a4c1e8555 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainWindow.mxml @@ -18,7 +18,7 @@ $Id: $ - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollWindow.mxml index 35ebc69901..0e30c15256 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollWindow.mxml @@ -18,7 +18,7 @@ $Id: $ - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollWindow.mxml index 43b7208b3d..e5d17be480 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollWindow.mxml @@ -18,7 +18,7 @@ $Id: $ - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml index bf7acb0802..e9dd610f16 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml @@ -21,9 +21,9 @@ with BigBlueButton; if not, see . --> -. private static const LOG:String = "Present::PresentationWindow - "; public static const TITLE:String = "Presentation"; - private static const NEXT_BUTTON:String = "Next"; - private static const PREVIOUS_BUTTON:String = "Previous"; private static const GOTO_PAGE_BUTTON:String = "Go to Page..."; [Bindable] @@ -350,8 +348,7 @@ with BigBlueButton; if not, see . private function becomeViewer():void{ setupPresenter(false); dispatchEvent(new UploadEvent(UploadEvent.CLOSE_UPLOAD_WINDOW)); - this.contextMenu = new ContextMenu(); - this.contextMenu.hideBuiltInItems(); + this.customContextMenuItems = new Array(); if (slideView.thumbnailView.visible) showThumbnails(); } @@ -399,31 +396,19 @@ with BigBlueButton; if not, see . } private function addContextMenuItems():void{ - var contextMenu:ContextMenu = new ContextMenu(); - contextMenu.hideBuiltInItems(); + var contextMenuItems:Array = new Array(); - var nextButton:ContextMenuItem = new ContextMenuItem(NEXT_BUTTON); - nextButton.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuItemHandler); - contextMenu.customItems.push(nextButton); + var nextButton:ContextMenuItem = new ContextMenuItem(ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')); + nextButton.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, function(e:ContextMenuEvent):void { gotoNextSlide(); }); + contextMenuItems.push(nextButton); - var previousButton:ContextMenuItem = new ContextMenuItem(PREVIOUS_BUTTON); - previousButton.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuItemHandler); - contextMenu.customItems.push(previousButton); + var previousButton:ContextMenuItem = new ContextMenuItem(ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')); + previousButton.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, function(e:ContextMenuEvent):void { gotoPreviousSlide(); }); + contextMenuItems.push(previousButton); - this.contextMenu = contextMenu; + this.customContextMenuItems = contextMenuItems; } - private function menuItemHandler(e:ContextMenuEvent):void{ - switch(e.target.caption){ - case NEXT_BUTTON: - gotoNextSlide(); - break; - case PREVIOUS_BUTTON: - gotoPreviousSlide(); - break; - } - } - private function notifyOthersOfSharingPresentation(presentationName:String):void { var shareEvent:PresenterCommands = new PresenterCommands(PresenterCommands.SHARE_PRESENTATION_COMMAND); shareEvent.presentationName = presentationName; @@ -527,6 +512,8 @@ with BigBlueButton; if not, see . if(Capabilities.hasAccessibility) Accessibility.updateProperties(); + + addContextMenuItems(); } private function localeChanged(e:Event):void{ @@ -658,4 +645,4 @@ with BigBlueButton; if not, see . - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml index 7ba4d629da..f30f3c8e65 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml @@ -18,8 +18,8 @@ Author: Islam El-Ashi , --> - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml index e5e26f5157..8416409f88 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml @@ -20,8 +20,8 @@ $Id: $ --> - - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml index 35610ccf78..d46fc6c24a 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml @@ -20,7 +20,7 @@ with BigBlueButton; if not, see . --> -. } ]]> - \ No newline at end of file + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml index 8af285be8f..d0d296c695 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml @@ -1,436 +1,435 @@ - - - - - - - - - - - - - - - - - - - - .colorPickerStyle { - backgroundColor:#E5E6E7; - columnCount:13; - horizontalGap:0; - previewHeight:22; - previewWidth:50; - swatchGridBackgroundColor:#000000; - swatchGridBorderSize:0; - swatchHeight:60; - swatchHighlightColor:#FFFFFF; - swatchHighlightSize:1; - swatchWidth:12; - textFieldWidth:72; - verticalGap:0; - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + .colorPickerStyle { + backgroundColor:#E5E6E7; + columnCount:13; + horizontalGap:0; + previewHeight:22; + previewWidth:50; + swatchGridBackgroundColor:#000000; + swatchGridBorderSize:0; + swatchHeight:60; + swatchHighlightColor:#FFFFFF; + swatchHighlightSize:1; + swatchWidth:12; + textFieldWidth:72; + verticalGap:0; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +