Merge pull request #508 from alexindigo/master

Respect options on the element level fixes #496, #460
cheeriojs · Jun 9, 2014 · aa886bf · aa886bf
2 parents 423615d + 44d8b6a
commit aa886bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/api/manipulation.js b/lib/api/manipulation.js
@@ -233,9 +233,9 @@ var empty = exports.empty = function() {
 var html = exports.html = function(str) {
   if (str === undefined) {
     if (!this[0] || !this[0].children) return null;
-    return $.html(this[0].children);
+    return $.html(this[0].children, this.options);
   }
-  
+
   var opts = this.options;
 
   domEach(this, function(i, el) {

diff --git a/test/cheerio.js b/test/cheerio.js
@@ -264,4 +264,17 @@ describe('cheerio', function() {
     expect(dom.html({xmlMode: true})).to.be(expectedXml);
   });
 
+  it('should respect options on the element level', function() {
+    var str = '<!doctype html><html><head><title>Some test</title></head><body><footer><p>Copyright &copy; 2003-2014</p></footer></body></html>',
+        expectedHtml = '<p>Copyright &copy; 2003-2014</p>',
+        expectedXml = '<p>Copyright &#xA9; 2003-2014</p>',
+        domNotEncoded = $.load(str, {decodeEntities: false}),
+        domEncoded = $.load(str);
+
+    expect(domNotEncoded('footer').html()).to.be(expectedHtml);
+    // TODO: Make it more html friendly, maybe with custom encode tables
+    expect(domEncoded('footer').html()).to.be(expectedXml);
+  });
+
+
 });