Manual URL Cleanup
This commit is contained in:
@@ -881,7 +881,7 @@ jQuery.ready.promise = function( obj ) {
|
||||
|
||||
try {
|
||||
// Use the trick by Diego Perini
|
||||
// http://javascript.nwbox.com/IEContentLoaded/
|
||||
// https://javascript.nwbox.com/IEContentLoaded/
|
||||
top.doScroll("left");
|
||||
} catch(e) {
|
||||
return setTimeout( doScrollCheck, 50 );
|
||||
@@ -1390,7 +1390,7 @@ jQuery.support = (function() {
|
||||
fragment.appendChild( div );
|
||||
|
||||
// Technique from Juriy Zaytsev
|
||||
// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
|
||||
// https://perfectionkills.com/detecting-event-support-without-browser-sniffing/
|
||||
// We only care about the case where non-standard event systems
|
||||
// are used, namely in IE. Short-circuiting here helps us to
|
||||
// avoid an eval call (in setAttribute) which can cause CSP
|
||||
@@ -1945,7 +1945,7 @@ jQuery.fn.extend({
|
||||
});
|
||||
},
|
||||
// Based off of the plugin by Clint Helfers, with permission.
|
||||
// http://blindsignals.com
|
||||
// https://blindsignals.com
|
||||
delay: function( time, type ) {
|
||||
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
|
||||
type = type || "fx";
|
||||
@@ -6867,7 +6867,7 @@ if ( window.getComputedStyle ) {
|
||||
}
|
||||
|
||||
// From the awesome hack by Dean Edwards
|
||||
// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
|
||||
// https://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
|
||||
|
||||
// If we're not dealing with a regular pixel number
|
||||
// but a number that has a weird ending, we need to convert it to pixels
|
||||
@@ -9469,4 +9469,4 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
|
||||
define( "jquery", [], function () { return jQuery; } );
|
||||
}
|
||||
|
||||
})( window );
|
||||
})( window );
|
||||
|
||||
+220
-220
@@ -1,220 +1,220 @@
|
||||
/**
|
||||
* jQuery.query - Query String Modification and Creation for jQuery
|
||||
* Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
|
||||
* Licensed under the WTFPL (http://www.wtfpl.net/).
|
||||
* Date: 2009/02/08
|
||||
*
|
||||
* @author Blair Mitchelmore
|
||||
* @version 2.1.3
|
||||
*
|
||||
**/
|
||||
new function(settings) {
|
||||
// Various Settings
|
||||
var $separator = settings.separator || '&';
|
||||
var $spaces = settings.spaces === false ? false : true;
|
||||
var $suffix = settings.suffix === false ? '' : '[]';
|
||||
var $prefix = settings.prefix === false ? false : true;
|
||||
var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
|
||||
var $numbers = settings.numbers === false ? false : true;
|
||||
|
||||
jQuery.query = new function() {
|
||||
var is = function(o, t) {
|
||||
return o != undefined && o !== null && (!!t ? o.constructor == t : true);
|
||||
};
|
||||
var parse = function(path) {
|
||||
var m, rx = /\[([^[]*)\]/g, match = /^(\S+?)(\[\S*\])?$/.exec(path), base = match[1], tokens = [];
|
||||
while (m = rx.exec(match[2])) tokens.push(m[1]);
|
||||
return [base, tokens];
|
||||
};
|
||||
var set = function(target, tokens, value) {
|
||||
var o, token = tokens.shift();
|
||||
if (typeof target != 'object') target = null;
|
||||
if (token === "") {
|
||||
if (!target) target = [];
|
||||
if (is(target, Array)) {
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
} else if (is(target, Object)) {
|
||||
var i = 0;
|
||||
while (target[i++] != null);
|
||||
target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
|
||||
} else {
|
||||
target = [];
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
}
|
||||
} else if (token && token.match(/^\s*[0-9]+\s*$/)) {
|
||||
var index = parseInt(token, 10);
|
||||
if (!target) target = [];
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else if (token) {
|
||||
var index = token.replace(/^\s*|\s*$/g, "");
|
||||
if (!target) target = {};
|
||||
if (is(target, Array)) {
|
||||
var temp = {};
|
||||
for (var i = 0; i < target.length; ++i) {
|
||||
temp[i] = target[i];
|
||||
}
|
||||
target = temp;
|
||||
}
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
return target;
|
||||
};
|
||||
|
||||
var queryObject = function(a) {
|
||||
var self = this;
|
||||
self.keys = {};
|
||||
|
||||
if (a.queryObject) {
|
||||
jQuery.each(a.get(), function(key, val) {
|
||||
self.SET(key, val);
|
||||
});
|
||||
} else {
|
||||
jQuery.each(arguments, function() {
|
||||
var q = "" + this;
|
||||
q = decodeURIComponent(q);
|
||||
q = q.replace(/^[?#]/,''); // remove any leading ? || #
|
||||
q = q.replace(/[;&]$/,''); // remove any trailing & || ;
|
||||
if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces
|
||||
|
||||
jQuery.each(q.split(/[&;]/), function(){
|
||||
var key = this.split('=')[0];
|
||||
var val = this.split('=')[1];
|
||||
|
||||
if (!key) return;
|
||||
|
||||
if ($numbers) {
|
||||
if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
|
||||
val = parseFloat(val);
|
||||
else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
|
||||
val = parseInt(val, 10);
|
||||
}
|
||||
|
||||
val = (!val && val !== 0) ? true : val;
|
||||
|
||||
if (val !== false && val !== true && typeof val != 'number')
|
||||
val = val;
|
||||
|
||||
self.SET(key, val);
|
||||
});
|
||||
});
|
||||
}
|
||||
return self;
|
||||
};
|
||||
|
||||
queryObject.prototype = {
|
||||
queryObject: true,
|
||||
has: function(key, type) {
|
||||
var value = this.get(key);
|
||||
return is(value, type);
|
||||
},
|
||||
GET: function(key) {
|
||||
if (!is(key)) return this.keys;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
while (target != null && tokens.length != 0) {
|
||||
target = target[tokens.shift()];
|
||||
}
|
||||
return typeof target == 'number' ? target : target || "";
|
||||
},
|
||||
get: function(key) {
|
||||
var target = this.GET(key);
|
||||
if (is(target, Object))
|
||||
return jQuery.extend(true, {}, target);
|
||||
else if (is(target, Array))
|
||||
return target.slice(0);
|
||||
return target;
|
||||
},
|
||||
SET: function(key, val) {
|
||||
var value = !is(val) ? null : val;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
this.keys[base] = set(target, tokens.slice(0), value);
|
||||
return this;
|
||||
},
|
||||
set: function(key, val) {
|
||||
return this.copy().SET(key, val);
|
||||
},
|
||||
REMOVE: function(key) {
|
||||
return this.SET(key, null).COMPACT();
|
||||
},
|
||||
remove: function(key) {
|
||||
return this.copy().REMOVE(key);
|
||||
},
|
||||
EMPTY: function() {
|
||||
var self = this;
|
||||
jQuery.each(self.keys, function(key, value) {
|
||||
delete self.keys[key];
|
||||
});
|
||||
return self;
|
||||
},
|
||||
load: function(url) {
|
||||
var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
|
||||
var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
|
||||
return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
|
||||
},
|
||||
empty: function() {
|
||||
return this.copy().EMPTY();
|
||||
},
|
||||
copy: function() {
|
||||
return new queryObject(this);
|
||||
},
|
||||
COMPACT: function() {
|
||||
function build(orig) {
|
||||
var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
|
||||
if (typeof orig == 'object') {
|
||||
function add(o, key, value) {
|
||||
if (is(o, Array))
|
||||
o.push(value);
|
||||
else
|
||||
o[key] = value;
|
||||
}
|
||||
jQuery.each(orig, function(key, value) {
|
||||
if (!is(value)) return true;
|
||||
add(obj, key, build(value));
|
||||
});
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
this.keys = build(this.keys);
|
||||
return this;
|
||||
},
|
||||
compact: function() {
|
||||
return this.copy().COMPACT();
|
||||
},
|
||||
toString: function() {
|
||||
var i = 0, queryString = [], chunks = [], self = this;
|
||||
var addFields = function(arr, key, value) {
|
||||
if (!is(value) || value === false) return;
|
||||
var o = [encodeURIComponent(key)];
|
||||
if (value !== true) {
|
||||
o.push("=");
|
||||
o.push(encodeURIComponent(value));
|
||||
}
|
||||
arr.push(o.join(""));
|
||||
};
|
||||
var build = function(obj, base) {
|
||||
var newKey = function(key) {
|
||||
return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
|
||||
};
|
||||
jQuery.each(obj, function(key, value) {
|
||||
if (typeof value == 'object')
|
||||
build(value, newKey(key));
|
||||
else
|
||||
addFields(chunks, newKey(key), value);
|
||||
});
|
||||
};
|
||||
|
||||
build(this.keys);
|
||||
|
||||
if (chunks.length > 0) queryString.push($hash);
|
||||
queryString.push(chunks.join($separator));
|
||||
|
||||
return queryString.join("");
|
||||
}
|
||||
};
|
||||
|
||||
return new queryObject(location.search, location.hash);
|
||||
};
|
||||
}(jQuery.query || {}); // Pass in jQuery.query as settings object
|
||||
/**
|
||||
* jQuery.query - Query String Modification and Creation for jQuery
|
||||
* Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
|
||||
* Licensed under the WTFPL (https://www.wtfpl.net/).
|
||||
* Date: 2009/02/08
|
||||
*
|
||||
* @author Blair Mitchelmore
|
||||
* @version 2.1.3
|
||||
*
|
||||
**/
|
||||
new function(settings) {
|
||||
// Various Settings
|
||||
var $separator = settings.separator || '&';
|
||||
var $spaces = settings.spaces === false ? false : true;
|
||||
var $suffix = settings.suffix === false ? '' : '[]';
|
||||
var $prefix = settings.prefix === false ? false : true;
|
||||
var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
|
||||
var $numbers = settings.numbers === false ? false : true;
|
||||
|
||||
jQuery.query = new function() {
|
||||
var is = function(o, t) {
|
||||
return o != undefined && o !== null && (!!t ? o.constructor == t : true);
|
||||
};
|
||||
var parse = function(path) {
|
||||
var m, rx = /\[([^[]*)\]/g, match = /^(\S+?)(\[\S*\])?$/.exec(path), base = match[1], tokens = [];
|
||||
while (m = rx.exec(match[2])) tokens.push(m[1]);
|
||||
return [base, tokens];
|
||||
};
|
||||
var set = function(target, tokens, value) {
|
||||
var o, token = tokens.shift();
|
||||
if (typeof target != 'object') target = null;
|
||||
if (token === "") {
|
||||
if (!target) target = [];
|
||||
if (is(target, Array)) {
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
} else if (is(target, Object)) {
|
||||
var i = 0;
|
||||
while (target[i++] != null);
|
||||
target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
|
||||
} else {
|
||||
target = [];
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
}
|
||||
} else if (token && token.match(/^\s*[0-9]+\s*$/)) {
|
||||
var index = parseInt(token, 10);
|
||||
if (!target) target = [];
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else if (token) {
|
||||
var index = token.replace(/^\s*|\s*$/g, "");
|
||||
if (!target) target = {};
|
||||
if (is(target, Array)) {
|
||||
var temp = {};
|
||||
for (var i = 0; i < target.length; ++i) {
|
||||
temp[i] = target[i];
|
||||
}
|
||||
target = temp;
|
||||
}
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
return target;
|
||||
};
|
||||
|
||||
var queryObject = function(a) {
|
||||
var self = this;
|
||||
self.keys = {};
|
||||
|
||||
if (a.queryObject) {
|
||||
jQuery.each(a.get(), function(key, val) {
|
||||
self.SET(key, val);
|
||||
});
|
||||
} else {
|
||||
jQuery.each(arguments, function() {
|
||||
var q = "" + this;
|
||||
q = decodeURIComponent(q);
|
||||
q = q.replace(/^[?#]/,''); // remove any leading ? || #
|
||||
q = q.replace(/[;&]$/,''); // remove any trailing & || ;
|
||||
if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces
|
||||
|
||||
jQuery.each(q.split(/[&;]/), function(){
|
||||
var key = this.split('=')[0];
|
||||
var val = this.split('=')[1];
|
||||
|
||||
if (!key) return;
|
||||
|
||||
if ($numbers) {
|
||||
if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
|
||||
val = parseFloat(val);
|
||||
else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
|
||||
val = parseInt(val, 10);
|
||||
}
|
||||
|
||||
val = (!val && val !== 0) ? true : val;
|
||||
|
||||
if (val !== false && val !== true && typeof val != 'number')
|
||||
val = val;
|
||||
|
||||
self.SET(key, val);
|
||||
});
|
||||
});
|
||||
}
|
||||
return self;
|
||||
};
|
||||
|
||||
queryObject.prototype = {
|
||||
queryObject: true,
|
||||
has: function(key, type) {
|
||||
var value = this.get(key);
|
||||
return is(value, type);
|
||||
},
|
||||
GET: function(key) {
|
||||
if (!is(key)) return this.keys;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
while (target != null && tokens.length != 0) {
|
||||
target = target[tokens.shift()];
|
||||
}
|
||||
return typeof target == 'number' ? target : target || "";
|
||||
},
|
||||
get: function(key) {
|
||||
var target = this.GET(key);
|
||||
if (is(target, Object))
|
||||
return jQuery.extend(true, {}, target);
|
||||
else if (is(target, Array))
|
||||
return target.slice(0);
|
||||
return target;
|
||||
},
|
||||
SET: function(key, val) {
|
||||
var value = !is(val) ? null : val;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
this.keys[base] = set(target, tokens.slice(0), value);
|
||||
return this;
|
||||
},
|
||||
set: function(key, val) {
|
||||
return this.copy().SET(key, val);
|
||||
},
|
||||
REMOVE: function(key) {
|
||||
return this.SET(key, null).COMPACT();
|
||||
},
|
||||
remove: function(key) {
|
||||
return this.copy().REMOVE(key);
|
||||
},
|
||||
EMPTY: function() {
|
||||
var self = this;
|
||||
jQuery.each(self.keys, function(key, value) {
|
||||
delete self.keys[key];
|
||||
});
|
||||
return self;
|
||||
},
|
||||
load: function(url) {
|
||||
var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
|
||||
var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
|
||||
return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
|
||||
},
|
||||
empty: function() {
|
||||
return this.copy().EMPTY();
|
||||
},
|
||||
copy: function() {
|
||||
return new queryObject(this);
|
||||
},
|
||||
COMPACT: function() {
|
||||
function build(orig) {
|
||||
var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
|
||||
if (typeof orig == 'object') {
|
||||
function add(o, key, value) {
|
||||
if (is(o, Array))
|
||||
o.push(value);
|
||||
else
|
||||
o[key] = value;
|
||||
}
|
||||
jQuery.each(orig, function(key, value) {
|
||||
if (!is(value)) return true;
|
||||
add(obj, key, build(value));
|
||||
});
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
this.keys = build(this.keys);
|
||||
return this;
|
||||
},
|
||||
compact: function() {
|
||||
return this.copy().COMPACT();
|
||||
},
|
||||
toString: function() {
|
||||
var i = 0, queryString = [], chunks = [], self = this;
|
||||
var addFields = function(arr, key, value) {
|
||||
if (!is(value) || value === false) return;
|
||||
var o = [encodeURIComponent(key)];
|
||||
if (value !== true) {
|
||||
o.push("=");
|
||||
o.push(encodeURIComponent(value));
|
||||
}
|
||||
arr.push(o.join(""));
|
||||
};
|
||||
var build = function(obj, base) {
|
||||
var newKey = function(key) {
|
||||
return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
|
||||
};
|
||||
jQuery.each(obj, function(key, value) {
|
||||
if (typeof value == 'object')
|
||||
build(value, newKey(key));
|
||||
else
|
||||
addFields(chunks, newKey(key), value);
|
||||
});
|
||||
};
|
||||
|
||||
build(this.keys);
|
||||
|
||||
if (chunks.length > 0) queryString.push($hash);
|
||||
queryString.push(chunks.join($separator));
|
||||
|
||||
return queryString.join("");
|
||||
}
|
||||
};
|
||||
|
||||
return new queryObject(location.search, location.hash);
|
||||
};
|
||||
}(jQuery.query || {}); // Pass in jQuery.query as settings object
|
||||
|
||||
@@ -1,220 +1,220 @@
|
||||
/**
|
||||
* jQuery.query - Query String Modification and Creation for jQuery
|
||||
* Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
|
||||
* Licensed under the WTFPL (http://www.wtfpl.net/).
|
||||
* Date: 2009/02/08
|
||||
*
|
||||
* @author Blair Mitchelmore
|
||||
* @version 2.1.3
|
||||
*
|
||||
**/
|
||||
new function(settings) {
|
||||
// Various Settings
|
||||
var $separator = settings.separator || '&';
|
||||
var $spaces = settings.spaces === false ? false : true;
|
||||
var $suffix = settings.suffix === false ? '' : '[]';
|
||||
var $prefix = settings.prefix === false ? false : true;
|
||||
var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
|
||||
var $numbers = settings.numbers === false ? false : true;
|
||||
|
||||
jQuery.query = new function() {
|
||||
var is = function(o, t) {
|
||||
return o != undefined && o !== null && (!!t ? o.constructor == t : true);
|
||||
};
|
||||
var parse = function(path) {
|
||||
var m, rx = /\[([^[]*)\]/g, match = /^(\S+?)(\[\S*\])?$/.exec(path), base = match[1], tokens = [];
|
||||
while (m = rx.exec(match[2])) tokens.push(m[1]);
|
||||
return [base, tokens];
|
||||
};
|
||||
var set = function(target, tokens, value) {
|
||||
var o, token = tokens.shift();
|
||||
if (typeof target != 'object') target = null;
|
||||
if (token === "") {
|
||||
if (!target) target = [];
|
||||
if (is(target, Array)) {
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
} else if (is(target, Object)) {
|
||||
var i = 0;
|
||||
while (target[i++] != null);
|
||||
target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
|
||||
} else {
|
||||
target = [];
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
}
|
||||
} else if (token && token.match(/^\s*[0-9]+\s*$/)) {
|
||||
var index = parseInt(token, 10);
|
||||
if (!target) target = [];
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else if (token) {
|
||||
var index = token.replace(/^\s*|\s*$/g, "");
|
||||
if (!target) target = {};
|
||||
if (is(target, Array)) {
|
||||
var temp = {};
|
||||
for (var i = 0; i < target.length; ++i) {
|
||||
temp[i] = target[i];
|
||||
}
|
||||
target = temp;
|
||||
}
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
return target;
|
||||
};
|
||||
|
||||
var queryObject = function(a) {
|
||||
var self = this;
|
||||
self.keys = {};
|
||||
|
||||
if (a.queryObject) {
|
||||
jQuery.each(a.get(), function(key, val) {
|
||||
self.SET(key, val);
|
||||
});
|
||||
} else {
|
||||
jQuery.each(arguments, function() {
|
||||
var q = "" + this;
|
||||
q = decodeURIComponent(q);
|
||||
q = q.replace(/^[?#]/,''); // remove any leading ? || #
|
||||
q = q.replace(/[;&]$/,''); // remove any trailing & || ;
|
||||
if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces
|
||||
|
||||
jQuery.each(q.split(/[&;]/), function(){
|
||||
var key = this.split('=')[0];
|
||||
var val = this.split('=')[1];
|
||||
|
||||
if (!key) return;
|
||||
|
||||
if ($numbers) {
|
||||
if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
|
||||
val = parseFloat(val);
|
||||
else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
|
||||
val = parseInt(val, 10);
|
||||
}
|
||||
|
||||
val = (!val && val !== 0) ? true : val;
|
||||
|
||||
if (val !== false && val !== true && typeof val != 'number')
|
||||
val = val;
|
||||
|
||||
self.SET(key, val);
|
||||
});
|
||||
});
|
||||
}
|
||||
return self;
|
||||
};
|
||||
|
||||
queryObject.prototype = {
|
||||
queryObject: true,
|
||||
has: function(key, type) {
|
||||
var value = this.get(key);
|
||||
return is(value, type);
|
||||
},
|
||||
GET: function(key) {
|
||||
if (!is(key)) return this.keys;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
while (target != null && tokens.length != 0) {
|
||||
target = target[tokens.shift()];
|
||||
}
|
||||
return typeof target == 'number' ? target : target || "";
|
||||
},
|
||||
get: function(key) {
|
||||
var target = this.GET(key);
|
||||
if (is(target, Object))
|
||||
return jQuery.extend(true, {}, target);
|
||||
else if (is(target, Array))
|
||||
return target.slice(0);
|
||||
return target;
|
||||
},
|
||||
SET: function(key, val) {
|
||||
var value = !is(val) ? null : val;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
this.keys[base] = set(target, tokens.slice(0), value);
|
||||
return this;
|
||||
},
|
||||
set: function(key, val) {
|
||||
return this.copy().SET(key, val);
|
||||
},
|
||||
REMOVE: function(key) {
|
||||
return this.SET(key, null).COMPACT();
|
||||
},
|
||||
remove: function(key) {
|
||||
return this.copy().REMOVE(key);
|
||||
},
|
||||
EMPTY: function() {
|
||||
var self = this;
|
||||
jQuery.each(self.keys, function(key, value) {
|
||||
delete self.keys[key];
|
||||
});
|
||||
return self;
|
||||
},
|
||||
load: function(url) {
|
||||
var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
|
||||
var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
|
||||
return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
|
||||
},
|
||||
empty: function() {
|
||||
return this.copy().EMPTY();
|
||||
},
|
||||
copy: function() {
|
||||
return new queryObject(this);
|
||||
},
|
||||
COMPACT: function() {
|
||||
function build(orig) {
|
||||
var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
|
||||
if (typeof orig == 'object') {
|
||||
function add(o, key, value) {
|
||||
if (is(o, Array))
|
||||
o.push(value);
|
||||
else
|
||||
o[key] = value;
|
||||
}
|
||||
jQuery.each(orig, function(key, value) {
|
||||
if (!is(value)) return true;
|
||||
add(obj, key, build(value));
|
||||
});
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
this.keys = build(this.keys);
|
||||
return this;
|
||||
},
|
||||
compact: function() {
|
||||
return this.copy().COMPACT();
|
||||
},
|
||||
toString: function() {
|
||||
var i = 0, queryString = [], chunks = [], self = this;
|
||||
var addFields = function(arr, key, value) {
|
||||
if (!is(value) || value === false) return;
|
||||
var o = [encodeURIComponent(key)];
|
||||
if (value !== true) {
|
||||
o.push("=");
|
||||
o.push(encodeURIComponent(value));
|
||||
}
|
||||
arr.push(o.join(""));
|
||||
};
|
||||
var build = function(obj, base) {
|
||||
var newKey = function(key) {
|
||||
return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
|
||||
};
|
||||
jQuery.each(obj, function(key, value) {
|
||||
if (typeof value == 'object')
|
||||
build(value, newKey(key));
|
||||
else
|
||||
addFields(chunks, newKey(key), value);
|
||||
});
|
||||
};
|
||||
|
||||
build(this.keys);
|
||||
|
||||
if (chunks.length > 0) queryString.push($hash);
|
||||
queryString.push(chunks.join($separator));
|
||||
|
||||
return queryString.join("");
|
||||
}
|
||||
};
|
||||
|
||||
return new queryObject(location.search, location.hash);
|
||||
};
|
||||
}(jQuery.query || {}); // Pass in jQuery.query as settings object
|
||||
/**
|
||||
* jQuery.query - Query String Modification and Creation for jQuery
|
||||
* Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
|
||||
* Licensed under the WTFPL (https://www.wtfpl.net/).
|
||||
* Date: 2009/02/08
|
||||
*
|
||||
* @author Blair Mitchelmore
|
||||
* @version 2.1.3
|
||||
*
|
||||
**/
|
||||
new function(settings) {
|
||||
// Various Settings
|
||||
var $separator = settings.separator || '&';
|
||||
var $spaces = settings.spaces === false ? false : true;
|
||||
var $suffix = settings.suffix === false ? '' : '[]';
|
||||
var $prefix = settings.prefix === false ? false : true;
|
||||
var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
|
||||
var $numbers = settings.numbers === false ? false : true;
|
||||
|
||||
jQuery.query = new function() {
|
||||
var is = function(o, t) {
|
||||
return o != undefined && o !== null && (!!t ? o.constructor == t : true);
|
||||
};
|
||||
var parse = function(path) {
|
||||
var m, rx = /\[([^[]*)\]/g, match = /^(\S+?)(\[\S*\])?$/.exec(path), base = match[1], tokens = [];
|
||||
while (m = rx.exec(match[2])) tokens.push(m[1]);
|
||||
return [base, tokens];
|
||||
};
|
||||
var set = function(target, tokens, value) {
|
||||
var o, token = tokens.shift();
|
||||
if (typeof target != 'object') target = null;
|
||||
if (token === "") {
|
||||
if (!target) target = [];
|
||||
if (is(target, Array)) {
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
} else if (is(target, Object)) {
|
||||
var i = 0;
|
||||
while (target[i++] != null);
|
||||
target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
|
||||
} else {
|
||||
target = [];
|
||||
target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
|
||||
}
|
||||
} else if (token && token.match(/^\s*[0-9]+\s*$/)) {
|
||||
var index = parseInt(token, 10);
|
||||
if (!target) target = [];
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else if (token) {
|
||||
var index = token.replace(/^\s*|\s*$/g, "");
|
||||
if (!target) target = {};
|
||||
if (is(target, Array)) {
|
||||
var temp = {};
|
||||
for (var i = 0; i < target.length; ++i) {
|
||||
temp[i] = target[i];
|
||||
}
|
||||
target = temp;
|
||||
}
|
||||
target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
return target;
|
||||
};
|
||||
|
||||
var queryObject = function(a) {
|
||||
var self = this;
|
||||
self.keys = {};
|
||||
|
||||
if (a.queryObject) {
|
||||
jQuery.each(a.get(), function(key, val) {
|
||||
self.SET(key, val);
|
||||
});
|
||||
} else {
|
||||
jQuery.each(arguments, function() {
|
||||
var q = "" + this;
|
||||
q = decodeURIComponent(q);
|
||||
q = q.replace(/^[?#]/,''); // remove any leading ? || #
|
||||
q = q.replace(/[;&]$/,''); // remove any trailing & || ;
|
||||
if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces
|
||||
|
||||
jQuery.each(q.split(/[&;]/), function(){
|
||||
var key = this.split('=')[0];
|
||||
var val = this.split('=')[1];
|
||||
|
||||
if (!key) return;
|
||||
|
||||
if ($numbers) {
|
||||
if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
|
||||
val = parseFloat(val);
|
||||
else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
|
||||
val = parseInt(val, 10);
|
||||
}
|
||||
|
||||
val = (!val && val !== 0) ? true : val;
|
||||
|
||||
if (val !== false && val !== true && typeof val != 'number')
|
||||
val = val;
|
||||
|
||||
self.SET(key, val);
|
||||
});
|
||||
});
|
||||
}
|
||||
return self;
|
||||
};
|
||||
|
||||
queryObject.prototype = {
|
||||
queryObject: true,
|
||||
has: function(key, type) {
|
||||
var value = this.get(key);
|
||||
return is(value, type);
|
||||
},
|
||||
GET: function(key) {
|
||||
if (!is(key)) return this.keys;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
while (target != null && tokens.length != 0) {
|
||||
target = target[tokens.shift()];
|
||||
}
|
||||
return typeof target == 'number' ? target : target || "";
|
||||
},
|
||||
get: function(key) {
|
||||
var target = this.GET(key);
|
||||
if (is(target, Object))
|
||||
return jQuery.extend(true, {}, target);
|
||||
else if (is(target, Array))
|
||||
return target.slice(0);
|
||||
return target;
|
||||
},
|
||||
SET: function(key, val) {
|
||||
var value = !is(val) ? null : val;
|
||||
var parsed = parse(key), base = parsed[0], tokens = parsed[1];
|
||||
var target = this.keys[base];
|
||||
this.keys[base] = set(target, tokens.slice(0), value);
|
||||
return this;
|
||||
},
|
||||
set: function(key, val) {
|
||||
return this.copy().SET(key, val);
|
||||
},
|
||||
REMOVE: function(key) {
|
||||
return this.SET(key, null).COMPACT();
|
||||
},
|
||||
remove: function(key) {
|
||||
return this.copy().REMOVE(key);
|
||||
},
|
||||
EMPTY: function() {
|
||||
var self = this;
|
||||
jQuery.each(self.keys, function(key, value) {
|
||||
delete self.keys[key];
|
||||
});
|
||||
return self;
|
||||
},
|
||||
load: function(url) {
|
||||
var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
|
||||
var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
|
||||
return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
|
||||
},
|
||||
empty: function() {
|
||||
return this.copy().EMPTY();
|
||||
},
|
||||
copy: function() {
|
||||
return new queryObject(this);
|
||||
},
|
||||
COMPACT: function() {
|
||||
function build(orig) {
|
||||
var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
|
||||
if (typeof orig == 'object') {
|
||||
function add(o, key, value) {
|
||||
if (is(o, Array))
|
||||
o.push(value);
|
||||
else
|
||||
o[key] = value;
|
||||
}
|
||||
jQuery.each(orig, function(key, value) {
|
||||
if (!is(value)) return true;
|
||||
add(obj, key, build(value));
|
||||
});
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
this.keys = build(this.keys);
|
||||
return this;
|
||||
},
|
||||
compact: function() {
|
||||
return this.copy().COMPACT();
|
||||
},
|
||||
toString: function() {
|
||||
var i = 0, queryString = [], chunks = [], self = this;
|
||||
var addFields = function(arr, key, value) {
|
||||
if (!is(value) || value === false) return;
|
||||
var o = [encodeURIComponent(key)];
|
||||
if (value !== true) {
|
||||
o.push("=");
|
||||
o.push(encodeURIComponent(value));
|
||||
}
|
||||
arr.push(o.join(""));
|
||||
};
|
||||
var build = function(obj, base) {
|
||||
var newKey = function(key) {
|
||||
return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
|
||||
};
|
||||
jQuery.each(obj, function(key, value) {
|
||||
if (typeof value == 'object')
|
||||
build(value, newKey(key));
|
||||
else
|
||||
addFields(chunks, newKey(key), value);
|
||||
});
|
||||
};
|
||||
|
||||
build(this.keys);
|
||||
|
||||
if (chunks.length > 0) queryString.push($hash);
|
||||
queryString.push(chunks.join($separator));
|
||||
|
||||
return queryString.join("");
|
||||
}
|
||||
};
|
||||
|
||||
return new queryObject(location.search, location.hash);
|
||||
};
|
||||
}(jQuery.query || {}); // Pass in jQuery.query as settings object
|
||||
|
||||
Reference in New Issue
Block a user