Ticket #491: 491.2.patch

tests/test_Util.html

@@ -177 +177 @@
-    }
-
-    function test_07_Util_getParameterString(t) {
-2
+4
-
-        var params = { foo: "bar",
-                       chicken: 1.5
@@ -185 +185 @@
-
-        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar&chicken=1.5", "getParameterString returns correctly");    
-        t.eq( OpenLayers.Util.getParameterString({'a:':'b='}), "a%3A=b%3D", "getParameterString returns correctly with non-ascii keys/values");    
+        
+
+        // Parameters which are a list should end up being a comma-seperated
+        // list of the URL encoded strings
+        var params = { foo: ["bar,baz"] };
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar%2Cbaz", "getParameterString encodes , correctly in arrays");    
+        
+        var params = { foo: ["bar","baz,"] };
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. ");    
-    }
-
-    function test_08_Util_createAlphaImageDiv(t) {

lib/OpenLayers/Util.js

@@ -377 +387 @@
-* @returns a concatenation of the properties of an object in 
-*    http parameter notation. 
-*    (ex. <i>"key1=value1&key2=value2&key3=value3"</i>)
+*    If a parameter is actually a list, that parameter will then
+*    be set to a comma-seperated list of values (foo,bar) instead
+*    of being URL escaped (foo%3Abar). 
-* @type String
-*/
-OpenLayers.Util.getParameterString = function(params) {
-    paramsArray = new Array();
-    
-    for (var key in params) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
+        else {
+          /* value is a string; simply encode */
+          encodedValue = encodeURIComponent(value);
+        }
+        paramsArray.push(encodeURIComponent(key) + "=" + encodedValue);
+      }
-    }
-    
-    return paramsArray.join("&");