Skip to content

Commit 638b3d0

Browse files
capilkeycapilkey
committed
Merge remote branch 'upstream/master' into access-hotfix
Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2 parents f79de23 + b57044d commit 638b3d0

10 files changed

Lines changed: 82 additions & 52 deletions

File tree

‎bigbluebutton-client/resources/config.xml.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
88
<language userSelectionEnabled="true" />
99
<skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf" />
10+
<shortcutKeys userSelectionEnabled="true" />
1011
<layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="Default"
1112
showToolbar="true" showFooter="true" showHelpButton="true" showLogoutWindow="true"/>
1213

‎bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ package org.bigbluebutton.core.model
6464
a.userSelectionEnabled = ((config.language.@userSelectionEnabled).toUpperCase() == "TRUE") ? true : false;
6565
return a
6666
}
67+
68+
public function get shortcutKeys():Object {
69+
var a:Object = new Object();
70+
a.userSelectionEnabled = ((config.shortcutKeys.@userSelectionEnabled).toUpperCase() == "TRUE") ? true : false;
71+
return a
72+
}
6773

6874
public function get skinning():Object {
6975
var a:Object = new Object();

‎bigbluebutton-client/src/org/bigbluebutton/core/vo/Config.as‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ package org.bigbluebutton.core.vo {
2727
private var _host:String;
2828
private var _numModules:int;
2929
private var _languageEnabled:Boolean;
30+
private var _shortcutKeysEnabled:Boolean;
3031
private var _skinning:String = "";
3132
private var _showDebug:Boolean = false;
3233

@@ -40,6 +41,7 @@ package org.bigbluebutton.core.vo {
4041
_host = builder.host;
4142
_numModules = builder.numModules;
4243
_languageEnabled = builder.languageEnabled;
44+
_shortcutKeysEnabled = builder.shortcutKeysEnabled;
4345
_skinning = builder.skinning;
4446
_showDebug = builder.showDebug;
4547
}
@@ -78,7 +80,11 @@ package org.bigbluebutton.core.vo {
7880

7981
public function get languageEnabled():Boolean {
8082
return _languageEnabled;
81-
}
83+
}
84+
85+
public function get shorcutKeysEnabled():Boolean {
86+
return _shortcutKeysEnabled;
87+
}
8288

8389
public function get skinning():String {
8490
return _skinning;

‎bigbluebutton-client/src/org/bigbluebutton/core/vo/ConfigBuilder.as‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ package org.bigbluebutton.core.vo {
2727
internal var host:String;
2828
internal var numModules:int;
2929
internal var languageEnabled:Boolean;
30+
internal var shortcutKeysEnabled:Boolean;
3031
internal var skinning:String = "";
3132
internal var showDebug:Boolean = false;
3233

@@ -70,6 +71,11 @@ package org.bigbluebutton.core.vo {
7071
return this;
7172
}
7273

74+
public function withShortcutKeysEnabled(shortcutKeysEnabled:Boolean):ConfigBuilder {
75+
this.shortcutKeysEnabled = shortcutKeysEnabled;
76+
return this;
77+
}
78+
7379
public function withSkinning(skinning:String):ConfigBuilder {
7480
this.skinning = skinning;
7581
return this;

‎bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ package org.bigbluebutton.main.model
5252
public var host:String;
5353
public var numModules:int;
5454
public var languageEnabled:Boolean;
55+
public var shortcutKeysEnabled:Boolean;
5556
public var skinning:String = "";
5657
public var showDebug:Boolean = false;
5758

@@ -100,6 +101,10 @@ package org.bigbluebutton.main.model
100101
if (xml.localeversion.@suppressWarning == "true") suppressLocaleWarning = true;
101102
if (xml.language.@userSelectionEnabled == "true") languageEnabled = true;
102103
else languageEnabled = false;
104+
105+
if (xml.shortcutKeys.@userSelectionEnabled == "true") shortcutKeysEnabled = true;
106+
else shortcutKeysEnabled = false;
107+
103108
if (xml.skinning.@enabled == "true") skinning = xml.skinning.@url;
104109

105110
if (xml.debug.@showDebugWindow == "true") showDebug = true;

‎bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ package org.bigbluebutton.main.model.modules
140140
.withHelpUrl(c.helpURL)
141141
.withHost(c.host)
142142
.withLanguageEnabled(c.languageEnabled)
143+
.withShortcutKeysEnabled(c.shortcutKeysEnabled)
143144
.withNumModule(c.numModules)
144145
.withPortTestApplication(c.portTestApplication)
145146
.withPortTestHost(c.portTestHost)

‎bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
192192
193193
private function gotConfigParameters(e:ConfigEvent):void{
194194
langSelector.visible = e.config.languageEnabled;
195+
shortcutKeysBtn.includeInLayout = shortcutKeysBtn.visible = e.config.shortcutKeysEnabled;
195196
DEFAULT_HELP_URL = e.config.helpURL;
196197
}
197198
@@ -238,8 +239,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
238239
<!--
239240
<mx:Button label="DISCONNECT!" click="BBB.initConnectionManager().forceClose()" height="22" toolTip="Click to simulate disconnection" />
240241
-->
241-
242-
<mx:Button label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" styleName="shortcutButtonStyle"
242+
<mx:Button id="shortcutKeysBtn" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" styleName="shortcutButtonStyle"
243243
click="onShortcutButtonClick()" height="22"
244244
toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}"
245245
tabIndex="{baseIndex+numButtons+6}" />

‎bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/models/SlideViewModel.as‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,9 @@ package org.bigbluebutton.modules.present.ui.views.models
219219
}
220220
}
221221
} else {
222-
if (viewportW < pageOrigW) {
223-
if (_calcPageH < viewportH) {
224-
viewportH = (viewportW/pageOrigW)*pageOrigH;
225-
}
226-
}
222+
viewportH = (viewportW/pageOrigW)*pageOrigH;
223+
if (viewportH > parentH)
224+
viewportH = parentH;
227225
}
228226
}
229227

