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

Better control for bigbluebutton reconnection

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2015-09-17 18:24:30 +00:00
parent 003977982c
commit 655ed560ed
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
View File

@ -273,9 +273,11 @@ package org.bigbluebutton.main.model.users
if (this.isModerator()) sender.changeRole(e.userid, e.role); if (this.isModerator()) sender.changeRole(e.userid, e.role);
} }
public function onReconnecting():void { public function onReconnecting(e:BBBEvent):void {
trace(LOG + "onReconnecting"); if (e.payload.type == "BIGBLUEBUTTON_CONNECTION") {
reconnecting = true; trace(LOG + "onReconnecting");
reconnecting = true;
}
} }
/** /**

4
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -445,8 +445,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} }
} }
private function closeWaitWindow(evt:BBBEvent):void { private function closeWaitWindow(e:BBBEvent):void {
if(waitWindow != null) { if(waitWindow != null && e.payload.type == "BIGBLUEBUTTON_CONNECTION") {
trace(LOG + "closeWaitWindow"); trace(LOG + "closeWaitWindow");
waitWindow.removeWindow(); waitWindow.removeWindow();
} }

2
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMap.mxml
View File

@ -96,7 +96,7 @@
</EventHandlers> </EventHandlers>
<EventHandlers type="{BBBEvent.RECONNECT_DISCONNECTED_EVENT}"> <EventHandlers type="{BBBEvent.RECONNECT_DISCONNECTED_EVENT}">
<MethodInvoker generator="{SharedNotesEventMapDelegate}" method="destroyAllAdditionalNotes"/> <MethodInvoker generator="{SharedNotesEventMapDelegate}" method="destroyAllAdditionalNotes" arguments="{event}"/>
</EventHandlers> </EventHandlers>
<EventHandlers type="{BBBEvent.RECONNECT_BIGBLUEBUTTON_SUCCEEDED_EVENT}"> <EventHandlers type="{BBBEvent.RECONNECT_BIGBLUEBUTTON_SUCCEEDED_EVENT}">

7
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as
View File

@ -28,6 +28,7 @@ package org.bigbluebutton.modules.sharednotes.maps
import org.bigbluebutton.common.events.ToolbarButtonEvent; import org.bigbluebutton.common.events.ToolbarButtonEvent;
import org.bigbluebutton.core.BBB; import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.managers.UserManager; import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.modules.sharednotes.views.SharedNotesWindow; import org.bigbluebutton.modules.sharednotes.views.SharedNotesWindow;
import org.bigbluebutton.modules.sharednotes.views.AdditionalSharedNotesWindow; import org.bigbluebutton.modules.sharednotes.views.AdditionalSharedNotesWindow;
import org.bigbluebutton.common.events.CloseWindowEvent; import org.bigbluebutton.common.events.CloseWindowEvent;
@ -114,8 +115,10 @@ package org.bigbluebutton.modules.sharednotes.maps
} }
} }
public function destroyAllAdditionalNotes():void { public function destroyAllAdditionalNotes(e:BBBEvent):void {
for (var noteId:String in windows) destroyAdditionalNotes(noteId); if (e.payload.type == "BIGBLUEBUTTON_CONNECTION") {
for (var noteId:String in windows) destroyAdditionalNotes(noteId);
}
} }
} }
} }

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
View File

@ -146,7 +146,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</EventHandlers> </EventHandlers>
<EventHandlers type="{BBBEvent.RECONNECT_DISCONNECTED_EVENT}"> <EventHandlers type="{BBBEvent.RECONNECT_DISCONNECTED_EVENT}">
<MethodInvoker generator="{UserService}" method="onReconnecting" /> <MethodInvoker generator="{UserService}" method="onReconnecting" arguments="{event}" />
</EventHandlers> </EventHandlers>
<!-- End Lock Events --> <!-- End Lock Events -->