BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'avoid-shift-dragging' into mconf

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2016-07-11 20:03:21 +00:00
commit d0fe350172
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
View File

@ -155,6 +155,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var chatToolbarHeight:Number = 80;
[Bindable] public var chatOptions:ChatOptions = new ChatOptions();
private var shiftPressed:Boolean = false;
private var ctrlPressed:Boolean = false;
private function onCreationComplete():void {
bindToHeightToDetermineHeightOfMessageList();
@ -177,6 +180,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
txtMsgArea.addEventListener(TextEvent.TEXT_INPUT, handleTextInput);
txtMsgArea.addEventListener(KeyboardEvent.KEY_DOWN, handleMsgAreaKeyDown);
// Listen for the navigable keys to avoid moving and resizing the chat box while text selection
txtMsgArea.addEventListener(KeyboardEvent.KEY_DOWN, checkNavigableButtonDown);
txtMsgArea.addEventListener(KeyboardEvent.KEY_UP, checkNavigableButtonUp);
chatMessagesList.addEventListener(KeyboardEvent.KEY_DOWN, checkNavigableButtonDown);
chatMessagesList.addEventListener(KeyboardEvent.KEY_UP, checkNavigableButtonUp);
this.addEventListener(FocusEvent.FOCUS_OUT, releaseNavigableButton);
queryForChatHistory();
if(chatMessagesList.accessibilityProperties == null)
@ -194,7 +205,40 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
chatMessagesList.addEventListener(ChatEvent.RESIZE_CHAT_TOOLBAR, adjustToolbarWidthAccordingToScrollBar);
}
private function checkNavigableButtonDown(e:KeyboardEvent):void {
if (e.shiftKey && !shiftPressed) {
shiftPressed = true;
parentDocument.handleDraggableStatus(false);
}
if (e.ctrlKey && !ctrlPressed) {
ctrlPressed = true;
parentDocument.handleResizableStatus(false);
}
}
private function checkNavigableButtonUp(e:KeyboardEvent):void {
if (!e.shiftKey && shiftPressed) {
shiftPressed = false;
parentDocument.handleDraggableStatus(true);
}
if (!e.ctrlKey && ctrlPressed) {
ctrlPressed = false;
parentDocument.handleResizableStatus(true);
}
}
private function releaseNavigableButton(focus:FocusEvent):void {
if (shiftPressed) {
shiftPressed = false;
parentDocument.handleDraggableStatus(true);
}
if (ctrlPressed) {
ctrlPressed = false;
parentDocument.handleResizableStatus(true);
}
}
private function focusChatBox(e:ShortcutEvent):void{
focusManager.setFocus(chatMessagesList);
}

10
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
View File

@ -400,6 +400,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
chatTabs.removeChild(selectedTab as DisplayObject);
}
}
// This message comes from the chat box and must get to the chat window
public function handleDraggableStatus(value:Boolean):void {
parentDocument.handleDraggableStatus(value);
}
// This message comes from the chat box and must get to the chat window
public function handleResizableStatus(value:Boolean):void {
parentDocument.handleResizableStatus(value);
}
]]>
</mx:Script>

8
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
View File

@ -175,6 +175,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
override protected function showAllChildren():void {
chatView.includeInLayout=true;
}
public function handleDraggableStatus(value:Boolean):void {
this.draggable = value;
}
public function handleResizableStatus(value:Boolean):void {
this.resizable = value;
}
]]>
</mx:Script>