You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/18 03:20:43 UTC
svn commit: r1770298 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/
3.2.x/openmeetings-flash/src/main/swf/base/hibernate/
Author: solomax
Date: Fri Nov 18 03:20:43 2016
New Revision: 1770298
URL: http://svn.apache.org/viewvc?rev=1770298&view=rev
Log:
[OPENMEETINGS-1485] restricted user list is now more stable
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1770298&r1=1770297&r2=1770298&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Nov 18 03:20:43 2016
@@ -680,11 +680,15 @@
<!--- Notification of new User -->
<method name="addNewUser" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("addNewUser: ",value);
- if(value.sipTransport) {
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
- } else {
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
+ if ($debug) Debug.write("addNewUser: ", value);
+ if (!!canvas._videocontainer) {
+ if (value.sipTransport) {
+ canvas._videocontainer.addItem(value.connectedSince, value.isMod, value.streamid
+ , value.roomId, '', value.formatedDate, value.userpos, value.usercolor, value);
+ } else {
+ canvas._videocontainer.addClientItem(value.connectedSince, value.isMod, value.streamid
+ , value.roomId, '', value.formatedDate, value.userpos, value.usercolor, value);
+ }
}
canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
</method>
@@ -1426,9 +1430,11 @@
</method>
<method name="roomConnect" args="value">
- if ($debug) Debug.write("roomConnect: ",value);
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.username,
- '',value.formatedDate,value.userpos,value.usercolor,value);
+ if ($debug) Debug.write("roomConnect: ", value);
+ if (!!canvas._videocontainer) {
+ canvas._videocontainer.addItem(value.connectedSince, value.isMod, value.streamid, value.username
+ , '', value.formatedDate, value.userpos, value.usercolor, value);
+ }
</method>
<method name="nickNameSet" args="value">
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=1770298&r1=1770297&r2=1770298&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 Fri Nov 18 03:20:43 2016
@@ -111,11 +111,9 @@
<![CDATA[
for (var i = 0; i < this._table.renderList.length; ++i) {
if (this._table.renderList[i].publicSID == publicSID) {
- this._table.renderList.splice(i,1);
- var item = this._table._innerlist._inn._inn.subviews[i];
- if (!!item) {
- item.destroy();
- }
+ this._table.renderList.splice(i, 1);
+ if ($debug) Debug.write("!!!!! disconnectclient:: ", this._table._innerlist._inn._inn.subviews.length, this._table.renderList.length);
+ //we will NOT destroy ANY items here
break;
}
}
@@ -244,7 +242,6 @@
</method>
<method name="renderByHeightChange" args="refObj">
-
if ($debug) Debug.write("..:: renderByHeightChange ::..",refObj);
lz.Timer.removeTimer(this.resizeDelegate);
@@ -297,7 +294,7 @@
for (var i = 0; i < list.subviews.length; ++i) {
if (records.length > i) {
-
+ //if ($debug) Debug.write(":: renderContent :: draw", i);
list.subviews[i].setAttribute("clickable",true);
list.subviews[i].update(records[i]);
@@ -323,10 +320,9 @@
list.subviews[i].setAttribute("username",records[i].username);
list.subviews[i].setAttribute("formatedDate",records[i].formatedDate);
- list.subviews[i].setAttribute("itemId",i);
-
+ list.subviews[i].setAttribute("itemId", i);
} else {
-
+ //if ($debug) Debug.write(":: renderContent :: reset", i);
list.subviews[i].refObj = null;
list.subviews[i].isselected = false;
@@ -347,6 +343,7 @@
list.subviews[i].setAttribute("itemId","");
list.subviews[i].setAttribute("clickable",false);
+ list.subviews[i].updateUName();
}
}
]]>
@@ -354,7 +351,7 @@
<handler name="onScrollItem" args="item">
<![CDATA[
- //if ($debug) Debug.write("SCROLL item:: ", item.itemId);
+ //if ($debug) Debug.write("SCROLL item:: ", item.itemId, item);
if (this.renderList.length > item.itemId) {
item.setAttribute("clickable", true);
var o = this.renderList[item.itemId];
@@ -411,7 +408,6 @@
item.setAttribute("clickable",false);
}
-
]]>
</handler>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx?rev=1770298&r1=1770297&r2=1770298&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx Fri Nov 18 03:20:43 2016
@@ -66,13 +66,17 @@
}
this.isMod = refObj.isMod;
- this._content._userName.setAttribute('text', getUName());
+ updateUName();
}
updateUserStatus();
this._content._iconsModerator.oninit.sendEvent();
]]>
</method>
-
+
+ <method name="updateUName">
+ this._content._userName.setAttribute('text', getUName());
+ </method>
+
<method name="updateUserStatus">
<![CDATA[
if (this.isMod) {
@@ -105,13 +109,13 @@
//if ($debug) Debug.write(" :: updateIconByMod :: ",this.isMod)
updateUserStatus();
}
- </method>
+ </method>
<method name="updateIconByModScroll">
if (this.clickable) {
updateUserStatus();
}
- </method>
+ </method>
<method name="initModeratorIcons">
//if ($debug) Debug.write(" :1: initModeratorIcons :: ");
@@ -159,9 +163,9 @@
<view name="_content" width="254">
<view name="_contentIsCurrent" visible="${ parent.parent.refObj != null && canvas.publicSID == parent.parent.refObj.publicSID }" width="254" height="40" bgcolor="0x7CFC00"/>
-
+
<labelText name="_userName" x="2" y="2" text="$once{ parent.parent.getUName() }" />
-
+
<typingIcon name="_user_typing" x="132" y="2" width="30" height="16" visible="false"/>
<miniIcons name="_restartDevice" x="220" y="0" width="16" height="16" resource="resyncuser_rsc" showhandcursor="true"
visible="${ parent.parent.clickable && parent.parent.refObj != null && canvas.publicSID == parent.parent.refObj.publicSID && canvas.isBroadCasting }">
@@ -172,7 +176,7 @@
<labelTooltip labelid="610" />
</miniIcons>
<view name="userStatus" visible="${ parent.parent.clickable }" x="238" frame="1" resource="userstatus_multiframe_rsc" />
-
+
<moderationMiniIconRestricted name="_iconsModerator" visibility="hidden"/>
</view>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1770298&r1=1770297&r2=1770298&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Nov 18 03:20:43 2016
@@ -494,11 +494,15 @@
<!--- Notification of new User -->
<method name="addNewUser" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("addNewUser: ",value);
- if(value.sipTransport) {
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
- } else {
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
+ if ($debug) Debug.write("addNewUser: ", value);
+ if (!!canvas._videocontainer) {
+ if (value.sipTransport) {
+ canvas._videocontainer.addItem(value.connectedSince, value.isMod, value.streamid
+ , value.roomId, '', value.formatedDate, value.userpos, value.usercolor, value);
+ } else {
+ canvas._videocontainer.addClientItem(value.connectedSince, value.isMod, value.streamid
+ , value.roomId, '', value.formatedDate, value.userpos, value.usercolor, value);
+ }
}
canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
</method>
@@ -1067,9 +1071,11 @@
</method>
<method name="roomConnect" args="value">
- if ($debug) Debug.write("roomConnect: ",value);
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.username,
- '',value.formatedDate,value.userpos,value.usercolor,value);
+ if ($debug) Debug.write("roomConnect: ", value);
+ if (!!canvas._videocontainer) {
+ canvas._videocontainer.addItem(value.connectedSince, value.isMod, value.streamid, value.username
+ , '', value.formatedDate, value.userpos, value.usercolor, value);
+ }
</method>
<method name="nickNameSet" args="value">