diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index ce2aee78d77d7b70a9d7ec86f1f7cc1591baef71..39dff61965e21e117036be0c33dd2ce5ffc108e1 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -784,11 +784,8 @@ bbb.lockSettings.feature=Feature
bbb.lockSettings.locked=Locked
bbb.lockSettings.lockOnJoin=Lock On Join
-bbb.meeting.timeRemaining = Time remaining
-
bbb.users.breakout.breakoutRooms = Breakout Rooms
bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
-bbb.users.breakout.timer = <b>{0}</b>
bbb.users.breakout.timer.toolTip = Time left for breakout rooms
bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
bbb.users.breakout.closing = Closing
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/BreakoutTimerUtil.as b/bigbluebutton-client/src/org/bigbluebutton/core/BreakoutTimerUtil.as
deleted file mode 100755
index 15f3ce07ccf1ae073ad37595f608a9c3e07e2a51..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/src/org/bigbluebutton/core/BreakoutTimerUtil.as
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- *
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- *
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.core {
-
- import flash.events.TimerEvent;
- import flash.utils.Dictionary;
- import flash.utils.Timer;
-
- import mx.controls.Label;
-
- import org.bigbluebutton.util.i18n.ResourceUtil;
-
- public final class BreakoutTimerUtil {
- public static var timers:Dictionary = new Dictionary(true);
-
- public static function setCountDownTimer(label:Label, seconds:int):void {
- var timer:Timer = getTimer(label.id, seconds);
- if (!timer.hasEventListener(TimerEvent.TIMER)) {
- timer.addEventListener(TimerEvent.TIMER, function():void {
- var remainingSeconds:int = timer.repeatCount - timer.currentCount;
- var formattedTime:String = (Math.floor(remainingSeconds / 60)) + ":" + (remainingSeconds % 60 >= 10 ? "" : "0") + (remainingSeconds % 60);
- label.htmlText = ResourceUtil.getInstance().getString('bbb.users.breakout.timer', [formattedTime]);
- });
- timer.addEventListener(TimerEvent.TIMER_COMPLETE, function():void {
- label.text = ResourceUtil.getInstance().getString('bbb.users.breakout.closing');
- });
- } else {
- timer.stop();
- timer.reset();
- }
- timer.start();
- }
-
- public static function getTimer(name:String, defaultRepeatCount:Number):Timer {
- if (timers[name] == undefined) {
- timers[name] = new Timer(1000, defaultRepeatCount);
- }
- Timer(timers[name]).repeatCount = defaultRepeatCount;
- return timers[name];
- }
-
- public static function stopTimer(name:String):void {
- if (timers[name] != undefined) {
- timers[name].stop();
- }
- }
- }
-}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as b/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
index 2d8090c5562ef307327a75044763aed21e5ce7e9..c997d978643fff0c1373576afe0b7d1396de4458 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as
@@ -21,10 +21,10 @@ package org.bigbluebutton.core {
import flash.events.TimerEvent;
import flash.utils.Dictionary;
import flash.utils.Timer;
-
+
import mx.controls.Label;
-
- import org.bigbluebutton.util.i18n.ResourceUtil;
+
+ import org.bigbluebutton.util.i18n.ResourceUtil;
public final class TimerUtil {
public static var timers:Dictionary = new Dictionary(true);
@@ -35,7 +35,7 @@ package org.bigbluebutton.core {
timer.addEventListener(TimerEvent.TIMER, function():void {
var remainingSeconds:int = timer.repeatCount - timer.currentCount;
var formattedTime:String = (Math.floor(remainingSeconds / 60)) + ":" + (remainingSeconds % 60 >= 10 ? "" : "0") + (remainingSeconds % 60);
- label.htmlText = ResourceUtil.getInstance().getString('bbb.users.breakout.timer', [formattedTime]);
+ label.text = formattedTime;
});
timer.addEventListener(TimerEvent.TIMER_COMPLETE, function():void {
label.text = ResourceUtil.getInstance().getString('bbb.users.breakout.closing');
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index b453fd59a3a8e98775555ea96f14cc89e74cb995..44c6364377d4f1cd6f1c9c50bd74bb0b89a1c150 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -191,14 +191,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
initBandwidthToolTip();
}
}
-
- private function handleRemainingTimeUpdate(e:MeetingTimeRemainingEvent):void {
- if (! timeRemaining.visible) {
- timeRemaining.visible = true;
- timeRemainingLabel.visible = true;
- }
- TimerUtil.setCountDownTimer(timeRemaining, e.timeLeftInSec);
- }
+ private function handleRemainingTimeUpdate(e:MeetingTimeRemainingEvent):void {
+ if (!timeRemaining.visible) {
+ timeRemaining.visible = true;
+ }
+ TimerUtil.setCountDownTimer(timeRemaining, e.timeLeftInSec);
+ }
private function retrieveMeetingName(e:ConferenceCreatedEvent):void {
if (toolbarOptions.showMeetingName) {
@@ -520,6 +518,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
styleName="breakoutRoomRibbon"
visible="false" includeInLayout="false" >
<mx:Label id="breakoutLabel" />
+ <mx:Label text="|" visible="{timeRemaining.visible}" includeInLayout="{timeRemaining.visible}"/>
+ <mx:Label id="timeRemaining" visible="false" includeInLayout="{timeRemaining.visible}"
+ text="{ResourceUtil.getInstance().getString('bbb.users.breakout.calculatingRemainingTime')}"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.breakout.timer.toolTip')}"/>
</mx:HBox>
<!-- Top bar -->
<mx:HBox id="topBox" width="100%" verticalAlign="middle" horizontalScrollPolicy="off" styleName="topBoxStyle">
@@ -534,12 +536,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:HBox id="addedBtnsDeskShare" />
</mx:HBox>
<mx:HBox id="rightBox" width="40%" horizontalAlign="right" verticalAlign="middle" horizontalScrollPolicy="off">
- <mx:Label id="timeRemainingLabel" visible="false" includeInLayout="{timeRemainingLabel.visible}"
- text="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}:"
- toolTip="{ResourceUtil.getInstance().getString('bbb.meeting.timeRemaining')}"/>
- <mx:Label id="timeRemaining" visible="false" includeInLayout="{timeRemaining.visible}"
- text="{ResourceUtil.getInstance().getString('bbb.users.breakout.calculatingRemainingTime')}"
- toolTip="{ResourceUtil.getInstance().getString('bbb.users.breakout.timer.toolTip')}"/>
<views:RecordButton id="recordBtn" visible="{showRecordButton}" includeInLayout="{showRecordButton}"/>
<views:WebRTCAudioStatus id="webRTCAudioStatus" height="30"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index 3382b4bab071f6ba62ff5f4f9f0584bb453b5768..c8dec509bb7f5aef0d2d4136ebe63fa393c7a9f6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -82,7 +82,6 @@ $Id: $
import org.bigbluebutton.common.IBbbModuleWindow;
import org.bigbluebutton.common.Role;
import org.bigbluebutton.common.events.LocaleChangeEvent;
- import org.bigbluebutton.core.BreakoutTimerUtil;
import org.bigbluebutton.core.EventConstants;
import org.bigbluebutton.core.KeyboardUtil;
import org.bigbluebutton.core.PopUpUtil;
@@ -443,7 +442,7 @@ $Id: $
}
private function handleRemainingTimeUpdate(event:BreakoutRoomEvent):void {
- BreakoutTimerUtil.setCountDownTimer(breakoutTimeLabel, event.durationInMinutes);
+ TimerUtil.setCountDownTimer(breakoutTimeLabel, event.durationInMinutes);
}
private function breakoutRoomsListChangeListener(event:CollectionEvent):void {