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

Merge pull request #355 from speakserve/fix-presentation-name

Browse Source 
Presentation name is displayed instead of empty string
This commit is contained in:
Richard Alam 2014-08-13 14:17:18 -04:00
commit d88d79fd71
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/model/PresentationModel.as
View File

@ -79,7 +79,7 @@ package org.bigbluebutton.modules.present.model
public function getCurrentPresentationName():String {
for (var i:int = 0; i < _presentations.length; i++) {
var pres: Presentation = _presentations.getItemAt(i) as Presentation;
if (pres.current) return pres.id;
if (pres.current) return pres.name;
}
return null;

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

@ -369,24 +369,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
displaySlideNavigationControls(isPresenter);
}
private function handlePresentationChangedEvent(e:PresentationChangedEvent):void {
var newPresName:String = PresentationModel.getInstance().getCurrentPresentationName();
slideView.setSlides();
slideView.visible = true;
var page:Page = PresentationModel.getInstance().getCurrentPage();
if (page != null) {
displaySlideNumber(page.num);
}
if (UsersUtil.amIPresenter()) {
displaySlideNavigationControls(true);
} else {
displaySlideNavigationControls(false)
}
onResetZoom();
}
private function handlePresentationChangedEvent(e:PresentationChangedEvent) : void {
currentPresentation = PresentationModel.getInstance().getCurrentPresentationName();
slideView.setSlides();
slideView.visible = true;
var page : Page = PresentationModel.getInstance().getCurrentPage();
if (page != null) {
displaySlideNumber(page.num);
}
if (UsersUtil.amIPresenter()) {
displaySlideNavigationControls(true);
}
else {
displaySlideNavigationControls(false)
}
onResetZoom();
}
private function displaySlideNavigationControls(show:Boolean):void {
backButton.visible = show;