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

- make polling module run with latest master

Browse Source
This commit is contained in:
Richard Alam 2013-04-15 20:48:10 +00:00
parent 4b5afe742c
commit 9252447a92
4 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/build.xml
View File

@ -486,7 +486,7 @@
<target name="clean-build-bbb" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone,
build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb"
description="Build BBB client skipping compiling of locales"/>
<target name="clean-build-all" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone,
<target name="clean-build-all" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone, build-polling,
build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb, branding, branding-black"
description="Build BBB client including locales"/>
<target name="modules" depends="init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone,

2
bigbluebutton-client/src/org/bigbluebutton/modules/polling/managers/ToolbarButtonManager.as
View File

@ -40,7 +40,7 @@ package org.bigbluebutton.modules.polling.managers
public static const LOGNAME:String = "[Polling :: ToolBarButtonManager] ";
public function ToolbarButtonManager() {
LogUtil.debug(LOGNAME + " initialized ")
LogUtil.debug(LOGNAME + " initialized ***************************************************************** ")
globalDispatcher = new Dispatcher();
button = new ToolbarButton();
}

78
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
View File

@ -34,38 +34,42 @@
<mx:Script>
<![CDATA[
import flexlib.mdi.events.MDIWindowEvent;
import org.bigbluebutton.main.views.MainCanvas;
import mx.controls.Alert;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.modules.polling.events.StartPollingEvent;
import org.bigbluebutton.modules.polling.managers.PollingManager;
import org.bigbluebutton.modules.polling.events.VoteEvent;
import org.bigbluebutton.modules.polling.events.PollingStatsWindowEvent;
import org.bigbluebutton.modules.polling.events.PollRefreshEvent;
import org.bigbluebutton.modules.polling.events.StopPollEvent;
import org.bigbluebutton.modules.polling.events.SavePollEvent;
import org.bigbluebutton.modules.polling.events.PublishPollEvent;
import org.bigbluebutton.modules.polling.events.GenerateWebKeyEvent;
import org.bigbluebutton.modules.chat.events.SendPublicChatMessageEvent;
import org.bigbluebutton.modules.polling.model.PollObject;
import org.bigbluebutton.modules.polling.model.PollStatLineObject;
import org.bigbluebutton.modules.polling.model.AnswerObject;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.Conference
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.common.Role;
import mx.validators.Validator;
import mx.utils.ObjectUtil;
import org.bigbluebutton.util.i18n.ResourceUtil;
import mx.collections.ArrayCollection;
import mx.core.IUIComponent;
import mx.controls.Text;
import mx.controls.TextArea;
import mx.containers.*;
import mx.controls.*;
import flash.utils.Timer;
import flash.events.TimerEvent;
import flash.events.TimerEvent;
import flash.utils.Timer;
import flexlib.mdi.events.MDIWindowEvent;
import mx.collections.ArrayCollection;
import mx.containers.*;
import mx.controls.*;
import mx.controls.Alert;
import mx.controls.Text;
import mx.controls.TextArea;
import mx.core.IUIComponent;
import mx.utils.ObjectUtil;
import mx.validators.Validator;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.common.Role;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.Conference;
import org.bigbluebutton.main.views.MainCanvas;
import org.bigbluebutton.modules.chat.events.SendPublicChatMessageEvent;
import org.bigbluebutton.modules.polling.events.GenerateWebKeyEvent;
import org.bigbluebutton.modules.polling.events.PollRefreshEvent;
import org.bigbluebutton.modules.polling.events.PollingStatsWindowEvent;
import org.bigbluebutton.modules.polling.events.PublishPollEvent;
import org.bigbluebutton.modules.polling.events.SavePollEvent;
import org.bigbluebutton.modules.polling.events.StartPollingEvent;
import org.bigbluebutton.modules.polling.events.StopPollEvent;
import org.bigbluebutton.modules.polling.events.VoteEvent;
import org.bigbluebutton.modules.polling.managers.PollingManager;
import org.bigbluebutton.modules.polling.model.AnswerObject;
import org.bigbluebutton.modules.polling.model.PollObject;
import org.bigbluebutton.modules.polling.model.PollStatLineObject;
import org.bigbluebutton.util.i18n.ResourceUtil;
public static const LOGNAME:String = "[PollingStatsWindow] ";
[Bindable] public var question:String;
@ -88,8 +92,8 @@
private function init():void{
conference = UserManager.getInstance().getConference();
webPollText.visible = (conference.amIPresenter() && (!reviewing && trackingPoll.publishToWeb));
btnClosePoll.visible = conference.amIPresenter();
webPollText.visible = (UsersUtil.amIPresenter() && (!reviewing && trackingPoll.publishToWeb));
btnClosePoll.visible = UsersUtil.amIPresenter();
webPollBox.visible = webPollText.visible;
if (webPollText.visible){
@ -119,7 +123,7 @@
if(viewingClosedPoll)
stopPoll();
if (conference.amIPresenter()){
if (UsersUtil.amIPresenter()){
messageForRecording("A poll is open for voting.");
messageForRecording(ResourceUtil.getInstance().getString('bbb.polling.createPoll.title') + " " + trackingPoll.title);
messageForRecording(ResourceUtil.getInstance().getString('bbb.polling.createPoll.question') + " " + trackingPoll.question);
@ -148,7 +152,7 @@
public function setUrlBoxText():void{
webPollURLBox.text = webPollUrl;
LogUtil.debug("webPollURLBox.Text is : " + webPollURLBox.text);
if (conference.amIPresenter())
if (UsersUtil.amIPresenter())
messageForRecording(ResourceUtil.getInstance().getString('bbb.polling.stats.webPollURL') + " " + webPollUrl);
}
@ -189,7 +193,7 @@
private function stopPoll():void{
refreshPoll();
refreshTimer.stop();
btnRefreshResults.visible = conference.amIPresenter();
btnRefreshResults.visible = UsersUtil.amIPresenter();
btnRefreshResults.label = ResourceUtil.getInstance().getString('bbb.polling.stats.repost');
btnRefreshResults.removeEventListener(MouseEvent.CLICK, refreshWindow);
btnRefreshResults.addEventListener(MouseEvent.CLICK, publishPollAgain);

6
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/ToolbarButton.mxml
View File

@ -33,12 +33,12 @@
>
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import com.asfusion.mate.events.Dispatcher;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.main.views.MainToolbar;
import org.bigbluebutton.util.i18n.ResourceUtil;
import org.bigbluebutton.modules.polling.events.PollingInstructionsWindowEvent;
import org.bigbluebutton.modules.polling.events.PollingInstructionsWindowEvent;
import org.bigbluebutton.modules.polling.events.PollGetTitlesEvent;
import org.bigbluebutton.modules.polling.events.PollGetPollEvent;
import org.bigbluebutton.modules.polling.events.OpenSavedPollEvent;
@ -127,7 +127,7 @@
listInitialize();
}
private function menuClick(event:MenuEvent):void {
private function menuClick(event:MenuEvent):void {
if(event.index == 0){
openPollingInstructions();
}else{