From 3c6728e30f2e2214a7a8c17d61791a0354797639 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Sat, 16 Mar 2013 23:51:34 -0400 Subject: [PATCH] Remove unnecessary version checking code --- chrome/content/zotero/xpcom/utilities.js | 28 ++++++------------------ 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index 41e7b98046..44a7b3f01a 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -408,29 +408,15 @@ Zotero.Utilities = { // Create a node and use the textContent property to do unescaping where // possible, because this approach preserves
if(node === undefined) { - var platformVersion = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(Components.interfaces.nsIXULAppInfo).platformVersion; - if(Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator) - .compare(platformVersion, "12.0") >= 0) { - var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"] - .createInstance(Components.interfaces.nsIDOMParser); - var domDocument = parser.parseFromString("", - "text/html"); - node = domDocument.createElement("div"); - } else { - node = false; - } + var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"] + .createInstance(Components.interfaces.nsIDOMParser); + var domDocument = parser.parseFromString("", + "text/html"); + node = domDocument.createElement("div"); } - if(node) { - node.innerHTML = str; - return node.textContent.replace(/ {2,}/g, " "); - } else if(!nsIScriptableUnescapeHTML) { - nsIScriptableUnescapeHTML = Components.classes["@mozilla.org/feed-unescapehtml;1"] - .getService(Components.interfaces.nsIScriptableUnescapeHTML); - } - return nsIScriptableUnescapeHTML.unescape(str); + node.innerHTML = str; + return node.textContent.replace(/ {2,}/g, " "); } else if(Zotero.isNode) { /*var doc = require('jsdom').jsdom(str, null, { "features":{