Re-factor $.parseHTML to use $.load

AhmedArch · Jul 4, 2013 · 2e4f73f · 2e4f73f
1 parent 7cb293c
commit 2e4f73f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -8,8 +8,8 @@ var htmlparser = require('htmlparser2'),
 /*
   Parser
 */
-exports = module.exports = function(content, options, scripts) {
-  var dom = evaluate(content, options, scripts);
+exports = module.exports = function(content, options) {
+  var dom = evaluate(content, options);
 
   // Generic root element
   var root = {
@@ -27,7 +27,7 @@ exports = module.exports = function(content, options, scripts) {
   return root;
 };
 
-var evaluate = exports.evaluate = function(content, options, scripts) {
+var evaluate = exports.evaluate = function(content, options) {
   // options = options || $.fn.options;
 
   var handler = new htmlparser.DomHandler(options),
@@ -36,10 +36,10 @@ var evaluate = exports.evaluate = function(content, options, scripts) {
   parser.write(content);
   parser.done();
 
-  return connect(handler.dom, null, scripts);
+  return connect(handler.dom);
 };
 
-var connect = exports.connect = function(dom, parent, scripts) {
+var connect = exports.connect = function(dom, parent) {
   parent = parent || null;
 
   var prevElem = null;
@@ -49,10 +49,6 @@ var connect = exports.connect = function(dom, parent, scripts) {
     if (isTag(elem.type) && elem.attribs === undefined)
       elem.attribs = {};
 
-    if (scripts && elem.name === 'script') {
-      scripts.push(elem);
-    }
-
     // Set parent
     elem.parent = parent;
 

diff --git a/lib/static.js b/lib/static.js
@@ -86,7 +86,7 @@ var text = exports.text = function(elems) {
  * meaning for Cheerio, but it is maintained for API compatability with jQuery.
  */
 var parseHTML = exports.parseHTML = function(data, context, keepScripts) {
-  var parsed, scripts;
+  var parsed;
 
   if (!data || typeof data !== 'string') {
     return null;
@@ -96,14 +96,12 @@ var parseHTML = exports.parseHTML = function(data, context, keepScripts) {
     keepScripts = context;
   }
 
-  scripts = !keepScripts && [];
-  parsed = parse(data, null, scripts);
-
-  if (scripts) {
-    this(scripts).remove();
+  parsed = this.load(data);
+  if (!keepScripts) {
+    parsed('script').remove();
   }
 
-  return parsed.children;
+  return parsed.root()[0].children;
 };
 
 /**