Author: solomax
Date: Wed Feb 20 06:27:29 2013
New Revision: 1448014
URL: http://svn.apache.org/r1448014
Log:
[OPENMEETINGS-431] ScreenSharing URL is built based on OM URL currently used by
the user
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1448014&r1=1448013&r2=1448014&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Feb
20 06:27:29 2013
@@ -115,19 +115,19 @@
</method>
<method name="getHttpHost">
- <![CDATA[
- if (canvas.httphostlocal != null && canvas.httphostlocal.length
> 0) {
- return canvas.httphostlocal;
- }
- return canvas.rtmphostlocal;
- ]]>
+ <![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;
- ]]>
+ <![CDATA[
+ return canvas.protocol + '://' + getHttpHost()
+ + ':' + canvas.red5httpport + canvas.httpRootKey;
+ ]]>
</method>
<method name="getServicesUrl">
@@ -136,11 +136,11 @@
]]>
</method>
- <method name="getTestingUrl">
- <![CDATA[
- return getUrl() + '?swf=networktesting' + ($debug ? 'debug' : '') +
'.swf10.swf';
- ]]>
- </method>
+ <method name="getTestingUrl">
+ <![CDATA[
+ return getUrl() + '?swf=networktesting' + ($debug ? 'debug' :
'') + '.swf10.swf';
+ ]]>
+ </method>
<method name="getAppBaseUrl">
<![CDATA[
@@ -151,6 +151,28 @@
return urlObject.protocol + "://" + urlObject.host + (port !=
80 ? ":" + port : "") + urlObject.path;;
]]>
</method>
+
+ <method name="getScreenSharingUrl">
+ <![CDATA[
+ var organisation_id = (hib.currentdomainObj != null &&
hib.currentdomainObj.organisation_id != null)
+ ? hib.currentdomainObj.organisation_id : 1;
+ if ($debug) Debug.write("mainMethods::getScreenSharingUrl ",
hib.userobject, hib.currentdomainObj);
+
+ var downloadurl = canvas.getAppBaseUrl() + 'screen.upload?'
+ +'rtmphostlocal=' + canvas.getHttpHost()
+ +'&domain=' + hib.conferencedomain
+ +'&organization_id=' + organisation_id
+ +'&sid=' + canvas.sessionId
+ +'&red5httpport=' + canvas.red5httpport
+ +'&connectionType=' + canvas.thishib.getProtocol()
+ +'&port=' + canvas.thishib.getPort()
+ +'&publicSID=' + canvas.publicSID
+ +'&httpRootKey=' + canvas.httpRootKey
+ +'&languageAsString=' + hib.userlang;
+ if ($debug) Debug.write("mainMethods::getScreenSharingUrl ",
downloadurl);
+ return downloadurl;
+ ]]>
+ </method>
<dataset type="http" name="languageData" request="false"
src="${ canvas.currentlanguage+'.xml' }" proxied="false">
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx?rev=1448014&r1=1448013&r2=1448014&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
Wed Feb 20 06:27:29 2013
@@ -88,35 +88,9 @@
]]>
</method>
- <method name="checkForApplyScreen" args="record">
- <![CDATA[
-
- var organisation_id = 1;
-
- if ($debug) Debug.write(hib.userobject);
- if ($debug) Debug.write(hib.currentdomainObj);
-
- if (hib.currentdomainObj != null) {
- organisation_id = hib.currentdomainObj.organisation_id
- }
-
- var downloadurl = canvas.getUrl() + 'screen.upload?'
- +'rtmphostlocal='+canvas.getHttpHost()
- +'&domain='+hib.conferencedomain
- +'&organization_id='+organisation_id
- +'&sid='+canvas.sessionId
- +'&red5httpport='+canvas.red5httpport
- +'&connectionType='+canvas.thishib.getProtocol()
- +'&port='+canvas.thishib.getPort()
- +'&publicSID='+canvas.publicSID
- +'&httpRootKey='+canvas.httpRootKey
- +'&languageAsString='+hib.userlang;
-
- if ($debug) Debug.write(downloadurl);
- lz.Browser.loadURL(downloadurl,'_blank');
-
- ]]>
- </method>
+ <method name="checkForApplyScreen" args="record">
+ lz.Browser.loadURL(canvas.getScreenSharingUrl(), '_blank');
+ </method>
<labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold"
fontsize="12" />
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1448014&r1=1448013&r2=1448014&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Wed Feb 20 06:27:29 2013
@@ -136,47 +136,9 @@
name="_sharingClientName" fontstyle="bold" />
- <method name="checkForApplyScreen">
- <![CDATA[
- var organisation_id = 1;
-
- if ($debug) Debug.write(hib.userobject);
- if ($debug) Debug.write(hib.currentdomainObj);
-
- if (hib.currentdomainObj != null) {
- organisation_id = hib.currentdomainObj.organisation_id
- }
-
- var downloadurl = canvas.getUrl() + 'screen.upload?'
- +'rtmphostlocal='+canvas.getHttpHost()
- +'&domain='+hib.conferencedomain
- +'&organization_id='+organisation_id
- +'&sid='+canvas.sessionId
- +'&red5httpport='+canvas.red5httpport
- +'&connectionType='+canvas.thishib.getProtocol()
- +'&port='+canvas.thishib.getPort()
- +'&publicSID='+canvas.publicSID
- +'&httpRootKey='+canvas.httpRootKey
- +'&languageAsString='+hib.userlang;
-
- if ($debug) Debug.write(downloadurl);
- lz.Browser.loadURL(downloadurl,'_blank');
-
- ]]>
- </method>
-
- <!--
- <handler name="onmousedown" >
- if ($debug) Debug.write("onmousedown multiWhiteboardPanel");
- this._drawareaMask._drawarea.onmousedownMethod();
- </handler>
-
- <handler name="onmouseup" >
- if ($debug) Debug.write("onmouseup multiWhiteboardPanel");
- this._drawareaMask._drawarea.onmouseupMethod();
- </handler>
- -->
-
+ <method name="checkForApplyScreen">
+ lz.Browser.loadURL(canvas.getScreenSharingUrl(), '_blank');
+ </method>
<!--
The Content Area
