Merge remote-tracking branch 'trigger/AC-386' into ph-delivery

Author: xmav

lib/web/jquery/jquery.parsequery.js

@@ -6,13 +6,11 @@
  *
  * See the README for details.
  **/
-/*jshint jquery:true */
-/*global window:true */
 define([
     "jquery"
 ], function($){
+    $.parseQuery = function (options) {
 
-    $.parseQuery = function(options) {
         var config = {query: window.location.search || ""},
             params = {};
 
@@ -22,30 +20,27 @@ define([
         $.extend(config, $.parseQuery, options);
         config.query = config.query.replace(/^\?/, '');
 
-        $.each(config.query.split(config.separator), function(i, param) {
-            var pair = param.split('='),
-                key = config.decode(pair.shift(), null).toString(),
-                value = config.decode(pair.length ? pair.join('=') : null, key);
-
-            if (config.array_keys(key)) {
-                params[key] = params[key] || [];
-                params[key].push(value);
-            } else {
-                params[key] = value;
-            }
-        });
-
+        if (config.query.length > 0) {
+            $.each(config.query.split(config.separator), function (i, param) {
+                var pair = param.split('='),
+                    key = config.decode(pair.shift(), null).toString(),
+                    value = config.decode(pair.length ? pair.join('=') : null, key);
+
+                if (config.array_keys.test ? config.array_keys.test(key) : config.array_keys(key)) {
+                    params[key] = params[key] || [];
+                    params[key].push(value);
+                } else {
+                    params[key] = value;
+                }
+            });
+        }
         return params;
     };
-
-    $.parseQuery.decode = $.parseQuery.default_decode = function(string) {
-        return decodeURIComponent((string || "").replace('+', ' '));
+    $.parseQuery.decode = $.parseQuery.default_decode = function (string) {
+        return decodeURIComponent((string || "").replace(/\+/g, ' '));
     };
-
-    $.parseQuery.array_keys = function() {
+    $.parseQuery.array_keys = function () {
         return false;
     };
-
     $.parseQuery.separator = "&";
-
 });