diff --git a/boot/boot.js b/boot/boot.js index 9a0af66e2..482af283c 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -256,6 +256,28 @@ $tw.utils.deepDefaults = function(object /*, sourceObjectList */) { return object; }; +/* +Convert a URIComponent encoded string to a string safely +*/ +$tw.utils.decodeURIComponentSafe = function(s) { + var v = s; + try { + v = decodeURIComponent(s); + } catch(e) {} + return v; +}; + +/* +Convert a URI encoded string to a string safely +*/ +$tw.utils.decodeURISafe = function(s) { + var v = s; + try { + v = decodeURI(s); + } catch(e) {} + return v; +}; + /* Convert "&" to &, " " to nbsp, "<" to <, ">" to > and """ to " */ diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js index 1e6b7cec2..24e4cbd25 100644 --- a/core/modules/utils/utils.js +++ b/core/modules/utils/utils.js @@ -978,22 +978,4 @@ exports.makeCompareFunction = function(type,options) { return (types[type] || types[options.defaultType] || types.number); }; -exports.decodeURIComponentSafe = function(str) { - var value = str; - try { - value = decodeURIComponent(str); - } catch(e) { - } - return value; -}; - -exports.decodeURISafe = function(str) { - var value = str; - try { - value = decodeURI(str); - } catch(e) { - } - return value; -}; - })();