Author: solomax
Date: Thu Aug 18 03:15:17 2016
New Revision: 1756702
URL: http://svn.apache.org/viewvc?rev=1756702&view=rev
Log:
[OPENMEETINGS-1408] settings are being saved
Removed:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/openlaszlo.xml
openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/openlaszlo.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/openlaszlo.xml?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/openlaszlo.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/openlaszlo.xml
Thu Aug 18 03:15:17 2016
@@ -32,11 +32,11 @@
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only" depends="main,networktesting,settings"
unless="client-already-built">
+ <target name="client.only" depends="main,networktesting"
unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
- <target name="client.debug.only"
depends="main.debug,networktesting.debug,settings.debug" >
+ <target name="client.debug.only"
depends="main.debug,networktesting.debug" >
<property name="client-already-built" value="true"/>
</target>
@@ -98,28 +98,4 @@
<param name="flash.debug" value="--debug" />
</antcall>
</target>
-
- <target name="settings" depends="settings.debug">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir" value="${src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="settings.lzx" />
- <param name="flash.out.file" value="settings.swf11.swf"
/>
- <param name="flash.debug" value="" />
- </antcall>
- </target>
-
- <target name="settings.debug">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir" value="${src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="settings.lzx" />
- <param name="flash.out.file"
value="settingsdebug.swf11.swf" />
- <param name="flash.debug" value="--debug" />
- </antcall>
- </target>
</project>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml Thu Aug
18 03:15:17 2016
@@ -78,7 +78,7 @@
</property>
</activation>
<properties>
- <ant.target>settings.debug</ant.target>
+ <ant.target>main.debug</ant.target>
</properties>
</profile>
</profiles>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
Thu Aug 18 03:15:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
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
@@ -29,8 +29,8 @@
<script>
<![CDATA[
ExternalInterface.addCallback("redirectToUrlCallback",
redirectToUrlCallback);
- ExternalInterface.addCallback("getBrowserInfoCallback",
getBrowserInfoCallback);
- ExternalInterface.addCallback("getBrowserLangCallback",
getBrowserLangCallback);
+ ExternalInterface.addCallback("getBrowserInfoCallback",
getBrowserInfoCallback);
+ ExternalInterface.addCallback("getBrowserLangCallback",
getBrowserLangCallback);
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
@@ -50,28 +50,28 @@
}
function getBrowserInfo(returnObject) {
- browserInfoReturnObject = returnObject;
- ExternalInterface.call("getBrowserInfo");
- }
-
- function getBrowserInfoCallback(returnValue) {
- if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
- if (browserInfoReturnObject != null) {
- browserInfoReturnObject.callback(returnValue);
- }
- }
-
- function getBrowserLang(returnObject) {
- browserLangReturnObject = returnObject;
- ExternalInterface.call("getBrowserLang");
- }
-
- function getBrowserLangCallback(returnValue) {
- if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
- if (browserLangReturnObject != null) {
- browserLangReturnObject.callback(returnValue);
- }
- }
+ browserInfoReturnObject = returnObject;
+ ExternalInterface.call("getBrowserInfo");
+ }
+
+ function getBrowserInfoCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
+ if (browserInfoReturnObject != null) {
+ browserInfoReturnObject.callback(returnValue);
+ }
+ }
+
+ function getBrowserLang(returnObject) {
+ browserLangReturnObject = returnObject;
+ ExternalInterface.call("getBrowserLang");
+ }
+
+ function getBrowserLangCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
+ if (browserLangReturnObject != null) {
+ browserLangReturnObject.callback(returnValue);
+ }
+ }
]]>
</script>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
Thu Aug 18 03:15:17 2016
@@ -25,7 +25,6 @@
<include href="contentviews/" />
<!-- for main.lzx -->
- <include href="baseMethods.lzx" />
<include href="externalJavaScript.lzx" />
<include href="functions.lzx" />
<include href="mainAttributes.lzx" />
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
Thu Aug 18 03:15:17 2016
@@ -72,7 +72,7 @@
</dataset>
<!-- get values from public/config.xml -->
-<dataset type="http" name="mainTheme" request="false"
ondata="canvas.mybaseinit()" proxied="false">
+<dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()"
proxied="false">
<method name="loadTheme">
var d = new Date();
this.setAttribute("src", canvas.getServerBaseUrl() +
"theme.xml?random=" + d.getTime());
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Thu Aug 18 03:15:17 2016
@@ -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
@@ -33,20 +33,584 @@
</when>
</switch>
+ <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) {
+ errorLoader = new RestCall({
+ url: canvas.getUrl() + 'services/error/report/'
+ , method: URLRequestMethod.POST
+ });
+ }
+ var vars:URLVariables = new URLVariables();
+ vars.message = message;
+ errorLoader.load(vars);
+ </method>
+
+ <method name="getHttpHost">
+ <![CDATA[
+ if (canvas.httphostlocal != null && canvas.httphostlocal.length
> 0) {
+ return canvas.httphostlocal;
+ }
+ return canvas.rtmphostlocal;
+ ]]>
+ </method>
+
+ <method name="getUrl">
+ <![CDATA[
+ return canvas.protocol + '://' + getHttpHost() + ':' +
canvas.red5httpport + canvas.httpRootKey;
+ ]]>
+ </method>
+
+ <method name="getServicesUrl">
+ <![CDATA[
+ return getUrl() + 'services/';
+ ]]>
+ </method>
+
+ <method name="getTestingUrl">
+ <![CDATA[
+ return getUrl() + '?swf=networktesting' + ($debug ? 'debug' :
'') + '.swf10.swf';
+ ]]>
+ </method>
+
+ <method name="getAppBaseUrl">
+ <![CDATA[
+ return getUrl() + "swf";
+ ]]>
+ </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('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()'));
- hib.userScope = canvas.wicketroomid;
- 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();
+ //Audio-Video-Settings
+
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
+
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('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
+
this.setAttribute('echoPath',Number(canvas.myConfigSet.getPointer().xpathQuery('config/echoPath/text()')));
+
this.setAttribute('echoSuppression',canvas.myConfigSet.getPointer().xpathQuery('config/echoSuppression/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();
+
+ 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 ");
+
+ var language = lz.Browser.getInitArg('language');
+ if (language != undefined) {
+ canvas.language_id = Number(language);
+ }
+
+ var wicketroomid = lz.Browser.getInitArg('wicketroomid');
+ if (wicketroomid != undefined && !isNaN(wicketroomid)) {
+ canvas.setAttribute('wicketroomid',
Number(wicketroomid));
+ }
+ canvas.setAttribute('wicketsid', null);
+ var wicketsid = lz.Browser.getInitArg('wicketsid');
+ if (wicketsid != undefined) {
+ canvas.setAttribute('wicketsid', wicketsid);
+ canvas.setAttribute('sessionId', wicketsid);
+ }
+ var uid = lz.Browser.getInitArg('uid');
+ if (!!uid) {
+ canvas.setAttribute('publicSID', uid);
+ }
+ this.setColors();
+ if ($debug) Debug.info("###################### -3 ");
+ var swf = lz.Browser.getInitArg('swf');
+ if ($debug) Debug.info("swf ", swf);
+ if (swf == 'settings') {
+ canvas.currentClient = {canVideo: true};
+ canvas.currentRoomObj = {audioOnly: false};
+ canvas.showWindowEffect = 'n';
+ var lbls = ExternalInterface.call("getStringLabels");
+ if ($debug) Debug.info("###################### -3 ",
lbls);
+ if (lbls) {
+ setLabelObjectByHundred(0, lbls);
+ }
+ canvas.main_content.setAttribute('visible', true);
+ new lz.editRecordStreamSWF10(canvas.main_content,{
+ allowDragging: false,
+ dropShadow: false,
+ standalone: true,
+ name: "editRecordStream",
+ doDefaultAnimation: false,
+ isInterview: true,
+ interviewPodId:
this.parent.parent.interviewPodId,
+ isSyncUpdate: true,
+ x: 0, y: 0, initY: 0
+ });
+ } else {
+ hib.userScope = canvas.wicketroomid;
+ 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>
+
+ <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;
+ canvas.thishib.reconnectionAction = false;
+ canvas.thishib.counterror = 100;
+ canvas.thishib.disconnect();
+ if (canvas.thishib._nc) {
+ canvas.thishib._nc.close();
+ }
+ ExternalInterface.call("roomExit");
+ </method>
+
+ <method name="setRoomValues" args="roomObj">
+ <![CDATA[
+ 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;
+
+ 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>
+
+ <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);
+ ]]>
+ </method>
+
+ <!---
+ @doc The function does compare the new moderator list with the old and
prepares the list
+ the removeModeratorList is used in the performance optimized
user list of the restricted
+ room type to re-render the list items only if really something
has changed in any
+ of the user list items
+ -->
+ <method name="analyzeModerationList" args="newList">
+ <![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>
+
+ <!---
+ Updates the "ismoderator" flag
+ the setAttribute method will broadcast an event to all event
listeners that
+ did subscribe using the "onismoderator" handler with reference
to canvas !
+ -->
+ <method name="updateModerationFlag">
+ <![CDATA[
+ var isCurrentModerator = false;
+ if ($debug) Debug.write("updateModerationFlag",
canvas.removeModeratorList);
+ for (var i = 0; i < canvas.removeModeratorList.length; ++i) {
+ var item = canvas.removeModeratorList[i];
+ if (canvas.publicSID == item.publicSID) {
+ isCurrentModerator = false;
+ }
+ }
+ if ($debug) Debug.write("updateModerationFlag",
canvas.currentModeratorList);
+ 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
+ try {
+ canvas.setAttribute('ismoderator', isCurrentModerator);
+ } catch (e:Error) {
+ new lz.errorPopup(canvas, {error: "update moder "+e});
+ if ($debug) Debug.error("updateModerationFlag::error ",
e);
+ }
+ ]]>
+ </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;
+ ]]>
+ </method>
+
+ <!---
+ Sets the flag for the isAllowedToGiveExclusiveAudio status and
broadcasts it to the
+ 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);
+ }
]]>
</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);
+ ]]>
+ </method>
+
+ <method name="addFolderSequence" args="foldername">
+ <![CDATA[
+ this.uploadmoduleimgfolder = '/';
+ this.uploadmoduleimgfolder += foldername;
+
this.setAttribute('uploadmoduleimgfolder',this.uploadmoduleimgfolder);
+ ]]>
+ </method>
+
+
+ <handler name="onmousewheeldelta" reference="lz.Keys" args="d">
+ <![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;
+
+ ]]>
+ </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;
+
+ ]]>
+ </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;
+ ]]>
+ </method>
+
+ <method name="isLTR" args="c">
+ <![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>
+
+ <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;
+ }
+ </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;
+ </method>
+
+ <method name="setUserData" args="g">
+ 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();
+ </method>
+
+ <method name="getThemeImage" args="tName">
+ //if ($debug) Debug.write("load Image by Name: ",tName);
+ var tPath =
canvas.mainTheme.getPointer().xpathQuery("theme/resource[@name='"+tName+"']/@src");
+ //if ($debug) Debug.write("tPath "+tPath);
+ if (tPath == null) {
+ if ($debug) Debug.warn("getThemeImage - No Image found
for config: ",tName);
+ } else {
+ tPath = canvas.getUrl() + 'public/' + tPath;
+ }
+ return tPath;
+ </method>
+
+ <method name="getThemeColor" args="tColor">
+ //if ($debug) Debug.write("load Color by Name: ",tColor);
+ var tResColor =
canvas.mainTheme.getPointer().xpathQuery("theme/color[@name='"+tColor+"']/@value");
+ //if ($debug) Debug.write("tColor "+tColor);
+ if (tResColor == null) {
+ if ($debug) Debug.warn("getThemeColor - No Color found
for config: ",tColor);
+ }
+ return tResColor;
+ </method>
+
+ <method name="setColors">
+
defaultstyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
+
itemStyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
+
menuStyle.setAttribute("basecolor",canvas.getThemeColor('styleMenuBarBaseColor'));
+
main_content.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+ if (!!canvas.setBaseColors) {
+ canvas.setBaseColors();
+ }
+ </method>
- <method name="setBaseColors">
-
_conferencemenu.setAttribute("bgcolor",canvas.getThemeColor('baseMousecolorizer'));
+ <method name="getPictureUrl" args="pictureuri,extraParams">
+ <![CDATA[
+ var pUri = (pictureuri == null || pictureuri.length == 0) ?
"d.jpg" : pictureuri;
+ var downloadurl = pUri;
+ if (!pUri.startsWith("http://";) &&
!pUri.startsWith("https://";)) {
+ pUri = "_profile_" + pUri;
+
+ downloadurl = canvas.getUrl() +
'DownloadHandler?fileName=' + pUri
+ + '&parentPath=&room_id=&r=' + (new
Date()).getTime()
+ + extraParams + '&sid='+canvas.sessionId;
+ }
+ if($debug) Debug.write("getPictureUrl/downloadurl ",
downloadurl);
+ return downloadurl;
+ ]]>
+ </method>
+
+ <method name="getNotNullString" args="value">
+ return value == null ? '' : value;
+ </method>
+
+ <method name="isRemoteUser" args="">
+ return canvas.isinitRoomDirect || canvas.remoteUserLogin ||
canvas.directUserLogin || canvas.secureRemoteUserLogin;
+ </method>
+
+ <method name="loadImgBySrc" args="cmp, imgUrl, completeCallback">
+ cmp.sprite.resource = imgUrl;
+ if (!cmp.sprite.imgLoader) {
+ if (cmp.sprite.resourceContainer) {
+ // unload previous internal image-resource
+ cmp.sprite.unload();
+ }
+ cmp.sprite.imgLoader = new Loader();
+ cmp.sprite.imgLoader.mouseEnabled = false;// @devnote:
see LPP-7022
+ cmp.sprite.imgLoader.mouseChildren = false;
+ cmp.sprite.resourceContainer = cmp.sprite.imgLoader;
+ cmp.sprite.addChild(cmp.sprite.imgLoader);
+ }
+ var res:Loader = cmp.sprite.imgLoader;
+ if (res) {
+ res.scaleX = res.scaleY = 1.0;
+ }
+ if (completeCallback) {
+
cmp.sprite.imgLoader.contentLoaderInfo.addEventListener(Event.COMPLETE,
completeCallback);
+ }
+ cmp.sprite.imgLoader.load(new URLRequest(imgUrl),
LzSprite.loaderContext);
</method>
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Thu Aug 18 03:15:17 2016
@@ -227,7 +227,7 @@
<method name="storelocaldata">
<![CDATA[
- //Debug.write("sharedobject store ");
+ if ($debug) Debug.write("sharedobject store:: [width,
height] : [" + this.cam_default_width + ", " + this.cam_default_height + "]");
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
if (g==null) g = new Array();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Thu Aug 18 03:15:17 2016
@@ -65,7 +65,6 @@ public class SwfPanel extends BasePanel
public static final String PARAM_PUBLIC_SID = "publicSid";
public static final String PARAM_URL = "url";
public static final String SWF_TYPE_NETWORK = "network";
- public static final String SWF_TYPE_SETTINGS = "settings";
private Long roomId = null;
public SwfPanel(String id) {
@@ -132,24 +131,19 @@ public class SwfPanel extends BasePanel
public String getInitFunction(PageParameters pp) {
String initStr = null;
- String swf = getFlashFile(pp.get("swf"));
+ String swf = getFlashFile(pp);
if (!Strings.isEmpty(swf)) {
- initStr = String.format("initSwf(%s);", new JSONObject()
- .put("src", swf + new
PageParametersEncoder().encodePageParameters(pp))
- .put("labels", getStringLabels(448,
449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54,
761, 762, 144))
- .toString());
+ initStr = String.format("var labels = %s;
initSwf(%s);", getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429,
1430, 775, 452, 767, 764, 765, 918, 54, 761, 762, 144)
+ , new JSONObject().put("src", swf + new
PageParametersEncoder().encodePageParameters(pp)).toString());
}
return initStr;
}
- private String getFlashFile(StringValue type) {
- String fmt;
- if (SWF_TYPE_SETTINGS.equals(type.toString())) {
- fmt = "settings%s.swf11.swf";
- } else if (SWF_TYPE_NETWORK.equals(type.toString())) {
+ private String getFlashFile(PageParameters pp) {
+ StringValue type = pp.get("swf");
+ String fmt = "main%s.swf11.swf";
+ if (SWF_TYPE_NETWORK.equals(type.toString())) {
fmt = "networktesting%s.swf10.swf";
- } else {
- fmt = "main%s.swf11.swf";
}
return String.format(fmt, DEVELOPMENT ==
getApplication().getConfigurationType() ? "debug" : "");
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Thu Aug 18 03:15:17 2016
@@ -44,3 +44,7 @@ function initSwf(_options) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
+
+function getStringLabels() {
+ return labels;
+}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/openmeetings_functions.js?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
Thu Aug 18 03:15:17 2016
@@ -56,9 +56,9 @@ function getTimeZoneOffsetMinutes() {
break;
}
}
- return std_time_offset;
+ return std_time_offset;
}
function getTimeZoneOffset() {
-
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60);
+
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Thu Aug 18 03:15:17 2016
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.room;
-
import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import org.apache.openmeetings.web.app.Application;
@@ -52,20 +51,19 @@ public class SwfPanel extends BasePanel
public String getInitFunction(PageParameters pp) {
String initStr = null;
- String swf = getFlashFile(pp.get("swf"));
+ String swf = getFlashFile(pp);
if (!Strings.isEmpty(swf)) {
- initStr = String.format("initSwf(%s);", new JSONObject()
- .put("src", swf + new
PageParametersEncoder().encodePageParameters(pp))
- .put("labels", getStringLabels(448,
449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54,
761, 762, 144))
- .toString());
+ initStr = String.format("var labels = %s;
initSwf(%s);", getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429,
1430, 775, 452, 767, 764, 765, 918, 54, 761, 762, 144)
+ , new JSONObject().put("src", swf + new
PageParametersEncoder().encodePageParameters(pp)).toString());
}
return initStr;
}
- private String getFlashFile(StringValue type) {
+ private String getFlashFile(PageParameters pp) {
+ StringValue type = pp.get("swf");
String fmt;
if (SWF_TYPE_SETTINGS.equals(type.toString())) {
- fmt = "settings%s.swf11.swf";
+ fmt = "main%s.swf11.swf";
} else if (SWF_TYPE_NETWORK.equals(type.toString())) {
fmt = "networktesting%s.swf10.swf";
} else {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Thu Aug 18 03:15:17 2016
@@ -44,3 +44,7 @@ function initSwf(_options) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
+
+function getStringLabels() {
+ return labels;
+}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/openmeetings_functions.js?rev=1756702&r1=1756701&r2=1756702&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/openmeetings_functions.js
Thu Aug 18 03:15:17 2016
@@ -56,9 +56,9 @@ function getTimeZoneOffsetMinutes() {
break;
}
}
- return std_time_offset;
+ return std_time_offset;
}
function getTimeZoneOffset() {
-
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60);
+
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60);
}
