Author: sebawagner
Date: Sat May 12 09:13:45 2012
New Revision: 1337486
URL: http://svn.apache.org/viewvc?rev=1337486&view=rev
Log:
Fix icon opacity status in restricted room type
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1337486&r1=1337485&r2=1337486&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
Sat May 12 09:13:45 2012
@@ -78,6 +78,9 @@
this._denyRemote.setAttribute("visibility","hidden");
this._denyExclusiveAudio.setAttribute("visibility","hidden");
} else {
+
+ if ($debug) Debug.write("parent.parent.refObj.canShare
:: ",parent.parent.refObj.canShare);
+
if (parent.parent.refObj.canShare) {
this._allowScreen.setAttribute("visibility","visible");
this._allowScreen.isActive = true;
@@ -178,7 +181,7 @@
<labelTooltip name="_text" labelid="676" />
</miniIcons>
- <miniIcons name="_canDraw" x="20" width="16"
resource="participants_allow_drawing_rsc"
+ <miniIcons name="_canDraw" x="20" width="16"
resource="participants_allow_drawing_rsc"
height="16" showhandcursor="false" >
<attribute name="isActive" value="true" type="boolean" />
<handler name="onclick">
@@ -228,7 +231,7 @@
<labelTooltip name="_text" labelid="1068" />
</miniIcons>
- <miniIcons name="_denyScreen" x="40" width="16" height="16"
+ <miniIcons name="_denyScreen" x="40" width="16" height="16" opacity="0.5"
resource="screen_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Allow Screen:
",parent.parent.parent.refObj.publicSID);
@@ -257,7 +260,7 @@
<labelTooltip name="_text" labelid="1079" />
</miniIcons>
- <miniIcons name="_denyRemote" x="60" width="16" height="16"
+ <miniIcons name="_denyRemote" x="60" width="16" height="16" opacity="0.5"
resource="remote_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Allow Screen:
",parent.parent.parent.refObj.publicSID);
@@ -281,7 +284,8 @@
<labelTooltip labelid="683" />
</miniIcons>
- <miniIcons name="_denyDevice" x="80" width="40" height="16"
resource="av_deny_rsc" showhandcursor="true">
+ <miniIcons name="_denyDevice" x="80" width="40" height="16"
resource="av_deny_rsc"
+ opacity="0.5" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("ALLOW:
",parent.parent.parent.refObj.publicSID);
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator =
parent.parent.parent.refObj.publicSID;
@@ -291,7 +295,8 @@
<labelTooltip labelid="684" />
</miniIcons>
- <miniIcons name="_muteDevice" x="120" width="16" height="16"
resource="mute_btn_rsc" showhandcursor="true">
+ <miniIcons name="_muteDevice" x="120" width="16" height="16"
resource="mute_btn_rsc"
+ opacity="0.5" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("mute:
",parent.parent.parent.refObj.publicSID);
canvas._videocontainer._videoviewcontent.muteSound(parent.parent.parent.refObj.publicSID,
true);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1337486&r1=1337485&r2=1337486&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
Sat May 12 09:13:45 2012
@@ -494,6 +494,15 @@
if ($debug) Debug.write(" :: onmicMutedStatusChangedItem ::
",roomClientObj.micMuted);
+ var vList = parent._table.renderList;
+ for (var i=0;i<vList.length;i++) {
+ //vList[i].updateIconByMod();
+ if (vList[i].publicSID == roomClientObj.publicSID) {
+ parent._table.renderList[i].micMuted =
roomClientObj.micMuted;
+ break;
+ }
+ }
+
//search for the user and update its drawStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
@@ -506,14 +515,6 @@
}
}
- var vList = parent._table.renderList;
- for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
- if (vList[i].publicSID == roomClientObj.publicSID) {
- parent._table.renderList[i].micMuted =
roomClientObj.micMuted;
- break;
- }
- }
parent._applyAndStatusIcons.updateIcons();
@@ -525,6 +526,17 @@
if ($debug) Debug.write(" :: ondrawAllowStatus ::
",drawObject.canDraw);
+ var vList = parent._table.renderList;
+ for (var i=0;i<vList.length;i++) {
+ //vList[i].updateIconByMod();
+ if (vList[i].publicSID == drawObject.publicSID) {
+ parent._table.renderList[i].canDraw =
drawObject.canDraw;
+ parent._table.renderList[i].canShare =
drawObject.canShare;
+ parent._table.renderList[i].canRemote =
drawObject.canRemote;
+ break;
+ }
+ }
+
//search for the user and update its drawStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
@@ -539,17 +551,6 @@
break;
}
}
-
- var vList = parent._table.renderList;
- for (var i=0;i<vList.length;i++) {
- //vList[i].updateIconByMod();
- if (vList[i].publicSID == drawObject.publicSID) {
- parent._table.renderList[i].canDraw =
drawObject.canDraw;
- parent._table.renderList[i].canShare =
drawObject.canShare;
- parent._table.renderList[i].canRemote =
drawObject.canRemote;
- break;
- }
- }
parent._applyAndStatusIcons.updateIcons();
]]>
@@ -559,7 +560,15 @@
<![CDATA[
if ($debug) Debug.write(" :: exclusiveAudioAllowStatus ::
",rclObject.canGiveAudio);
-
+
+ var vList = parent._table.renderList;
+ for (var i=0;i<vList.length;i++) {
+ if (vList[i].publicSID == rclObject.publicSID) {
+ parent._table.renderList[i].canGiveAudio =
rclObject.canGiveAudio;
+ break;
+ }
+ }
+
//search for the user and update its exclusiveAudioStatusIcon
var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
@@ -572,14 +581,6 @@
}
}
- var vList = parent._table.renderList;
- for (var i=0;i<vList.length;i++) {
- if (vList[i].publicSID == rclObject.publicSID) {
- parent._table.renderList[i].canGiveAudio =
rclObject.canGiveAudio;
- break;
- }
- }
-
parent._applyAndStatusIcons.updateIcons();
]]>
</handler>
@@ -595,20 +596,20 @@
parent.parent.removeVideoByUser(userObject);
}
- //search for the user and update its drawStatusIcon
- var vList = parent._table._innerlist._inn._inn.subviews;
+ var vList = parent._table.renderList;
for (var i=0;i<vList.length;i++) {
- if (vList[i].refObj.publicSID == userObject.publicSID) {
- vList[i].isBroadcasting = userObject.isBroadcasting;
- vList[i].updateModeratorIcons();
+ if (vList[i].publicSID == userObject.publicSID) {
+ parent._table.renderList[i].isBroadcasting =
userObject.isBroadcasting;
break;
}
}
- var vList = parent._table.renderList;
+ //search for the user and update its drawStatusIcon
+ var vList = parent._table._innerlist._inn._inn.subviews;
for (var i=0;i<vList.length;i++) {
- if (vList[i].publicSID == userObject.publicSID) {
- parent._table.renderList[i].isBroadcasting =
userObject.isBroadcasting;
+ if (vList[i].refObj.publicSID == userObject.publicSID) {
+ vList[i].isBroadcasting = userObject.isBroadcasting;
+ vList[i].updateModeratorIcons();
break;
}
}
