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

Correctly updating ControlBar buttons on polls

Browse Source
This commit is contained in:
kreismann 2016-08-05 17:08:56 -03:00
parent ee55554090
commit a471d084df
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -804,12 +804,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function setControlBarState(state:String):void {
if (state == "vote") {
pollStartBtn.visible = false;
btnActualSize.visible = false;
presenterControls.visible = false;
presenterControls.includeInLayout = false;
pollVoteBox.visible = true;
pollVoteBox.includeInLayout = true;
} else if (state == "presenter" && UsersUtil.amIPresenter()) {
} else if (state == "presenter" && UsersUtil.amIPresenter() && currentTabIndex == PRESENTATION_TAB_INDEX) {
pollStartBtn.visible = true;
presenterControls.visible = true;
presenterControls.includeInLayout = true;
@ -820,15 +820,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).visible = true;
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).includeInLayout = true;
} else {
pollStartBtn.visible = false;
presenterControls.visible = false;
presenterControls.includeInLayout = false;
pollVoteBox.visible = false;
pollVoteBox.includeInLayout = false;
btnClosePublish.visible = false;
btnActualSize.visible = false;
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).visible = false;
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).includeInLayout = false;
if(currentTabIndex == PRESENTATION_TAB_INDEX) {
pollStartBtn.visible = false;
presenterControls.visible = false;
presenterControls.includeInLayout = false;
btnActualSize.visible = false;
btnClosePublish.visible = false;
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).visible = false;
presenterTabs.getTabAt(DESKSHARE_PUBLISH_TAB_INDEX).includeInLayout = false;
} else if(currentTabIndex == DESKSHARE_VIEW_TAB_INDEX)
btnActualSize.visible = true;
}
// Need to call the function later because the heights haven't been validated yet
@ -887,9 +890,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
whiteboardOverlay.acceptOverlayCanvas(slideView);
}
setControlBarState("presenter");
if(UsersUtil.amIPresenter())
annotationsPermissionChanged(true);
btnActualSize.visible = false;
if(UsersUtil.amIPresenter()) {
setControlBarState("presenter");
annotationsPermissionChanged(true);
}
}
private function handleDesktopPublishTabSelected():void {
@ -917,7 +922,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
annotationsPermissionChanged(true);
} else LOGGER.debug("openDesktopViewTab: whiteboard overlay or desktop view canvas is null!");
btnActualSize.visible = true;
if(!pollVoteBox.visible)
btnActualSize.visible = true;
if(UsersUtil.amIPresenter()) {
pollStartBtn.visible = true;
btnClosePublish.visible = true;