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/09/23 08:37:51 UTC
svn commit: r1762028 - in
/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference:
interviewuserlist/interviewListInner.lzx participants/participantList.lzx
restricted/restrictedUserListInner.lzx
Author: solomax
Date: Fri Sep 23 08:37:51 2016
New Revision: 1762028
URL: http://svn.apache.org/viewvc?rev=1762028&view=rev
Log:
[OPENMEETINGS-1474] user list is being properly displayed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.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/interviewuserlist/interviewListInner.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1762028&r1=1762027&r2=1762028&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx Fri Sep 23 08:37:51 2016
@@ -93,39 +93,30 @@
}
]]>
</method>
-
- <method name="sortUserList">
- <![CDATA[
-
- if (this.sortType == "alphabetical") {
- function sortByName(a,b) {
-
- if(a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
- else if(a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
- else return 0;
-
- }
-
- this._table.innerList.subviews.sort(sortByStreamId);
- this._table.innerList._layout.subviews.sort(sortByStreamId);
- } else {
- function sortByStreamId(a,b) {
-
- if(Number(a.streamid) == Number(b.streamid)) return 0;
- else if(Number(a.streamid) > Number(b.streamid)) return 1;
- else return -1;
-
- }
-
- this._table.innerList.subviews.sort(sortByStreamId);
- this._table.innerList._layout.subviews.sort(sortByStreamId);
- }
-
- this._table.innerList._layout.update();
- ]]>
- </method>
-
-
+
+ <method name="sortUserList">
+ <![CDATA[
+ if (this.sortType == "alphabetical") {
+ function sortByName(a,b) {
+ if(a.firstname && a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
+ else if(a.firstname && a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
+ else return 0;
+ }
+ this._table.innerList.subviews.sort(sortByName);
+ this._table.innerList._layout.subviews.sort(sortByName);
+ } else {
+ function sortByStreamId(a,b) {
+ if(Number(a.streamid) == Number(b.streamid)) return 0;
+ else if(Number(a.streamid) > Number(b.streamid)) return 1;
+ else return -1;
+ }
+ this._table.innerList.subviews.sort(sortByStreamId);
+ this._table.innerList._layout.subviews.sort(sortByStreamId);
+ }
+ this._table.innerList._layout.update();
+ ]]>
+ </method>
+
<method name="initList">
new lz.interviewListTable(this, {name:'_table'});
this.moderationPanel.bringToFront();
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx?rev=1762028&r1=1762027&r2=1762028&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx Fri Sep 23 08:37:51 2016
@@ -75,38 +75,30 @@
this.sortUserList();
]]>
</method>
-
- <method name="sortUserList">
- <![CDATA[
-
- if (this.sortType == "alphabetical") {
- function sortByName(a,b) {
-
- if(a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
- else if(a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
- else return 0;
-
- }
-
- this._table.innerList.subviews.sort(sortByStreamId);
- this._table.innerList._layout.subviews.sort(sortByStreamId);
- } else {
- function sortByStreamId(a,b) {
-
- if(Number(a.streamid) == Number(b.streamid)) return 0;
- else if(Number(a.streamid) > Number(b.streamid)) return 1;
- else return -1;
-
- }
-
- this._table.innerList.subviews.sort(sortByStreamId);
- this._table.innerList._layout.subviews.sort(sortByStreamId);
- }
-
- this._table.innerList._layout.update();
- ]]>
- </method>
-
+
+ <method name="sortUserList">
+ <![CDATA[
+ if (this.sortType == "alphabetical") {
+ function sortByName(a,b) {
+ if(a.firstname && a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
+ else if(a.firstname && a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
+ else return 0;
+ }
+ this._table.innerList.subviews.sort(sortByName);
+ this._table.innerList._layout.subviews.sort(sortByName);
+ } else {
+ function sortByStreamId(a,b) {
+ if(Number(a.streamid) == Number(b.streamid)) return 0;
+ else if(Number(a.streamid) > Number(b.streamid)) return 1;
+ else return -1;
+ }
+ this._table.innerList.subviews.sort(sortByStreamId);
+ this._table.innerList._layout.subviews.sort(sortByStreamId);
+ }
+ this._table.innerList._layout.update();
+ ]]>
+ </method>
+
<method name="clearList">
this._table.destroy();
new lz.participantsTable(this,{name:'_table'});
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=1762028&r1=1762027&r2=1762028&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 Sep 23 08:37:51 2016
@@ -20,19 +20,16 @@
-->
<library>
-<class name="restrictedUserListInner" extends="baseRoomInnerList"
- width="$once{ parent.width }" height="${ parent.height }" >
-
+<class name="restrictedUserListInner" extends="baseRoomInnerList"
+ width="$once{ parent.width }" height="${ parent.height }" >
<attribute name="selectedItem" value="null" />
-
<attribute name="listType" value="eventUserListTable" type="string" />
-
<attribute name="sortType" value="alphabetical" type="string" />
-
+
<handler name="oninit">
this.initList();
</handler>
-
+
<method name="initialAddItem" args="object">
<![CDATA[
if ($debug) Debug.write("restrictedUserListInner::initialAddItem : ", object);
@@ -87,6 +84,8 @@
function sortByName(a,b) {
if(a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
else if(a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
+ //if(a.firstname && a.firstname.toLowerCase() < b.firstname.toLowerCase()) return -1;
+ //else if(a.firstname && a.firstname.toLowerCase() > b.firstname.toLowerCase()) return 1;
else return 0;
}
this._table.renderList.sort(sortByName);
@@ -482,8 +481,6 @@
<labelText labelid="680" width="270" x="0" multiline="true" y="0" />
</view>
-
</class>
-
</library>