Author: solomax
Date: Sat Oct 8 14:53:16 2016
New Revision: 1763902
URL: http://svn.apache.org/viewvc?rev=1763902&view=rev
Log:
[OPENMEETINGS-1485] scroll in restricted room is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1763902&r1=1763901&r2=1763902&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Sat Oct 8 14:53:16 2016
@@ -125,37 +125,32 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="setRoomValues" funcname="setRoomValues"
remotecontext="$once{ canvas.thishib }" >
- <attribute name="applyDefaultModeration" value="false" type="boolean"
/>
- <attribute name="groupId" value="0" type="number" />
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <netparam><method name="getValue">return
parent.applyDefaultModeration;</method></netparam>
- <netparam><method name="getValue">return
canvas.becomeSuperModerator;</method></netparam>
- <netparam><method name="getValue">return
canvas.currentusercolor;</method></netparam>
- <handler name="ondata" args="roomStatus">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setRoomValues1: ", roomStatus);
- //if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
-
- //if ($debug) Debug.write("+++++++++++++++++ getClientListScope :
",value);
-
- if (roomStatus.roomFull) {
- canvas.thishib.showFullMessage = true;
- canvas.thishib.disconnect();
- }
-
- var value = roomStatus.clientList;
-
- for (var i = 0; i < value.length; ++i){
- if ( value[i].streamid == canvas.streamid ) {
- canvas.isAllowedToDraw = value[i].canDraw;
- }
+ <netRemoteCallHib name="setRoomValues" funcname="setRoomValues"
remotecontext="$once{ canvas.thishib }" >
+ <attribute name="applyDefaultModeration" value="false"
type="boolean" />
+ <attribute name="groupId" value="0" type="number" />
+ <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
+ <netparam><method name="getValue">return
parent.applyDefaultModeration;</method></netparam>
+ <netparam><method name="getValue">return
canvas.becomeSuperModerator;</method></netparam>
+ <netparam><method name="getValue">return
canvas.currentusercolor;</method></netparam>
+ <handler name="ondata" args="roomStatus">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("setRoomValues1: ", roomStatus);
+ //if ($debug) Debug.write("setRoomValues2:
",hib.currentroomid);
+ //if ($debug) Debug.write("+++++++++++++++++
getClientListScope : ",value);
+ if (roomStatus.roomFull) {
+ canvas.thishib.showFullMessage = true;
+ canvas.thishib.disconnect();
+ }
+ var value = roomStatus.clientList;
+ for (var i = 0; i < value.length; ++i) {
+ if (value[i].streamid == canvas.streamid ) {
+ canvas.isAllowedToDraw =
value[i].canDraw;
+ }
parent.addItemInitial(value[i]);
}
-
- //Render and Show User-List
- parent._participants.sortAndRenderList();
+ //Render and Show User-List
+ parent._participants.sortAndRenderList();
parent.delayedCreateVideo(value);
//this content must be inited _after_ setting the
default values
@@ -166,7 +161,7 @@
canvas._currentChatPanel.toggleopen();
}
]]>
- </handler>
+ </handler>
</netRemoteCallHib>
<method name="delayedCreateVideo" args="clients">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx?rev=1763902&r1=1763901&r2=1763902&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
Sat Oct 8 14:53:16 2016
@@ -331,11 +331,14 @@
<handler name="onScrollItem" args="item">
<![CDATA[
+ //if ($debug) Debug.write("SCROLL item:: ",
item.itemId);
if (this.renderList.length > item.itemId) {
- item.setAttribute("clickable",true);
- item.refObj = this.renderList[item.itemId];
+ item.setAttribute("clickable", true);
+ var o = this.renderList[item.itemId];
+ //if ($debug) Debug.write("SCROLL item:: ",
o.lastname, item.lastname);
+ item.refObj = o;
- if (this.renderList[item.itemId]["isselected"]
&& this.renderList[item.itemId].isselected) {
+ if (o["isselected"] && o.isselected) {
item.isselected = true;
item.onmouseout.sendEvent();
item.initModeratorIcons();
@@ -345,24 +348,23 @@
item.hideModeratorIcons();
}
- if ($debug)
Debug.write(item.itemId,this.renderList[item.itemId].isMod,this.renderList[item.itemId].publicSID);
+ if ($debug) Debug.write(item.itemId, o.isMod,
o.publicSID);
-
item.setAttribute("userId",this.renderList[item.itemId].userId);
-
item.setAttribute("firstname",this.renderList[item.itemId].firstname);
-
item.setAttribute("isSuperModerator",this.renderList[item.itemId].isSuperModerator);
-
item.setAttribute("lastname",this.renderList[item.itemId].lastname);
-
item.setAttribute("connectedSince",this.renderList[item.itemId].connectedSince);
-
item.setAttribute("micMuted",this.renderList[item.itemId].micMuted);
- item.isBroadcasting =
this.renderList[item.itemId].isBroadcasting;
-
item.setAttribute("isMod",this.renderList[item.itemId].isMod);
- item.streamid =
this.renderList[item.itemId].streamid;
-
item.setAttribute("username",this.renderList[item.itemId].username);
-
item.setAttribute("formatedDate",this.renderList[item.itemId].formatedDate);
-
- item.setAttribute("itemId",item.itemId);
+ item.setAttribute("userId", o.userId);
+ item.setAttribute("firstname", o.firstname);
+ item.setAttribute("isSuperModerator",
o.isSuperModerator);
+ item.setAttribute("lastname", o.lastname);
+ item.setAttribute("connectedSince",
o.connectedSince);
+ item.setAttribute("micMuted", o.micMuted);
+ item.isBroadcasting = o.isBroadcasting;
+ item.setAttribute("isMod", o.isMod);
+ item.streamid = o.streamid;
+ item.setAttribute("username", o.username);
+ item.setAttribute("formatedDate",
o.formatedDate);
+ item.setAttribute("itemId", item.itemId);
+ item.update(o);
item.updateIconByModScroll();
-
} else {
item.isselected = false;
item.onmouseout.sendEvent();
