From 40d1d021d49e1f142bbcfffaa0bd318bb2167e35 Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 27 May 2012 12:37:09 +0200 Subject: [PATCH] remove Ox.encodeHTML and Ox.decodeHTML; move Ox.encodeHTMLEntities and Ox.decodeHTMLEntities to HTML.js --- source/Ox/js/Encoding.js | 54 ---------------------------------------- 1 file changed, 54 deletions(-) diff --git a/source/Ox/js/Encoding.js b/source/Ox/js/Encoding.js index 940b228f..79a1121e 100644 --- a/source/Ox/js/Encoding.js +++ b/source/Ox/js/Encoding.js @@ -235,60 +235,6 @@ Ox.decodeDeflate = function(string, callback) { image.src = 'data:image/png;base64,' + btoa(data); }; -/*@ -Ox.encodeHTML HTML-encodes a string - > Ox.encodeHTML('\'<"&">\'') - ''<"&">'' - > Ox.encodeHTML('äbçdê') - 'äbçdê' -@*/ -Ox.encodeHTML = function(string) { - string = Ox.isUndefined(string) ? '' : string.toString(); - return Ox.map(string, function(char) { - var code = char.charCodeAt(0); - return code < 128 - ? (char in Ox.HTML_ENTITIES ? Ox.HTML_ENTITIES[char] : char) - : '&#x' + Ox.pad(code.toString(16).toUpperCase(), 4) + ';'; - }); -}; - -/*@ -Ox.decodeHTML Decodes an HTML-encoded string - > Ox.decodeHTML(''<"&">'') - '\'<"&">\'' - > Ox.decodeHTML(''<"&">'') - '\'<"&">\'' - > Ox.decodeHTML('äbçdê') - 'äbçdê' - > Ox.decodeHTML('äbçdê') - 'äbçdê' - > Ox.decodeHTML('bold') - 'bold' -@*/ -Ox.decodeHTML = function(string) { - // relies on dom, but shorter than using this: - // http://www.w3.org/TR/html5/named-character-references.html - return Ox.decodeHTMLEntities(Ox.element('
').html(string).html()); -}; - -Ox.encodeHTMLEntities = function(string) { - return string.replace( - new RegExp('(' + Object.keys(Ox.HTML_ENTITIES).join('|') + ')', 'g'), - function(match) { - return Ox.HTML_ENTITIES[match]; - } - ); -}; - -Ox.decodeHTMLEntities = function(string) { - return string.replace( - new RegExp('(' + Ox.values(Ox.HTML_ENTITIES).join('|') + ')', 'g'), - function(match) { - return Ox.keyOf(Ox.HTML_ENTITIES, match); - } - ); -}; - /*@ Ox.encodeUTF8 Encodes a string as UTF-8 see http://en.wikipedia.org/wiki/UTF-8