Merge pull request #6 from herablog/feature-tags

v0.0.7.

lib/plugins/disallowed-tags.js

@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 exports.default = function () {
-  var _this3 = this;
+  var _this4 = this;
 
   return {
     removeDisallowedTags: function removeDisallowedTags() {
-      removeTags.bind(_this3)();
-      return _this3;
+      removeTags.bind(_this4)();
+      return _this4;
     },
     replaceDisallowedTags: function replaceDisallowedTags() {
-      replaceInlineTags.bind(_this3)();
-      return _this3;
+      replaceInlineTags.bind(_this4)();
+      replaceBlockTags.bind(_this4)();
+      return _this4;
     }
   };
 };
@@ -41,4 +42,18 @@ function replaceInlineTags() {
     $conainer.append($newEl);
     $el.replaceWith($conainer.html());
   });
+}
+
+function replaceBlockTags() {
+  var _this3 = this;
+
+  var selectors = ['fieldset', 'legend', 'marquee'];
+  this.$(this.$(selectors.join(',')).get().reverse()).each(function (i, el) {
+    var $el = _this3.$(el);
+    var $conainer = _this3.$('<div>');
+    var $newEl = _this3.$('<div>');
+    $newEl.html($el.html());
+    $conainer.append($newEl);
+    $el.replaceWith($conainer.html());
+  });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-to-amp",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Transform the normal html to the amp html.",
   "main": "index.js",
   "scripts": {

src/plugins/disallowed-tags.js

@@ -34,6 +34,22 @@ function replaceInlineTags() {
   });
 }
 
+function replaceBlockTags() {
+  const selectors = [
+    'fieldset',
+    'legend',
+    'marquee'
+  ];
+  this.$(this.$(selectors.join(',')).get().reverse()).each((i, el) => {
+    const $el = this.$(el);
+    const $conainer = this.$('<div>');
+    const $newEl = this.$('<div>');
+    $newEl.html($el.html());
+    $conainer.append($newEl);
+    $el.replaceWith($conainer.html());
+  });
+}
+
 export default function () {
   return {
     removeDisallowedTags: () => {
@@ -42,6 +58,7 @@ export default function () {
     },
     replaceDisallowedTags: () => {
       replaceInlineTags.bind(this)();
+      replaceBlockTags.bind(this)();
       return this;
     }
   };

tests/plugins/disallowed-tags-test.js

@@ -2,13 +2,20 @@ import { expect } from 'chai';
 import ampBuilder from '../../src/amp-builder';
 
 describe('disallowed-tags', () => {
-  it('replaces inline disallowed-tags.', () => {
+  it('replaces disallowed inline tags.', () => {
     const html = '<font color="red"><font size="3">aaa</font></font>';
     const fixture = '<span><span>aaa</span></span>';
     const builder = ampBuilder(html);
     const result = builder.replaceDisallowedTags().html();
     expect(result).to.equal(fixture);
   });
+  it('replaces disallowed block tags.', () => {
+    const html = '<fieldset><legend><marquee><span>aaa</span></marquee></legend></fieldset>';
+    const fixture = '<div><div><div><span>aaa</span></div></div></div>';
+    const builder = ampBuilder(html);
+    const result = builder.replaceDisallowedTags().html();
+    expect(result).to.equal(fixture);
+  });
   it('removes disallowed-tags.', () => {
     const html = '<style>p { color: red; }</style>';
     const fixture = '';