Merge pull request #85 from GSA/bugfix/catalog-query-parse

paster front-end-build

Author: jbrown-xentity

ckan/public/base/javascript/view-filters.min.js

@@ -1,15 +1,18 @@
 String.prototype.queryStringToJSON=String.prototype.queryStringToJSON||function()
-{var params=String(this);params=params.substring(params.indexOf('?')+1);params=params.replace(/\+/g,'%20');if(params.substring(0,1)==='{'&&params.substring(params.length-1)==='}')
-{return eval(decodeURIComponent(params));}
-params=params.split(/\&(amp\;)?/);var json={};for(var i=0,n=params.length;i<n;++i)
+{var params=String(this);params=params.substring(params.indexOf('?')+1);params=params.replace(/\+/g,'%20');try{return JSON.parse(decodeURIComponent(params));}catch{params=params.split(/\&(amp\;)?/);}
+var json={};for(var i=0,n=params.length;i<n;++i)
 {var param=params[i]||null;if(param===null){continue;}
 param=param.split('=');if(param===null){continue;}
 var key=param[0]||null;if(key===null){continue;}
 if(typeof param[1]==='undefined'){continue;}
 var value=param[1];key=decodeURIComponent(key);value=decodeURIComponent(value);var keys=key.split('.');if(keys.length===1)
 {json[key]=value;}
 else
-{var path='',cmd='';$.each(keys,function(ii,key){path+='["'+key.replace(/"/g,'\\"')+'"]';jsonCLOSUREGLOBAL=json;cmd='if ( typeof jsonCLOSUREGLOBAL'+path+' === "undefined" ) jsonCLOSUREGLOBAL'+path+' = {}';eval(cmd);json=jsonCLOSUREGLOBAL;delete jsonCLOSUREGLOBAL;});jsonCLOSUREGLOBAL=json;valueCLOSUREGLOBAL=value;cmd='jsonCLOSUREGLOBAL'+path+' = valueCLOSUREGLOBAL';eval(cmd);json=jsonCLOSUREGLOBAL;delete jsonCLOSUREGLOBAL;delete valueCLOSUREGLOBAL;}}
+{var setNestedKey=function(obj,path,value){if(path.length===1){obj[path]=value
+return}
+if(typeof obj[path[0]]==='undefined'){obj[path[0]]={}}
+return setNestedKey(obj[path[0]],path.slice(1),value)}
+setNestedKey(json,keys,value);}}
 return json;};this.ckan=this.ckan||{};this.ckan.views=this.ckan.views||{};this.ckan.views.filters=(function(queryString){'use strict';var api={get:get,set:set,setAndRedirectTo:setAndRedirectTo,unset:unset,_searchParams:{},_initialize:_initialize,_setLocationHref:_setLocationHref,};function get(filterName){var filters=api._searchParams.filters||{};if(filterName){return filters[filterName];}else{return filters;}}
 function set(name,value){var url=window.location.href;setAndRedirectTo(name,value,url);}
 function setAndRedirectTo(name,value,url){api._searchParams.filters=api._searchParams.filters||{};api._searchParams.filters[name]=value;_redirectTo(url);return api;}