[MMBASE SCM] r41626 - speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal

[michiel]

Author: michiel
Date: 2010-03-26 13:48:04 +0100 (Fri, 26 Mar 2010)
New Revision: 41626

Modified:
   speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.js.jsp
Log:
made xml a parameter

Modified: 
speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.js.jsp
===================================================================
--- speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.js.jsp   
2010-03-26 10:31:23 UTC (rev 41625)
+++ speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.js.jsp   
2010-03-26 12:48:04 UTC (rev 41626)
@@ -8,6 +8,8 @@
 
 $.ui.dialog.defaults.bgiframe = true;
 
+//<mm:import externid="xml">false</mm:import>
+
 function MMBasePortal(root) {
     this.editordir = $("head 
meta[name='org.mmbase.portal.editordir']").attr("content");
     if (root == null) root = document;
@@ -15,6 +17,7 @@
     var self = this;
     this.edits = 0;
     this.parameters = {};
+    this.xml = ${xml};
     this.options = {
         autoOpen: false,
         modal: true,
@@ -64,7 +67,11 @@
         if (args.length == 0) {
             args += "?";
         } else {
-            args += "&amp;";
+            if (self.xml) {
+                args += "&amp;";
+            } else {
+                args += "&";
+            }
         }
         args += p + "=" + params[p];
     }
@@ -105,7 +112,9 @@
 
 
 MMBasePortal.prototype.parseQueryString = function (location) {
-    if (location.indexOf("?") == 0) location = location.substring(1);
+    if (location.indexOf("?") == 0) {
+        location = location.substring(1);
+    }
     var result = {};
     var split = location.split("&");
     for (var i = 0; i < split.length; i++) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs