From c4d240950f3afaee653ba04cb99d60606339d8c9 Mon Sep 17 00:00:00 2001 From: Ghazi Triki Date: Sun, 23 Aug 2015 16:35:10 +0100 Subject: [PATCH] Configuration property enableRaiseHand renamed to enableEmojiStatus. --- bigbluebutton-client/resources/config.xml.template | 2 +- .../org/bigbluebutton/modules/users/model/UsersOptions.as | 6 +++--- .../org/bigbluebutton/modules/users/views/UsersWindow.mxml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index f98b1f7f90..c3d1e3ff55 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -35,7 +35,7 @@ diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as index 9baaeb069b..a1f7044262 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as @@ -35,7 +35,7 @@ package org.bigbluebutton.modules.users.model public var allowKickUser:Boolean = true; [Bindable] - public var enableRaiseHand:Boolean = true; + public var enableEmojiStatus:Boolean = true; [Bindable] public var enableSettingsButton:Boolean = true; @@ -54,8 +54,8 @@ package org.bigbluebutton.modules.users.model if (vxml.@allowKickUser != undefined) { allowKickUser = (vxml.@allowKickUser.toString().toUpperCase() == "TRUE") ? true : false; } - if (vxml.@enableRaiseHand != undefined) { - enableRaiseHand = (vxml.@enableRaiseHand.toString().toUpperCase() == "TRUE") ? true : false; + if (vxml.@enableEmojiStatus != undefined) { + enableEmojiStatus = (vxml.@enableEmojiStatus.toString().toUpperCase() == "TRUE") ? true : false; } if (vxml.@enableSettingsButton != undefined) { enableSettingsButton = (vxml.@enableSettingsButton.toString().toUpperCase() == "TRUE") ? true : false; 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 13fcc416d1..9bcc1bbfbb 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml @@ -176,7 +176,7 @@ } private function changeButtons(presenter:Boolean):void { - raiseHandBtn.visible = raiseHandBtn.includeInLayout = partOptions.enableRaiseHand; + raiseHandBtn.visible = raiseHandBtn.includeInLayout = partOptions.enableEmojiStatus; } /*