forked from 0x2620/pandora
use Ox.decodeURI/Ox.decodeURIComponent
This commit is contained in:
parent
e1913a1d05
commit
1e10fb5967
4 changed files with 4 additions and 4 deletions
|
@ -426,7 +426,7 @@ pandora.URL = (function() {
|
|||
callback = arguments[0];
|
||||
url = null;
|
||||
if (document.location.pathname.slice(0, 4) == 'url=') {
|
||||
document.location.href = decodeURI(document.location.pathname.slice(4));
|
||||
document.location.href = Ox.decodeURI(document.location.pathname.slice(4));
|
||||
} else {
|
||||
self.URL.parse(function(state) {
|
||||
// setState -> UI.set -> URL.update
|
||||
|
|
|
@ -274,7 +274,7 @@ Ox.load('UI', {
|
|||
options;
|
||||
vars.forEach(function(v) {
|
||||
var kv = v.split('='), k = kv[0], v = kv[1];
|
||||
query[k] = decodeURIComponent(v);
|
||||
query[k] = Ox.decodeURIComponent(v);
|
||||
if (query[k] == 'true') {
|
||||
query[k] = true;
|
||||
} else if (query[k] == 'false') {
|
||||
|
|
|
@ -327,7 +327,7 @@ pandora.ui.infoView = function(data) {
|
|||
.append(formatKey('wiki'))
|
||||
.append(
|
||||
'<a href="' + data.wiki + '">'
|
||||
+ decodeURI(data.wiki.split('wiki/').pop()) + '</a>'
|
||||
+ Ox.decodeURI(data.wiki.split('wiki/').pop()) + '</a>'
|
||||
);
|
||||
}
|
||||
$links.appendTo($text);
|
||||
|
|
|
@ -2212,7 +2212,7 @@ pandora.wait = function(taskId, callback, timeout) {
|
|||
state = conditions == 1 && indices.length == 1 ? {
|
||||
index: indices[0],
|
||||
key: find.conditions[indices[0]].key,
|
||||
value: decodeURIComponent(find.conditions[indices[0]].value)
|
||||
value: Ox.decodeURIComponent(find.conditions[indices[0]].value)
|
||||
} : {
|
||||
index: -1,
|
||||
key: conditions == 0 && indices.length == 0 ? '*' : 'advanced',
|
||||
|
|
Loading…
Reference in a new issue