svn commit: r1486303 - /openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx

[a_horuzhenko]

Author: a_horuzhenko
Date: Sat May 25 08:59:06 2013
New Revision: 1486303

URL: http://svn.apache.org/r1486303
Log:
Screensharing URL has been fixed.

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.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=1486303&r1=1486302&r2=1486303&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sat May 
25 08:59:06 2013
@@ -151,27 +151,34 @@
        ]]>
        </method>
 
-       <method name="getAppBaseUrl">
-       <![CDATA[
+       <method name="getAppBaseUrlWithoutSwfSuffix">
+               <![CDATA[
                var urlObject = lz.Browser.getBaseURL();
                //If Port is Null or undefinied use port 80
                var port = (urlObject.port != null && urlObject.port != 
undefined) ? urlObject.port : 80;
                //if($debug) Debug.write("getBaseUrl:: [urlObject, port]", 
urlObject, port);
                var url = "" + urlObject.protocol + "://" + urlObject.host + 
(port != 80 ? ":" + port : "") + urlObject.path;
                //if($debug) Debug.write("!!!!!!! getBaseUrl:: [urlObject, 
port, url]", urlObject, port, url);
-               url = url + (url.slice(-1) == '/' ? '' : '/') + "swf";
+               url = url + (url.slice(-1) == '/' ? '' : '/');
                //if($debug) Debug.write("!!!!!!! getBaseUrl:: [last, url]", 
url.slice(-1), url);
                return url;
        ]]>
        </method>
 
+       <method name="getAppBaseUrl">
+       <![CDATA[
+               return getAppBaseUrlWithoutSwfSuffix() + "swf"
+       ]]>
+       </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 appBase = canvas.getAppBaseUrl();
+               var appBase = canvas.getAppBaseUrlWithoutSwfSuffix();
+               Debug.write("appBase=" + appBase);
                var downloadurl = appBase + 'screen.upload?'
                        +'rtmphostlocal=' + canvas.getHttpHost()
                        +'&baseurl=' + escape(appBase)