svn commit: r1485941 - in /openmeetings/trunk/singlewebapp: WebContent/src/base/mainMethods.lzx src/org/apache/openmeetings/web/user/rooms/RoomPanel.java

[solomax]

Author: solomax
Date: Fri May 24 06:11:51 2013
New Revision: 1485941

URL: http://svn.apache.org/r1485941
Log:
App base URL is modified to have "swf" suffix;
Debug version of the client is used in case Wicket was started in DEVELOPMENT 
mode;

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1485941&r1=1485940&r2=1485941&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Fri May 
24 06:11:51 2013
@@ -157,7 +157,7 @@
                //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);
-               return urlObject.protocol + "://" + urlObject.host + (port != 
80 ? ":" + port : "") + urlObject.path;;
+               return urlObject.protocol + "://" + urlObject.host + (port != 
80 ? ":" + port : "") + urlObject.path + "swf";
        ]]>
        </method>
 

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java?rev=1485941&r1=1485940&r2=1485941&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
 Fri May 24 06:11:51 2013
@@ -18,7 +18,9 @@
  */
 package org.apache.openmeetings.web.user.rooms;
 
+
 import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.wicket.RuntimeConfigurationType;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.PriorityHeaderItem;
@@ -36,11 +38,16 @@ public class RoomPanel extends BasePanel
                this(id, new PageParameters());
        }
        
+       private String getFlashFile() {
+               return RuntimeConfigurationType.DEVELOPMENT == 
getApplication().getConfigurationType()
+                               ? "maindebug.as3.swf11.swf" : 
"main.as3.swf11.swf";
+       }
+       
        public RoomPanel(String id, PageParameters pp) {
                super(id);
 
                StringValue swfVal = pp.get("swf");
-               String swf = (swfVal.isEmpty() ? "main.as3.swf11.swf" : 
swfVal.toString())
+               String swf = (swfVal.isEmpty() ? getFlashFile() : 
swfVal.toString())
                                + new 
PageParametersEncoder().encodePageParameters(pp);
                add(new Label("init", String.format("initSwf('%s');", 
swf)).setEscapeModelStrings(false));
        }