suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix URL query parsing in Firefox.

Browse Source 
Closes bug 14686.

original commit: 51254f06267fb13d734e43413ae44740f29d4891
This commit is contained in:
Sam Tobin-Hochstadt 2014-08-18 13:52:06 -04:00
parent 7be7c29080
commit 02cd00e03b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js
View File

@ -2,8 +2,7 @@
// Page Parameters ------------------------------------------------------------ // Page Parameters ------------------------------------------------------------
var page_query_string = var page_query_string = location.search.substring(1);
(location.href.search(/\?([^#]+)(?:#|$)/) >= 0) && RegExp.$1;
var page_args = var page_args =
((function(){ ((function(){
@ -32,13 +31,16 @@ function MergePageArgsIntoLink(a) {
} }
function MergePageArgsIntoUrl(href) { function MergePageArgsIntoUrl(href) {
href.search(/^([^?#]*)(?:\?([^#]*))?(#.*)?$/); var mtch = href.match(/^([^?#]*)(?:\?([^#]*))?(#.*)?$/);
if (RegExp.$2.length == 0) { if (mtch == undefined) { // I think this never happens
return RegExp.$1 + "?" + page_query_string + RegExp.$3; return "?" + page_query_string;
} else { }
if (!mtch[2]) {
return mtch[1] + "?" + page_query_string + (mtch[3] || "");
}
// need to merge here, precedence to arguments that exist in `a' // need to merge here, precedence to arguments that exist in `a'
var i, j; var i, j;
var prefix = RegExp.$1, str = RegExp.$2, suffix = RegExp.$3; var prefix = mtch[1], str = mtch[2] || "", suffix = mtch[3] || "";
var args = str.split(/[&;]/); var args = str.split(/[&;]/);
for (i=0; i<args.length; i++) { for (i=0; i<args.length; i++) {
j = args[i].indexOf('='); j = args[i].indexOf('=');
@ -52,7 +54,6 @@ function MergePageArgsIntoUrl(href) {
if (!exists) str += "&" + page_args[i][0] + "=" + page_args[i][1]; if (!exists) str += "&" + page_args[i][0] + "=" + page_args[i][1];
} }
return prefix + "?" + str + suffix; return prefix + "?" + str + suffix;
}
} }
// Cookies -------------------------------------------------------------------- // Cookies --------------------------------------------------------------------