From 1e10fb59679c0a2604613acaa00524dece3af3de Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 14 Aug 2013 18:54:06 +0000 Subject: [PATCH] use Ox.decodeURI/Ox.decodeURIComponent --- static/js/URL.js | 2 +- static/js/embed/pandora.js | 2 +- static/js/infoView.indiancinema.js | 2 +- static/js/utils.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/URL.js b/static/js/URL.js index 4783b6bd..5ca04e30 100644 --- a/static/js/URL.js +++ b/static/js/URL.js @@ -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 diff --git a/static/js/embed/pandora.js b/static/js/embed/pandora.js index 76c95f87..daf0481b 100755 --- a/static/js/embed/pandora.js +++ b/static/js/embed/pandora.js @@ -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') { diff --git a/static/js/infoView.indiancinema.js b/static/js/infoView.indiancinema.js index 8978e60f..366e95c0 100644 --- a/static/js/infoView.indiancinema.js +++ b/static/js/infoView.indiancinema.js @@ -327,7 +327,7 @@ pandora.ui.infoView = function(data) { .append(formatKey('wiki')) .append( '' - + decodeURI(data.wiki.split('wiki/').pop()) + '' + + Ox.decodeURI(data.wiki.split('wiki/').pop()) + '' ); } $links.appendTo($text); diff --git a/static/js/utils.js b/static/js/utils.js index d9bff2fa..ffd24016 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -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',