@@ -240,46 +238,43 @@ package org.bigbluebutton.modules.present.ui.views.models
240238
var zpy:Number = Math.abs(_calcPageY) + mouseY;
241239
var zpxp:Number = zpx/cpw;
242240
var zpyp:Number = zpy/cph;
243-
244-
_calcPageW = pageOrigW * zoomValue / HUNDRED_PERCENT;
245-
_calcPageH = (_calcPageW/cpw) * cph;
241+
242+
LogUtil.debug("CHAD 1: zoom: " + zoomValue + " cpw: " + cpw + " cph: " + cph + " _calcPageW: " + _calcPageW + " _calcPageH: " + _calcPageH);
243+
244+
LogUtil.debug("CHAD 2: zoom: " + zoomValue + " cpw: " + cpw + " cph: " + cph + " _calcPageW: " + _calcPageW + " _calcPageH: " + _calcPageH);
245+
246+
if (isPortraitDoc()) {
247+
if (fitToPage) {
248+
_calcPageH = viewportH * zoomValue / HUNDRED_PERCENT;
249+
_calcPageW = (_pageOrigW/_pageOrigH)*_calcPageH;
250+
} else {
251+
_calcPageW = viewportW * zoomValue / HUNDRED_PERCENT;
252+
_calcPageH = (_calcPageW/_pageOrigW)*_pageOrigH;
253+
}
254+
} else {
255+
if (fitToPage) {
256+
_calcPageW = viewportW * zoomValue / HUNDRED_PERCENT;
257+
_calcPageH = viewportH * zoomValue / HUNDRED_PERCENT;
258+
} else {
259+
_calcPageW = viewportW * zoomValue / HUNDRED_PERCENT;
260+
_calcPageH = (_calcPageW/_pageOrigW)*_pageOrigH;
261+
}
262+
}
246263

