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

Merge branch 'remove-layout-sync' of https://github.com/capilkey/bigbluebutton into capilkey-remove-layout-sync

Browse Source
This commit is contained in:
Richard Alam 2015-04-13 17:09:40 +00:00
commit 0378239efc
4 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as Normal file → Executable file
View File

@ -22,10 +22,7 @@ package org.bigbluebutton.modules.layout.events
public class LayoutEvent extends Event
{
public static const SYNC_LAYOUT_EVENT:String = 'SYNC_LAYOUT_EVENT';
public static const BROADCAST_LAYOUT_EVENT:String = 'BROADCAST_LAYOUT_EVENT';
public static const LOCK_LAYOUT_EVENT:String = 'LOCK_LAYOUT_EVENT';
public static const UNLOCK_LAYOUT_EVENT:String = 'UNLOCK_LAYOUT_EVENT';
public static const STOP_LAYOUT_MODULE_EVENT:String = 'STOP_LAYOUT_MODULE_EVENT';
public static const VIEW_INITIALIZED_EVENT:String = 'VIEW_INITIALIZED_EVENT';

8
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
View File

@ -84,7 +84,7 @@ package org.bigbluebutton.modules.layout.managers
});
_sendCurrentLayoutUpdateTimer.addEventListener(TimerEvent.TIMER, function(e:TimerEvent):void {
//trace(LOG + "Applying layout due to window resize");
sendLayoutUpdate(updateCurrentLayout(null));
updateCurrentLayout(null);
});
}
@ -202,12 +202,6 @@ package org.bigbluebutton.modules.layout.managers
layoutEvent.layoutID = layoutID;
_globalDispatcher.dispatchEvent(layoutEvent);
}
public function syncLayout():void {
if (UsersUtil.amIModerator() || UsersUtil.amIPresenter()) {
_globalDispatcher.dispatchEvent(new SyncLayoutEvent(_currentLayout));
}
}
public function lockLayout():void {
_locked = true;

12
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
View File

@ -66,18 +66,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<EventHandlers type="{LayoutEvent.APPLY_DEFAULT_LAYOUT_EVENT}">
<MethodInvoker generator="{LayoutManager}" method="applyDefaultLayout" />
</EventHandlers>
<EventHandlers type="{LayoutEvent.LOCK_LAYOUT_EVENT}">
<MethodInvoker generator="{LayoutManager}" method="lockLayout" />
</EventHandlers>
<EventHandlers type="{EventConstants.LOCK_LAYOUT_REQ}">
<MethodInvoker generator="{LayoutManager}" method="lockLayout"/>
</EventHandlers>
<EventHandlers type="{LayoutEvent.UNLOCK_LAYOUT_EVENT}">
<MethodInvoker generator="{LayoutService}" method="unlockLayout" />
</EventHandlers>
<EventHandlers type="{EventConstants.UNLOCK_LAYOUT_REQ}">
<MethodInvoker generator="{LayoutService}" method="unlockLayout"/>
@ -103,10 +95,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<EventHandlers type="{LayoutFromRemoteEvent.LAYOUT_FROM_REMOTE}">
<MethodInvoker generator="{LayoutManager}" method="applyRemoteLayout" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{LayoutEvent.SYNC_LAYOUT_EVENT}">
<MethodInvoker generator="{LayoutManager}" method="syncLayout" />
</EventHandlers>
<EventHandlers type="{LayoutEvent.SAVE_LAYOUTS_EVENT}">
<MethodInvoker generator="{LayoutManager}" method="saveLayoutsToFile" />

2
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml Normal file → Executable file
View File

@ -55,7 +55,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onClick(e:Event):void {
_dispatcher.dispatchEvent(new LayoutEvent(LayoutEvent.SYNC_LAYOUT_EVENT));
//_dispatcher.dispatchEvent(new LayoutEvent(LayoutEvent.SYNC_LAYOUT_EVENT));
}
private function onLockLayoutEvent(e:Event):void {