Author: solomax
Date: Fri Dec 4 08:44:20 2015
New Revision: 1717911
URL: http://svn.apache.org/viewvc?rev=1717911&view=rev
Log:
[OPENMEETINGS-1283] add/remove moderator rights works as expected in restricted
and conference rooms; code clean-up
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1717911&r1=1717910&r2=1717911&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Fri Dec 4 08:44:20 2015
@@ -826,9 +826,9 @@
<method name="roomDisconnectUser" args="value,id">
canvas._videocontainer.disconnectclient(id);
- if (canvas.commonVideoViewContent!=null) {
+ if (canvas.commonVideoViewContent != null) {
canvas.commonVideoViewContent.disconnectclient(id);
- if (canvas.currentModApply!=null)
canvas.currentModApply.rejectUser(value);
+ if (canvas.currentModApply != null)
canvas.currentModApply.rejectUser(value);
if (value.isRecording) {
canvas._mymod.recordingUser = null;
}
@@ -998,8 +998,9 @@
<method name="setNewBroadCastingFlag" args="value">
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write(" onResult
setNewBroadCastingFlag : ",value);
-
canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID).setAttribute("refObj",
value);
+ if ($debug) Debug.write(" onResult
setNewBroadCastingFlag : ", value);
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
+ u.update(value);
if (canvas.publicSID == value.publicSID) {
canvas.commonVideoViewContent.toggleVideo(value.canVideo);
canvas.setAttribute("isBroadCasting",
value.isBroadcasting);
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1717911&r1=1717910&r2=1717911&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Fri Dec 4 08:44:20 2015
@@ -182,7 +182,6 @@ the LAST RoomClient Object that has been
-->
<attribute name="currentModeratorList" value="null" />
-<attribute name="newModeratorList" value="null" />
<attribute name="removeModeratorList" value="null" />
<attribute name="ismoderator" value="false" type="boolean" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1717911&r1=1717910&r2=1717911&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Fri Dec 4 08:44:20 2015
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,50 +34,50 @@
</switch>
<class name="baseconfmenucommand" extends="command" >
- <attribute name="enabled" value="true" type="boolean" />
- <attribute name="tipLabelId" value="0" type="number" />
- </class>
-
- <class name="confmenucommand" extends="baseconfmenucommand" >
- <attribute name="actionCommand" value="" type="string" />
- <handler name="onselect" args="sel">
- if (!this.enabled) {
- return;
- }
- canvas.doActionmenu(this.actionCommand);
- </handler>
- </class>
-
- <baseconfmenucommand id="cmd_shareDesktop" tipLabelId="1480" >
- <handler name="onselect" args="sel">
- if (!this.enabled) {
- return;
- }
- canvas._mymod.checkForApplyScreen("no");
- </handler>
- </baseconfmenucommand>
-
- <confmenucommand id="cmd_applyforMod" tipLabelId="1481"
actionCommand="applyForMod" />
-
- <confmenucommand id="cmd_applyforWhiteBoard" tipLabelId="1492"
key="['control','shift','2']">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforWhiteBoard onselect",tSel);
- //Ask for Right to Draw on Whiteboard
+ <attribute name="enabled" value="true" type="boolean" />
+ <attribute name="tipLabelId" value="0" type="number" />
+ </class>
+
+ <class name="confmenucommand" extends="baseconfmenucommand" >
+ <attribute name="actionCommand" value="" type="string" />
+ <handler name="onselect" args="sel">
+ if (!this.enabled) {
+ return;
+ }
+ canvas.doActionmenu(this.actionCommand);
+ </handler>
+ </class>
+
+ <baseconfmenucommand id="cmd_shareDesktop" tipLabelId="1480" >
+ <handler name="onselect" args="sel">
+ if (!this.enabled) {
+ return;
+ }
+ canvas._mymod.checkForApplyScreen("no");
+ </handler>
+ </baseconfmenucommand>
+
+ <confmenucommand id="cmd_applyforMod" tipLabelId="1481"
actionCommand="applyForMod" />
+
+ <confmenucommand id="cmd_applyforWhiteBoard" tipLabelId="1492"
key="['control','shift','2']">
+ <handler name="onselect" args="tSel">
+ if (!this.enabled) {
+ return;
+ }
+ if ($debug) Debug.write("cmd_applyforWhiteBoard
onselect",tSel);
+ //Ask for Right to Draw on Whiteboard
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
- </handler>
- </confmenucommand>
-
- <baseconfmenucommand id="cmd_applyforA" tipLabelId="1602">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforA
onselect",canvas.ismoderator,tSel);
- if (canvas.ismoderator) {
+ </handler>
+ </confmenucommand>
+
+ <baseconfmenucommand id="cmd_applyforA" tipLabelId="1602">
+ <handler name="onselect" args="tSel">
+ if (!this.enabled) {
+ return;
+ }
+ if ($debug) Debug.write("cmd_applyforA
onselect",canvas.ismoderator,tSel);
+ if (canvas.ismoderator) {
//Do directly send confirmation to share
Audio/Video to SELF! so that all users get
//the notification and the broadcasting Bit is
set for this User
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
@@ -89,15 +89,15 @@
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForA",tDate.getTime());
}
- </handler>
- </baseconfmenucommand>
- <baseconfmenucommand id="cmd_applyforAV" tipLabelId="1482">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforAV
onselect",canvas.ismoderator,tSel);
- if (canvas.ismoderator) {
+ </handler>
+ </baseconfmenucommand>
+ <baseconfmenucommand id="cmd_applyforAV" tipLabelId="1482">
+ <handler name="onselect" args="tSel">
+ if (!this.enabled) {
+ return;
+ }
+ if ($debug) Debug.write("cmd_applyforAV
onselect",canvas.ismoderator,tSel);
+ if (canvas.ismoderator) {
//Do directly send confirmation to share
Audio/Video to SELF! so that all users get
//the notification and the broadcasting Bit is
set for this User
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
@@ -109,39 +109,39 @@
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",tDate.getTime());
}
- </handler>
- </baseconfmenucommand>
-
- <confmenucommand id="cmd_createPoll" tipLabelId="1483"
actionCommand="createPoll" />
- <confmenucommand id="cmd_pollResults" tipLabelId="1484"
actionCommand="pollResults" />
- <confmenucommand id="cmd_checkPollVoted" tipLabelId="1485"
actionCommand="checkPollVoted" />
- <confmenucommand id="cmd_importFile" tipLabelId="1479"
actionCommand="importFile" />
- <confmenucommand id="cmd_editCamMicSettings"
actionCommand="editCamMicSettings" tipLabelId="1486" />
- <confmenucommand id="cmd_quit" actionCommand="quit" tipLabelId="1487" />
- <confmenucommand id="cmd_showSipDialer" actionCommand="showSipDialer"
tipLabelId="1488" />
-
- <confmenucommand id="cmd_invitation" actionCommand="invitation"
tipLabelId="1489" />
- <confmenucommand id="cmd_editWhiteboardDefault"
actionCommand="editWhiteboardDefault" tipLabelId="1490" />
-
- <confmenucommand id="cmd_exportFilePNG"
onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileJPG"
onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileSVG"
onselect="canvas.doWhiteboardActionmenu('exportFileSVG')" tipLabelId="1489" />
- <!--
- <confmenucommand id="cmd_exportFilePDF"
onselect="canvas.doWhiteboardActionmenu('exportFilePDF')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileTIF"
onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" tipLabelId="1489" />
- -->
-
- <attribute name="colorArray" value="null" />
- <attribute name="errorLoader" />
-
- <method name="getColorForUser">
- <![CDATA[
- var colorArray = [0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
- 0xE8DB87,0xAFFFB8,0xBED4FF,0xE0BBE8,0xFFBBA5];
- return colorArray[Math.round(Math.random()*10)];
- ]]>
- </method>
-
+ </handler>
+ </baseconfmenucommand>
+
+ <confmenucommand id="cmd_createPoll" tipLabelId="1483"
actionCommand="createPoll" />
+ <confmenucommand id="cmd_pollResults" tipLabelId="1484"
actionCommand="pollResults" />
+ <confmenucommand id="cmd_checkPollVoted" tipLabelId="1485"
actionCommand="checkPollVoted" />
+ <confmenucommand id="cmd_importFile" tipLabelId="1479"
actionCommand="importFile" />
+ <confmenucommand id="cmd_editCamMicSettings"
actionCommand="editCamMicSettings" tipLabelId="1486" />
+ <confmenucommand id="cmd_quit" actionCommand="quit" tipLabelId="1487" />
+ <confmenucommand id="cmd_showSipDialer" actionCommand="showSipDialer"
tipLabelId="1488" />
+
+ <confmenucommand id="cmd_invitation" actionCommand="invitation"
tipLabelId="1489" />
+ <confmenucommand id="cmd_editWhiteboardDefault"
actionCommand="editWhiteboardDefault" tipLabelId="1490" />
+
+ <confmenucommand id="cmd_exportFilePNG"
onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" tipLabelId="1489" />
+ <confmenucommand id="cmd_exportFileJPG"
onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" tipLabelId="1489" />
+ <confmenucommand id="cmd_exportFileSVG"
onselect="canvas.doWhiteboardActionmenu('exportFileSVG')" tipLabelId="1489" />
+ <!--
+ <confmenucommand id="cmd_exportFilePDF"
onselect="canvas.doWhiteboardActionmenu('exportFilePDF')" tipLabelId="1489" />
+ <confmenucommand id="cmd_exportFileTIF"
onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" tipLabelId="1489" />
+ -->
+
+ <attribute name="colorArray" value="null" />
+ <attribute name="errorLoader" />
+
+ <method name="getColorForUser">
+ <![CDATA[
+ var colorArray =
[0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
+
0xE8DB87,0xAFFFB8,0xBED4FF,0xE0BBE8,0xFFBBA5];
+ return colorArray[Math.round(Math.random()*10)];
+ ]]>
+ </method>
+
<method name="remoteLogWrite" args="message">
if ($debug) Debug.warn("remoteLogWrite:: ", message);
if (!errorLoader) {
@@ -151,25 +151,25 @@
});
}
var vars:URLVariables = new URLVariables();
- vars.message = message;
- errorLoader.load(vars);
- </method>
-
- <method name="getHttpHost">
+ vars.message = message;
+ errorLoader.load(vars);
+ </method>
+
+ <method name="getHttpHost">
<![CDATA[
- if (canvas.httphostlocal != null && canvas.httphostlocal.length > 0) {
+ if (canvas.httphostlocal != null && canvas.httphostlocal.length
> 0) {
return canvas.httphostlocal;
}
return canvas.rtmphostlocal;
]]>
- </method>
-
+ </method>
+
<method name="getUrl">
<![CDATA[
return canvas.protocol + '://' + getHttpHost() + ':' +
canvas.red5httpport + canvas.httpRootKey;
]]>
</method>
-
+
<method name="getServicesUrl">
<![CDATA[
return getUrl() + 'services/';
@@ -188,184 +188,184 @@
]]>
</method>
- <method name="myinit">
- <![CDATA[
- canvas.mediaerrortimeout = 30000;
- canvas.medialoadtimeout = 30000;
-
- if($debug) Debug.write("main.lzx/config.xml ondata",this);
-
- //Set Config-values by public/config.xml, see comments on
public/config.xml
- if (!canvas.isCluster) {
-
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
- }
-
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
-
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
-
- var userSSLString =
canvas.myConfigSet.getPointer().xpathQuery('config/useSSL/text()');
- if ($debug) Debug.write("userSSLString",userSSLString)
- if (userSSLString == "yes") {
- this.setAttribute('useSSL',true);
- }
-
-
this.setAttribute('red5httpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/red5httpport/text()')));
-
-
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
-
this.setAttribute('currentappnameurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnameurl/text()'));
-
this.setAttribute('currentappnamebugurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnamebugurl/text()'));
-
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
-
this.setAttribute('webAppRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()'));
-
this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
-
this.setAttribute('firstdayinweek',canvas.myConfigSet.getPointer().xpathQuery('config/firstdayinweek/text()'));
-
this.setAttribute('showRecording',canvas.myConfigSet.getPointer().xpathQuery('config/showRecording/text()'));
-
- //old menubar is not active anymore
-
//this.setAttribute('showmodernWhiteBoard',canvas.myConfigSet.getPointer().xpathQuery('config/showmodernWhiteBoard/text()'));
-
- //Audio-Video-Settings
-
this.setAttribute('codecType',canvas.myConfigSet.getPointer().xpathQuery('config/codecType/text()'));
-
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
-
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
-
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
-
this.setAttribute('camQualityNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityNormal/text()')));
-
this.setAttribute('camQualityBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityBest/text()')));
-
-
this.setAttribute('defaultWhiteboardWidth',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardWidth/text()')));
-
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
-
-
-
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
-
this.setAttribute('httphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/httphostlocal/text()'));
-
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
-
this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+ <method name="myinit">
+ <![CDATA[
+ canvas.mediaerrortimeout = 30000;
+ canvas.medialoadtimeout = 30000;
+
+ if($debug) Debug.write("main.lzx/config.xml ondata",this);
+
+ //Set Config-values by public/config.xml, see comments on
public/config.xml
+ if (!canvas.isCluster) {
+
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
+ }
+
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
+
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
+
+ var userSSLString =
canvas.myConfigSet.getPointer().xpathQuery('config/useSSL/text()');
+ if ($debug) Debug.write("userSSLString",userSSLString)
+ if (userSSLString == "yes") {
+ this.setAttribute('useSSL',true);
+ }
+
+
this.setAttribute('red5httpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/red5httpport/text()')));
+
+
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
+
this.setAttribute('currentappnameurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnameurl/text()'));
+
this.setAttribute('currentappnamebugurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnamebugurl/text()'));
+
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
+
this.setAttribute('webAppRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()'));
+
this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
+
this.setAttribute('firstdayinweek',canvas.myConfigSet.getPointer().xpathQuery('config/firstdayinweek/text()'));
+
this.setAttribute('showRecording',canvas.myConfigSet.getPointer().xpathQuery('config/showRecording/text()'));
+
+ //old menubar is not active anymore
+
//this.setAttribute('showmodernWhiteBoard',canvas.myConfigSet.getPointer().xpathQuery('config/showmodernWhiteBoard/text()'));
+
+ //Audio-Video-Settings
+
this.setAttribute('codecType',canvas.myConfigSet.getPointer().xpathQuery('config/codecType/text()'));
+
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
+
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
+
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
+
this.setAttribute('camQualityNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityNormal/text()')));
+
this.setAttribute('camQualityBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityBest/text()')));
+
+
this.setAttribute('defaultWhiteboardWidth',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardWidth/text()')));
+
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
+
+
+
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
+
this.setAttribute('httphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/httphostlocal/text()'));
+
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
+
this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
//set user color
canvas.currentusercolor = canvas.getColorForUser();
- mainBaseText.setAttribute('text',canvas.currentappname);
- var _url = this.getDisplayObject().loaderInfo.url;
- if($debug) Debug.write("_url: ",_url);
- var cleanUrl = _url;
-
- var hasParams = _url.indexOf("?");
- if (hasParams != -1) {
- cleanUrl = _url.substr(0, hasParams);
- }
-
- if ($debug) Debug.write("_url ",_url,cleanUrl);
- var doubleSlash = cleanUrl.indexOf("//");
- var isNotPort80 = cleanUrl.indexOf(":", doubleSlash+2);
- if ($debug) Debug.write("isNotPort80: ",isNotPort80,doubleSlash);
- if (isNotPort80!=-1){
- //Debug.write("isNotPort80: ",doubleSlash+2, _url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
- var server = cleanUrl.substr(doubleSlash+2, _url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
- } else {
- var server = cleanUrl.substr(doubleSlash+2, _url.indexOf("/",
doubleSlash+2)-doubleSlash-2);
- }
-
- if ($debug) Debug.write("this zielnr: ",this,server);
-
- this.setAttribute('rtmphost',server);
-
- if (this.rtmphostlocal.length==0){
- this.setAttribute('rtmphostlocal',server);
- }
-
- //Check for Invitation
- var invitationHash = lz.Browser.getInitArg('invitationHash');
-
- if ($debug) Debug.info("###################### -1 ");
- if ($debug) Debug.info("invitationHash :: ",invitationHash);
-
- if (invitationHash != undefined){
- canvas.isinitRoomDirect = true;
- canvas.invitationHash = invitationHash;
- }
-
- var secureHash = lz.Browser.getInitArg('secureHash');
- if (secureHash != undefined){
- canvas.secureRemoteUserLogin = true;
- canvas.secureHash = secureHash;
- }
-
- if ($debug) Debug.info("###################### -2 ");
-
- //sid=fe9ea55284e0b23991b1c1089b2c8f64&roomid=1
- var sid = lz.Browser.getInitArg('sid');
- var initroomid = lz.Browser.getInitArg('roomid');
- if (sid != undefined && initroomid != undefined){
- canvas.remoteUserLogin = true;
- canvas.initroomid = initroomid;
- canvas.remoteUserSid = sid;
- }
-
- var directRoomId = lz.Browser.getInitArg('directRoomId');
- if (directRoomId != undefined) {
- canvas.directUserLogin = true;
- canvas.directRoomId = directRoomId;
- }
-
- var language = lz.Browser.getInitArg('language');
- if (language != undefined) {
- canvas.language_id = Number(language);
- }
-
- //check for reset password
- var hash = lz.Browser.getInitArg('hash');
- if (hash!=undefined){
- canvas.isResetUsername = true;
- canvas.resetHash = hash;
- }
-
- var cuserItem = lz.Browser.getInitArg('cuser');
- if (cuserItem!=undefined){
- canvas.cuser = cuserItem;
-
- //Lookup additional actions
- var tAccept = lz.Browser.getInitArg('tAccept');
- if (tAccept != undefined) {
- canvas.cuserStatus = tAccept;
- } else {
- canvas.cuserStatus = "none";
- }
-
- }
-
- var becomemoderator = lz.Browser.getInitArg('becomemoderator');
-
- if (becomemoderator != undefined) {
- if (becomemoderator == "2"){
- canvas.becomemoderator = true;
- } else {
- canvas.becomemoderator = false;
- }
- }
-
- var scopeRoomId = lz.Browser.getInitArg('scopeRoomId');
- if (scopeRoomId != undefined){
- hib.userScope = scopeRoomId;
- }
-
- canvas.setAttribute('wicketsid', null);
- var wicketsid = lz.Browser.getInitArg('wicketsid');
- var wicketroomid = lz.Browser.getInitArg('wicketroomid');
- if (wicketsid != undefined && wicketroomid != undefined &&
!isNaN(wicketroomid)) {
- canvas.setAttribute('wicketsid', wicketsid);
- canvas.setAttribute('wicketroomid', Number(wicketroomid));
- hib.userScope = wicketroomid;
- }
- this.setBaseColors();
-
- //Debug.write("rtmphostlocal,rtmphost:
",canvas.rtmphostlocal,canvas.rtmphost);
- var src = hib.getUrl();
-
- canvas.thishib.setAttribute('src',src);
- canvas.thishib.loaderVar = new lz.autoLoader(canvas);
- canvas.thishib.loaderVar._src.setAttribute('text',src);
- canvas.thishib.connect();
- ]]>
- </method>
-
+ mainBaseText.setAttribute('text',canvas.currentappname);
+ var _url = this.getDisplayObject().loaderInfo.url;
+ if($debug) Debug.write("_url: ",_url);
+ var cleanUrl = _url;
+
+ var hasParams = _url.indexOf("?");
+ if (hasParams != -1) {
+ cleanUrl = _url.substr(0, hasParams);
+ }
+
+ if ($debug) Debug.write("_url ",_url,cleanUrl);
+ var doubleSlash = cleanUrl.indexOf("//");
+ var isNotPort80 = cleanUrl.indexOf(":", doubleSlash+2);
+ if ($debug) Debug.write("isNotPort80:
",isNotPort80,doubleSlash);
+ if (isNotPort80!=-1){
+ //Debug.write("isNotPort80: ",doubleSlash+2,
_url.indexOf(":", doubleSlash+2)-doubleSlash-2);
+ var server = cleanUrl.substr(doubleSlash+2,
_url.indexOf(":", doubleSlash+2)-doubleSlash-2);
+ } else {
+ var server = cleanUrl.substr(doubleSlash+2,
_url.indexOf("/", doubleSlash+2)-doubleSlash-2);
+ }
+
+ if ($debug) Debug.write("this zielnr: ",this,server);
+
+ this.setAttribute('rtmphost',server);
+
+ if (this.rtmphostlocal.length==0){
+ this.setAttribute('rtmphostlocal',server);
+ }
+
+ //Check for Invitation
+ var invitationHash = lz.Browser.getInitArg('invitationHash');
+
+ if ($debug) Debug.info("###################### -1 ");
+ if ($debug) Debug.info("invitationHash :: ",invitationHash);
+
+ if (invitationHash != undefined){
+ canvas.isinitRoomDirect = true;
+ canvas.invitationHash = invitationHash;
+ }
+
+ var secureHash = lz.Browser.getInitArg('secureHash');
+ if (secureHash != undefined){
+ canvas.secureRemoteUserLogin = true;
+ canvas.secureHash = secureHash;
+ }
+
+ if ($debug) Debug.info("###################### -2 ");
+
+ //sid=fe9ea55284e0b23991b1c1089b2c8f64&roomid=1
+ var sid = lz.Browser.getInitArg('sid');
+ var initroomid = lz.Browser.getInitArg('roomid');
+ if (sid != undefined && initroomid != undefined){
+ canvas.remoteUserLogin = true;
+ canvas.initroomid = initroomid;
+ canvas.remoteUserSid = sid;
+ }
+
+ var directRoomId = lz.Browser.getInitArg('directRoomId');
+ if (directRoomId != undefined) {
+ canvas.directUserLogin = true;
+ canvas.directRoomId = directRoomId;
+ }
+
+ var language = lz.Browser.getInitArg('language');
+ if (language != undefined) {
+ canvas.language_id = Number(language);
+ }
+
+ //check for reset password
+ var hash = lz.Browser.getInitArg('hash');
+ if (hash!=undefined){
+ canvas.isResetUsername = true;
+ canvas.resetHash = hash;
+ }
+
+ var cuserItem = lz.Browser.getInitArg('cuser');
+ if (cuserItem!=undefined){
+ canvas.cuser = cuserItem;
+
+ //Lookup additional actions
+ var tAccept = lz.Browser.getInitArg('tAccept');
+ if (tAccept != undefined) {
+ canvas.cuserStatus = tAccept;
+ } else {
+ canvas.cuserStatus = "none";
+ }
+
+ }
+
+ var becomemoderator = lz.Browser.getInitArg('becomemoderator');
+
+ if (becomemoderator != undefined) {
+ if (becomemoderator == "2"){
+ canvas.becomemoderator = true;
+ } else {
+ canvas.becomemoderator = false;
+ }
+ }
+
+ var scopeRoomId = lz.Browser.getInitArg('scopeRoomId');
+ if (scopeRoomId != undefined){
+ hib.userScope = scopeRoomId;
+ }
+
+ canvas.setAttribute('wicketsid', null);
+ var wicketsid = lz.Browser.getInitArg('wicketsid');
+ var wicketroomid = lz.Browser.getInitArg('wicketroomid');
+ if (wicketsid != undefined && wicketroomid != undefined &&
!isNaN(wicketroomid)) {
+ canvas.setAttribute('wicketsid', wicketsid);
+ canvas.setAttribute('wicketroomid',
Number(wicketroomid));
+ hib.userScope = wicketroomid;
+ }
+ this.setBaseColors();
+
+ //Debug.write("rtmphostlocal,rtmphost:
",canvas.rtmphostlocal,canvas.rtmphost);
+ var src = hib.getUrl();
+
+ canvas.thishib.setAttribute('src',src);
+ canvas.thishib.loaderVar = new lz.autoLoader(canvas);
+ canvas.thishib.loaderVar._src.setAttribute('text',src);
+ canvas.thishib.connect();
+ ]]>
+ </method>
+
<netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
if ($debug) Debug.write("#############
logicalRoomLeave: ",value);
@@ -377,28 +377,28 @@
</handler>
</netRemoteCallHib>
- <method name="getLabelName" args="id">
- //if($debug) Debug.write("main.lzx/getLabelName()",id);
- return getLabelTag(id);
- </method>
-
- <!--
- exportFilePNG exportFileJPG exportFilePDF exportFileSVG exportFileTIF
- -->
-
- <method name="doWhiteboardActionmenu" args="action">
- if (action == "exportFilePNG") {
- canvas._drawarea.confirmSaveAsImageTypeExport("image","png");
- } else if (action == "exportFileJPG") {
- canvas._drawarea.confirmSaveAsImageTypeExport("image","jpg");
- } else if (action == "exportFilePDF") {
- canvas._drawarea.confirmSaveAsImageTypeExport("image","pdf");
- } else if (action == "exportFileSVG") {
- canvas._drawarea.confirmSaveAsImageExport("image");
- } else if (action == "exportFileTIF") {
- canvas._drawarea.confirmSaveAsImageTypeExport("image","tif");
- }
- </method>
+ <method name="getLabelName" args="id">
+ //if($debug) Debug.write("main.lzx/getLabelName()",id);
+ return getLabelTag(id);
+ </method>
+
+ <!--
+ exportFilePNG exportFileJPG exportFilePDF exportFileSVG
exportFileTIF
+ -->
+
+ <method name="doWhiteboardActionmenu" args="action">
+ if (action == "exportFilePNG") {
+
canvas._drawarea.confirmSaveAsImageTypeExport("image","png");
+ } else if (action == "exportFileJPG") {
+
canvas._drawarea.confirmSaveAsImageTypeExport("image","jpg");
+ } else if (action == "exportFilePDF") {
+
canvas._drawarea.confirmSaveAsImageTypeExport("image","pdf");
+ } else if (action == "exportFileSVG") {
+ canvas._drawarea.confirmSaveAsImageExport("image");
+ } else if (action == "exportFileTIF") {
+
canvas._drawarea.confirmSaveAsImageTypeExport("image","tif");
+ }
+ </method>
<method name="quit">
canvas.thishib.src = null;
@@ -456,54 +456,54 @@
}
]]>
</method>
-
+
<method name="setRoomValues" args="roomObj">
if ($debug) Debug.warn("setRoomValues ",roomObj);
- //this is needed cause in the rpc-method *getCurrentModeratorList* we
check if its room.type == 'restricted'
- //if so we will not show any *There is no Moderator* Warning Dialog
- canvas.currentRoomObj = roomObj;
+ //this is needed cause in the rpc-method
*getCurrentModeratorList* we check if its room.type == 'restricted'
+ //if so we will not show any *There is no Moderator* Warning
Dialog
+ canvas.currentRoomObj = roomObj;
- if (roomObj != null) {
- hib.currentroomid = roomObj.id;
+ if (roomObj != null) {
+ hib.currentroomid = roomObj.id;
canvas.isConference = roomObj.type == 'conference';
canvas.isInterview = roomObj.type == 'interview';
-
- if (roomObj.type == 'conference') {
- new
lz.flexibleConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
- } else if (roomObj.type == 'restricted') {
- new
lz.restrictedConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
- } else if (roomObj.type == 'interview') {
- new
lz.interviewConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
- }
- }
- </method>
+
+ if (roomObj.type == 'conference') {
+ new
lz.flexibleConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
+ } else if (roomObj.type == 'restricted') {
+ new
lz.restrictedConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
+ } else if (roomObj.type == 'interview') {
+ new
lz.interviewConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
+ }
+ }
+ </method>
<method name="roomClosed">
- <![CDATA[
- if ($debug) Debug.write("canvas.currentRoomObj
",canvas.currentRoomObj);
- new
lz.redirectBox(canvas,{redirectURL:canvas.currentRoomObj.redirectURL});
- ]]>
+ <![CDATA[
+ if ($debug) Debug.write("canvas.currentRoomObj
",canvas.currentRoomObj);
+ new
lz.redirectBox(canvas,{redirectURL:canvas.currentRoomObj.redirectURL});
+ ]]>
</method>
<method name="parseLanugageObject" args="obj">
- ////Debug.write('parseLanugageObject: ',obj);
- ////Debug.write('parseLanugageObject: ',obj.childNodes);
- <![CDATA[
- var t = new Array();
- for (var i=0;i<obj.childNodes.length;i++){
- for (var k=0;k<obj.childNodes[i].childNodes.length;k++){
- ////Debug.write(obj.childNodes[i].childNodes[k]);
- var t2 = new Array();
-
t2[obj.childNodes[i].childNodes[k].childNodes[0].nodeName]=obj.childNodes[i].childNodes[k].childNodes[0].childNodes[0].data;
-
t2[obj.childNodes[i].childNodes[k].childNodes[1].nodeName]=obj.childNodes[i].childNodes[k].childNodes[1].childNodes[0].data;
- t.push(t2);
- }
- }
- setLabelObject(t);
- canvas.initScreen();
- //Debug.write(t);
- ]]>
+ ////Debug.write('parseLanugageObject: ',obj);
+ ////Debug.write('parseLanugageObject: ',obj.childNodes);
+ <![CDATA[
+ var t = new Array();
+ for (var i=0;i<obj.childNodes.length;i++){
+ for (var k=0;k<obj.childNodes[i].childNodes.length;k++){
+
////Debug.write(obj.childNodes[i].childNodes[k]);
+ var t2 = new Array();
+
t2[obj.childNodes[i].childNodes[k].childNodes[0].nodeName]=obj.childNodes[i].childNodes[k].childNodes[0].childNodes[0].data;
+
t2[obj.childNodes[i].childNodes[k].childNodes[1].nodeName]=obj.childNodes[i].childNodes[k].childNodes[1].childNodes[0].data;
+ t.push(t2);
+ }
+ }
+ setLabelObject(t);
+ canvas.initScreen();
+ //Debug.write(t);
+ ]]>
</method>
<!---
@@ -513,58 +513,29 @@
of the user list items
-->
<method name="analyzeModerationList" args="newList">
- <![CDATA[
-
- canvas.newModeratorList = new Array();
- canvas.removeModeratorList = new Array();
-
- if (canvas.currentModeratorList != null) {
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
- canvas.currentModeratorList[i].found = false;
- }
-
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
- for (var k=0;k<newList.length;k++) {
- if (newList[k].publicSID ==
canvas.currentModeratorList[i].publicSID) {
- canvas.currentModeratorList[i].found = true;
- }
- }
- }
- }
-
- for (var k=0;k<newList.length;k++) {
- newList[k].found = false;
- }
-
- for (var k=0;k<newList.length;k++) {
- if (canvas.currentModeratorList != null) {
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
- if (newList[k].publicSID ==
canvas.currentModeratorList[i].publicSID) {
- newList[k].found = true;
- }
- }
- }
- }
-
- for (var k=0;k<newList.length;k++) {
- if (!newList[k].found) {
- canvas.newModeratorList.push(newList[k]);
- }
- }
-
- if (canvas.currentModeratorList != null) {
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
-
- if (!canvas.currentModeratorList[i].found) {
-
canvas.removeModeratorList.push(canvas.currentModeratorList[i])
- }
- }
- }
-
- if ($debug) Debug.write("newModeratorList ::
",canvas.newModeratorList);
- if ($debug) Debug.write("removeModeratorList ::
",canvas.removeModeratorList);
- ]]>
+ <![CDATA[
+ canvas.removeModeratorList = new Array();
+
+ if (canvas.currentModeratorList != null) {
+ for (var i = 0; i < canvas.currentModeratorList.length;
++i) {
+ canvas.currentModeratorList[i].found = false;
+ for (var k = 0; k < newList.length; ++k) {
+ if (newList[k].publicSID ==
canvas.currentModeratorList[i].publicSID) {
+
canvas.currentModeratorList[i].found = true;
+ }
+ }
+ }
+ }
+ if (canvas.currentModeratorList != null) {
+ for (var i = 0; i < canvas.currentModeratorList.length;
++i) {
+ if (!canvas.currentModeratorList[i].found) {
+
canvas.removeModeratorList.push(canvas.currentModeratorList[i])
+ }
+ }
+ }
+
+ if ($debug) Debug.write("removeModeratorList ::
",canvas.removeModeratorList);
+ ]]>
</method>
<!---
@@ -573,35 +544,44 @@
did subscribe using the "onismoderator" handler with reference
to canvas !
-->
<method name="updateModerationFlag">
- <![CDATA[
- if ($debug)
Debug.write("updateModerationFlag",canvas.currentModeratorList);
- var isCurrentModerator = false;
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
- var item = canvas.currentModeratorList[i];
- if (canvas.publicSID == item.publicSID) {
- isCurrentModerator = true;
- }
- }
-
- // do always spread this event, we need to broadcast the
"onismoderator" event
- // so that we can update the status of other users in the user
list
- this.setAttribute('ismoderator',isCurrentModerator);
- ]]>
+ <![CDATA[
+ if ($debug) Debug.write("updateModerationFlag",
canvas.removeModeratorList);
+ for (var i = 0; i < canvas.removeModeratorList.length; ++i) {
+ var item = canvas.removeModeratorList[i];
+ item.isMod = false;
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(item.publicSID);
+ u.update(item, false);
+ }
+ var isCurrentModerator = false;
+ if ($debug) Debug.write("updateModerationFlag",
canvas.currentModeratorList);
+ for (var i = 0; i < canvas.currentModeratorList.length; ++i) {
+ var item = canvas.currentModeratorList[i];
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(item.publicSID);
+ u.update(item);
+ if (canvas.publicSID == item.publicSID) {
+ isCurrentModerator = true;
+ }
+ }
+
+ // do always spread this event, we need to broadcast the
"onismoderator" event
+ // so that we can update the status of other users in the user
list
+ this.setAttribute('ismoderator', isCurrentModerator);
+ ]]>
</method>
<!---
Checks if a certain publicSID is a moderator
-->
<method name="getIsModeratorByPublicSID" args="publicSID">
- <![CDATA[
- for (var i=0;i<canvas.currentModeratorList.length;i++) {
- var item = canvas.currentModeratorList[i];
- if (publicSID == item.publicSID) {
- return true;
- }
- }
- return false;
- ]]>
+ <![CDATA[
+ for (var i=0;i<canvas.currentModeratorList.length;i++) {
+ var item = canvas.currentModeratorList[i];
+ if (publicSID == item.publicSID) {
+ return true;
+ }
+ }
+ return false;
+ ]]>
</method>
<!---
@@ -609,15 +589,16 @@
and broadcasts the three rights to SWF10 container
-->
<method name="setDrawAllowStatus" args="roomClientObj">
- <![CDATA[
- if ($debug) Debug.write("drawAllowStatus changes ###### ");
- if (roomClientObj.publicSID==canvas.publicSID) {
-
canvas.setAttribute("isAllowedToDraw",roomClientObj.canDraw);
-
canvas.setAttribute("isAllowedToScreenShare",roomClientObj.canShare);
-
canvas.setAttribute("isAllowedToRemoteControl",roomClientObj.canRemote);
-
canvas.commonVideoViewContent.setDrawAllowStatus(roomClientObj.canDraw,
roomClientObj.canShare, roomClientObj.canRemote);
- }
- ]]>
+ <![CDATA[
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(roomClientObj.publicSID);
+ u.update(roomClientObj);
+ if ($debug) Debug.write("drawAllowStatus changes ###### ");
+ if (roomClientObj.publicSID == canvas.publicSID) {
+ canvas.setAttribute("isAllowedToDraw",
roomClientObj.canDraw);
+ canvas.setAttribute("isAllowedToScreenShare",
roomClientObj.canShare);
+ canvas.setAttribute("isAllowedToRemoteControl",
roomClientObj.canRemote);
+ }
+ ]]>
</method>
<!---
@@ -625,132 +606,136 @@
SWF10 container
-->
<method name="setExclusiveAudioAllowStatus" args="roomClientObj">
- <![CDATA[
- if ($debug) Debug.write("giveExclusiveAudioStatus changes
###### ");
- if (roomClientObj.publicSID==canvas.publicSID) {
-
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
-
canvas.commonVideoViewContent.setExclusiveAudioAllowStatus(roomClientObj.canGiveAudio);
- }
- ]]>
+ <![CDATA[
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(roomClientObj.publicSID);
+ u.update(roomClientObj);
+ if ($debug) Debug.write("giveExclusiveAudioStatus changes
###### ");
+ if (roomClientObj.publicSID==canvas.publicSID) {
+
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
+
canvas.commonVideoViewContent.setExclusiveAudioAllowStatus(roomClientObj.canGiveAudio);
+ }
+ ]]>
</method>
<method name="setMuteStatus" args="roomClientObj">
- <![CDATA[
- if ($debug) Debug.write("setMuteStatus changes ######
",roomClientObj.micMuted);
- //Check for self status
- if (roomClientObj.publicSID==canvas.publicSID) {
- canvas.setAttribute("micMuted",roomClientObj.micMuted);
- }
-
- canvas._videocontainer.updateMuteStatusVideoView(roomClientObj);
-
- //Notify all Listeners for change of the item
- canvas.setAttribute("micMutedStatusChangedItem",roomClientObj);
- ]]>
+ <![CDATA[
+ var u =
canvas._videocontainer._participants.getUserListItemByPublicSID(roomClientObj.publicSID);
+ u.update(roomClientObj);
+ if ($debug) Debug.write("setMuteStatus changes ######
",roomClientObj.micMuted);
+ //Check for self status
+ if (roomClientObj.publicSID == canvas.publicSID) {
+ canvas.setAttribute("micMuted",roomClientObj.micMuted);
+ }
+
+ canvas._videocontainer.updateMuteStatusVideoView(roomClientObj);
+
+ //Notify all Listeners for change of the item
+ canvas.setAttribute("micMutedStatusChangedItem", roomClientObj);
+ ]]>
</method>
<method name="addFolderSequence" args="foldername">
- <![CDATA[
- this.uploadmoduleimgfolder = '/';
- this.uploadmoduleimgfolder += foldername;
-
this.setAttribute('uploadmoduleimgfolder',this.uploadmoduleimgfolder);
- ]]>
+ <![CDATA[
+ this.uploadmoduleimgfolder = '/';
+ this.uploadmoduleimgfolder += foldername;
+
this.setAttribute('uploadmoduleimgfolder',this.uploadmoduleimgfolder);
+ ]]>
</method>
-
-
+
+
<handler name="onmousewheeldelta" reference="lz.Keys" args="d">
- var obj = getCurrentMouseWheelObject();
- ////Debug.write("onmousewheeldelta 12: ",d,obj);
- <![CDATA[
- if (obj!=null) {
- obj.step(-d);
- }
- ]]>
- </handler>
+ <![CDATA[
+ var obj = getCurrentMouseWheelObject();
+ ////Debug.write("onmousewheeldelta 12: ",d,obj);
+ if (obj!=null) {
+ obj.step(-d);
+ }
+ ]]>
+ </handler>
<method name="reverseWordingsBySplit" args="str">
- <![CDATA[
- var words_arr = str.split( " " ); // an array of chars
- for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
- {
- str += words_arr[ words_arr.length - i - 1 ];
- if (words_arr.length != 1) {
- str += " ";
- }
- }
- return str;
-
- ]]>
+ <![CDATA[
+ var words_arr = str.split( " " ); // an array of chars
+ for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
+ {
+ str += words_arr[ words_arr.length - i - 1 ];
+ if (words_arr.length != 1) {
+ str += " ";
+ }
+ }
+ return str;
+
+ ]]>
</method>
<method name="reverseAll" args="str">
- <![CDATA[
- var words_arr = str.split( "" ); // an array of chars
- for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
- {
- str += words_arr[ words_arr.length - i - 1 ];
-
- }
- return str;
-
- ]]>
+ <![CDATA[
+ var words_arr = str.split( "" ); // an array of chars
+ for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
+ {
+ str += words_arr[ words_arr.length - i - 1 ];
+
+ }
+ return str;
+
+ ]]>
</method>
-
+
<method name="reverseWords" args="str">
- <![CDATA[
- if ( str == "" || str == null ) return ""; // undefined
- // first char indicates the main directive of str (rtl/ltr)
- if ( isLTR( str.charCodeAt( 0 ) ) ) return str; // english or
number
- var words_arr = str.split( "" ); // an array of chars
- for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
- str += words_arr[ words_arr.length - i - 1 ];
- return str;
- ]]>
+ <![CDATA[
+ if ( str == "" || str == null ) return ""; // undefined
+ // first char indicates the main directive of str (rtl/ltr)
+ if ( isLTR( str.charCodeAt( 0 ) ) ) return str; // english or
number
+ var words_arr = str.split( "" ); // an array of chars
+ for ( var i = 0, str = ""; i < words_arr.length; i++ ) //
reverse their order
+ str += words_arr[ words_arr.length - i - 1 ];
+ return str;
+ ]]>
</method>
-
+
<method name="isLTR" args="c">
- <![CDATA[
- return ( c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 &&
c <= 122 );
- ]]>
+ <![CDATA[
+ return ( c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 &&
c <= 122 );
+ ]]>
</method>
<method name="isHEB" args="c">
- <![CDATA[
- return ( c >= 224 && c <= 250 );
- ]]>
- </method>
+ <![CDATA[
+ return ( c >= 224 && c <= 250 );
+ ]]>
+ </method>
<method name="setTextAlign" args="obj,type">
- switch ( type ) {
- case "left" :
- obj.setX( 0 );
- break;
- case "center" :
- obj.setX( this.parent.width / 2 - this.getTextWidth() / 2 );
- break;
- case "right" :
- obj.setX( this.parent.width - this.getTextWidth() );
- break;
- }
+ switch ( type ) {
+ case "left" :
+ obj.setX( 0 );
+ break;
+ case "center" :
+ obj.setX( this.parent.width / 2 -
this.getTextWidth() / 2 );
+ break;
+ case "right" :
+ obj.setX( this.parent.width -
this.getTextWidth() );
+ break;
+ }
</method>
<method name="getUserData">
- var so:SharedObject = SharedObject.getLocal('userdata');
- var g = so.data;
- if (g == null) {
- if($debug) Debug.write("sharedObject.getData IS null");
- g = new Array();
- }
- return g;
+ var so:SharedObject = SharedObject.getLocal('userdata');
+ var g = so.data;
+ if (g == null) {
+ if($debug) Debug.write("sharedObject.getData IS null");
+ g = new Array();
+ }
+ return g;
</method>
<method name="setUserData" args="g">
- var so:SharedObject = SharedObject.getLocal('userdata');
+ var so:SharedObject = SharedObject.getLocal('userdata');
for (var i in g) {
if($debug) Debug.write("g[" + i + "] = ", g[i]);
so.data[i] = g[i];
}
- so.flush();
+ so.flush();
</method>
<method name="getThemeImage" args="tName">
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1717911&r1=1717910&r2=1717911&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Fri Dec 4 08:44:20 2015
@@ -407,20 +407,6 @@
]]>
</method>
- <!---
- Update the canDraw,canShare,canRemote flag, there is no need to check
here which user
- this happened already before sending it to the SWF10 app
- -->
- <method name="setDrawAllowStatus" args="canDraw,canShare,canRemote">
- <![CDATA[
- if ($debug) Debug.write("setDrawAllowStatus ::
",canDraw,canShare,canRemote);
- canvas.setAttribute("isAllowedToDraw",canDraw);
- canvas.setAttribute("isAllowedToScreenShare",canShare);
- canvas.setAttribute("isAllowedToRemoteControl",canRemote);
- return;
- ]]>
- </method>
-
<method name="setExclusiveAudioAllowStatus" args="canGiveAudio">
<![CDATA[
if ($debug) Debug.write("setExclusiveAudioAllowStatus ::
",canGiveAudio);
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx?rev=1717911&r1=1717910&r2=1717911&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
Fri Dec 4 08:44:20 2015
@@ -56,7 +56,7 @@
]]>
</handler>
- <method name="update" args="obj">
+ <method name="update" args="obj, full=true">
setAttribute('firstname', obj.firstname);
setAttribute('lastname', obj.lastname);
refObj = obj;
