HTMLDecode was ignoring ' and '

jsdom · Oct 25, 2010 · aba1cc2 · aba1cc2
1 parent b64c6c0
commit aba1cc2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/jsdom/browser/htmlencoding.js b/lib/jsdom/browser/htmlencoding.js
@@ -178,11 +178,12 @@ var html_entity_decode = function(string, quote_style) {
     delete(hash_map['&']);
     hash_map['&'] = '&amp;';
 
+    tmp_str = tmp_str.split('&#039;').join("'");
+    tmp_str = tmp_str.split('&apos;').join("'");
     for (symbol in hash_map) {
         entity = hash_map[symbol];
         tmp_str = tmp_str.split(entity).join(symbol);
     }
-    tmp_str = tmp_str.split('&#039;').join("'");
 
     return tmp_str;
 };
@@ -221,7 +222,7 @@ var get_html_translation_table = function(table, quote_style) {
     constMappingQuoteStyle[3] = 'ENT_QUOTES';
 
     useTable       = !isNaN(table) ? constMappingTable[table] : table ? table.toUpperCase() : 'HTML_SPECIALCHARS';
-    useQuoteStyle = !isNaN(quote_style) ? constMappingQuoteStyle[quote_style] : quote_style ? quote_style.toUpperCase() : 'ENT_COMPAT';
+    useQuoteStyle = !isNaN(quote_style) ? constMappingQuoteStyle[quote_style] : quote_style ? quote_style.toUpperCase() : 'ENT_QUOTES';
 
     if (useTable !== 'HTML_SPECIALCHARS' && useTable !== 'HTML_ENTITIES') {
         throw new Error("Table: "+useTable+' not supported');