Changeset 3920

Timestamp:

Oct 28, 2010, 11:22:46 AM (13 years ago)

Author:

Gregory Vincic

Message:

Making javascript context unaware. Context is now defined in ActionFactory? and propagated down to other factories. Which should allow us to have multiple proteios installations. Not tested though.

Location:

trunk/client/servlet

Files:

• src/org/proteios/gui/web/GUIConverter.java (modified) (2 diffs)
• src/org/proteios/gui/web/HtmlFactory.java (modified) (2 diffs)
• www/static/js/script.js (modified) (3 diffs)

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -295 +295 @@
         if (action != null)
         {
-            String jsMethod = "rightGo";
+            String jsMethod = "goToLocation";
             sb.append(jsMethod + "('");
+      sb.append(this.contextPath);
+      sb.append("?action=");
             sb.append(action.toString());
             sb.append("')");
@@ -1552 +1554 @@
             else
             {
-                href.setOnClick("rightGo('" + a.toString() + "')");
+                href.setOnClick("goToLocation('" + this.contextPath + "?action=" + a.toString() + "')");
             }
         }

trunk/client/servlet/src/org/proteios/gui/web/HtmlFactory.java

@@ -137 +137 @@
     cssPath = contextPath + "/static/css/";
     jsPath = contextPath + "/static/js/";
-    script = new Script();
 
     // Use
@@ -148 +147 @@
     head.add(createCSSLink(cssPath + "layout2.jsp"));
     head.add(createCSSLink(cssPath + "colors.css"));
-    script.newCData("var TOGGLE = 0;");
-    head.add(script);
     head.add(createScript(jsPath + "dom-drag.js"));
     head.add(createScript(jsPath + "script.js"));

trunk/client/servlet/www/static/js/script.js

@@ -1 @@
-//  Add var TOGGLE = 0; to a global script
-var CONTEXT = "/proteios/app?action=";
-
 function empty()
 {
@@ -7 +4 @@
 }
 
-function rightGo(action)
-{
-    if(parent.right)
-    {
-        parent.right.location = CONTEXT + action;
-    }
-    else
-    {
-        goToLocation(CONTEXT + action);
-    }
-}
-
-function popupGo(action)
-{
-    window.open(CONTEXT + action ,'popup','width=500,height=500');
-}
-
 function goToLocation(location)
 {
-    if(TOGGLE == 0)
-    {
-        window.location = location;
-    }
-    TOGGLE = 0;
+  window.location = location;
 }
 
@@ -105 +81 @@
 function submitFormAs(formId, action)
 {
-    if(TOGGLE == 0)
-    {
-        getElement(formId + "action").value = action;
-        getElement(formId).submit();
-    }
-    TOGGLE = 0;
+    getElement(formId + "action").value = action;
+    getElement(formId).submit();
 }