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

Merge pull request #4678 from ritzalam/revert-file-upload-change

Browse Source 
Revert "Delay centering popups as FileUploadWindow cannot be directly…
This commit is contained in:
Richard Alam 2017-11-16 11:27:03 -05:00 committed by GitHub
commit 76f21f7936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as
View File

@ -23,7 +23,6 @@ package org.bigbluebutton.core {
import flash.ui.Keyboard;
import flash.utils.Dictionary;
import flash.utils.getQualifiedClassName;
import flash.utils.setTimeout;
import mx.containers.Panel;
import mx.controls.Alert;
@ -103,7 +102,7 @@ package org.bigbluebutton.core {
private static function addPopUpToStage(parent:DisplayObject, className:Class, modal:Boolean = false, center:Boolean = true):IFlexDisplayObject {
var popUp:IFlexDisplayObject = PopUpManager.createPopUp(parent, className, modal);
if (center) {
setTimeout(function () : void {PopUpManager.centerPopUp(popUp)}, 50);
PopUpManager.centerPopUp(popUp)
}
popUpDict[getQualifiedClassName(className)] = popUp;

1
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -303,7 +303,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (toolbarOptions.confirmLogout) {
var logoutWindow:LogoutWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, LogoutWindow, false) as LogoutWindow;
// Needs to be improved in case of RTL layout
PopUpUtil.lockPosition(logoutWindow, function():Point {
return new Point(width - logoutWindow.width - 5, btnLogout.y + btnLogout.height + 5)
});

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
View File

@ -69,7 +69,7 @@ package org.bigbluebutton.modules.present.managers
}
public function handleOpenUploadWindow(e:UploadEvent):void{
var uploadWindow : FileUploadWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, FileUploadWindow, true) as FileUploadWindow;
var uploadWindow : FileUploadWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, FileUploadWindow, false) as FileUploadWindow;
if (uploadWindow) {
uploadWindow.maxFileSize = e.maxFileSize;
}