247264
var zpx1:Number = _calcPageW * zpxp;
248265
var zpy1:Number = _calcPageH * zpyp;
249266
_calcPageX = -((zpx1 + zpx)/2) + mouseX;
250267
_calcPageY = -((zpy1 + zpy)/2) + mouseY;
251-
268+
269+
LogUtil.debug("CHAD 3: zoom: " + zoomValue + " cpw: " + cpw + " cph: " + cph + " _calcPageW: " + _calcPageW + " _calcPageH: " + _calcPageH);
270+
252271
doWidthBoundsDetection();
253272
doHeightBoundsDetection();
254-
255-
if ((zoomValue <= HUNDRED_PERCENT) || (_calcPageW < viewportW) || (_calcPageH < viewportH)) {
256-
if (isPortraitDoc()) {
257-
if (fitToPage) {
258-
_calcPageY = 0;
259-
_calcPageH = viewportH;
260-
_calcPageW = (_pageOrigW/_pageOrigH)*_calcPageH;
261-
_calcPageX = 0;
262-
} else {
263-
_calcPageX = 0;
264-
_calcPageY = 0;
265-
_calcPageW = viewportW;
266-
_calcPageH = (_calcPageW/_pageOrigW)*_pageOrigH;
267-
}
268-
} else {
269-
if (fitToPage) {
270-
_calcPageW = viewportW;
271-
_calcPageH = viewportH;
272-
_calcPageY = 0;
273-
_calcPageX = 0;
274-
} else {
275-
_calcPageX = 0;
276-
_calcPageY = 0;
277-
_calcPageW = viewportW;
278-
_calcPageH = (_calcPageW/_pageOrigW)*_pageOrigH;
279-
}
280-
}
281-
}
273+
282274
calcViewedRegion();
275+
276+
LogUtil.debug("CHAD 4: zoom: " + zoomValue + " cpw: " + cpw + " cph: " + cph + " _calcPageW: " + _calcPageW + " _calcPageH: " + _calcPageH);
277+
283278
}
284279

285280
public function displayViewerRegion(x:Number, y:Number, regionW:Number, regionH:Number):void {

‎bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ package org.bigbluebutton.modules.videoconf.maps
275275
broadcastEvent.camSettings = UsersUtil.amIPublishing();
276276

277277
_dispatcher.dispatchEvent(broadcastEvent);
278-
button.publishingStatus(button.START_PUBLISHING);
278+
if (proxy.videoOptions.showButton) {
279+
button.publishingStatus(button.START_PUBLISHING);
280+
}
279281
}
280282

281283
public function stopPublishing(e:StopBroadcastEvent):void{
@@ -293,8 +295,12 @@ package org.bigbluebutton.modules.videoconf.maps
293295
broadcastEvent.userid = UsersUtil.getMyUserID();
294296
_dispatcher.dispatchEvent(broadcastEvent);
295297

296-
//Make toolbar button enabled again
297-
button.publishingStatus(button.STOP_PUBLISHING);
298+
299+
300+
if (proxy.videoOptions.showButton) {
301+
//Make toolbar button enabled again
302+
button.publishingStatus(button.STOP_PUBLISHING);
303+
}
298304

299305
closeWindow(UsersUtil.getMyUserID());
300306

‎bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,20 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
100100
101101
private function showControlButtons(presenter:Boolean):void {
102102
var vidOptions:VideoConfOptions = new VideoConfOptions();
103-
if (UsersUtil.amIModerator()) {
104-
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = true;
105-
} else if (vidOptions.controlsForPresenter) {
106-
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = presenter;
107-
} else {
108-
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = false;
103+
104+
if (muteUnmuteBtn != null && switchPresenter != null && ejectUserBtn != null) {
105+
if (UsersUtil.amIModerator()) {
106+
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = true;
107+
} else if (vidOptions.controlsForPresenter) {
108+
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = presenter;
109+
} else {
110+
muteUnmuteBtn.visible = switchPresenter.visible = ejectUserBtn.visible = false;
111+
}
112+
113+
muteUnmuteBtn.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.muteButton.toolTip', [UsersUtil.getUserName(sharerUserID)]);
114+
switchPresenter.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.switchPresenter.toolTip', [UsersUtil.getUserName(sharerUserID)]);
115+
ejectUserBtn.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.ejectUserBtn.toolTip', [UsersUtil.getUserName(sharerUserID)]);
109116
}
110-
muteUnmuteBtn.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.muteButton.toolTip', [UsersUtil.getUserName(sharerUserID)]);
111-
switchPresenter.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.switchPresenter.toolTip', [UsersUtil.getUserName(sharerUserID)]);
112-
ejectUserBtn.toolTip = ResourceUtil.getInstance().getString('bbb.video.controls.ejectUserBtn.toolTip', [UsersUtil.getUserName(sharerUserID)]);
113117
}
114118
115119
private function showPrivateChatButton():void {

0 commit comments

Comments
 (0)