chore: merge branch 'fix/meta-tags'

ouchadam · Jan 18, 2016 · cfcb0be · cfcb0be
2 parents e6c4a70 + 9b60777
commit cfcb0be
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -215,8 +215,9 @@ function main() {
     if (enc !== 'utf-8') {
       // when transcoding remove any meta tags setting the charset
       $('meta').each(function charMeta() {
-        var content = $(this).attr('content') || '';
-        if (content.toLowerCase().indexOf('charset=')) {
+        var attrs = $(this).attr();
+        var content = attrs.content || '';
+        if (attrs.charset || content.toLowerCase().indexOf('charset=') !== -1) {
           $(this).remove();
         }
       });

diff --git a/test/fixtures/meta-tags-alt.opts.json b/test/fixtures/meta-tags-alt.opts.json
@@ -0,0 +1,3 @@
+{
+    "encoding": "windows-1253"
+}
diff --git a/test/fixtures/meta-tags-alt.result.html b/test/fixtures/meta-tags-alt.result.html
@@ -0,0 +1 @@
+<!DOCTYPE html> <html> <head> <meta name="viewport" content="width=device-width"> <meta name="description" content="just a demo"> <title>metatag test</title> </head> <body> <p>Nothing to see</p> </body> </html>
diff --git a/test/fixtures/meta-tags-alt.src.html b/test/fixtures/meta-tags-alt.src.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta name="viewport" content="width=device-width">
+  <meta name="description" content="just a demo">
+  <title>metatag test</title>
+</head>
+<body>
+<p>Nothing to see</p>
+</body>
+</html>
diff --git a/test/fixtures/meta-tags.opts.json b/test/fixtures/meta-tags.opts.json
@@ -0,0 +1,3 @@
+{
+    "encoding": "windows-1253"
+}
diff --git a/test/fixtures/meta-tags.result.html b/test/fixtures/meta-tags.result.html
@@ -0,0 +1 @@
+<!DOCTYPE html> <html> <head> <meta name="viewport" content="width=device-width"> <meta name="description" content="just a demo"> <title>metatag test</title> </head> <body> <p>Nothing to see</p> </body> </html>
diff --git a/test/fixtures/meta-tags.src.html b/test/fixtures/meta-tags.src.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width">
+  <meta name="description" content="just a demo">
+  <title>metatag test</title>
+</head>
+<body>
+<p>Nothing to see</p>
+</body>
+</html>
diff --git a/test/index.test.js b/test/index.test.js
@@ -69,6 +69,7 @@ test('inliner fixtures', function fixtureTests(t) {
         var opts = {};
         try {
           opts = require(optsfile);
+          debug('loaded options %s', optsfile, opts);
         } catch (e) {}
 
         return new Promise(function inlinerPromise(resolve, reject) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html> <html> <head> <meta name="viewport" content="width=device-width"> <meta name="description" content="just a demo"> <title>metatag test</title> </head> <body> <p>Nothing to see</p> </body> </html>