html-utils: update cheerio usage to generate html code

Author: nleush

lib/html-utils.js

@@ -5,6 +5,10 @@
 
     var defaultPaddingBottom = 100 / CONFIG.DEFAULT_ASPECT_RATIO;
 
+    function createCheerioElement(name) {
+        return cheerio.load(`<${name}></${name}>`)(name);
+    }
+
     function wrapContainer($element, data, options) {
 
         var aspectWrapperClass = options && options.aspectWrapperClass;
@@ -30,7 +34,7 @@
             }
         }
 
-        var $container = cheerio('<div>')
+        var $container = createCheerioElement('div')
             .append($element);
 
         if (aspectWrapperClass) {
@@ -45,7 +49,7 @@
         var hasMaxWidth = media && (media["max-width"] || media["min-width"] || media["width"] || verticalAspect);
 
         if (hasMaxWidth || forceWidthLimitContainer) {
-            $widthLimitContainer = cheerio('<div>')
+            $widthLimitContainer = createCheerioElement('div')
                 .append($container);
         }
 
@@ -166,7 +170,7 @@
                     && data.href;
             },
             generate: function(data) {
-                var $img = cheerio('<img>')
+                var $img = createCheerioElement('img')
                     .attr('src', data.href);
                 if (data.title) {
                     $img
@@ -190,7 +194,7 @@
                 var givf = data.rel.indexOf('gifv') > -1;
                 var autoplay = data.rel.indexOf('autoplay') > -1 || givf;
 
-                var $video = cheerio('<video' + (givf ? ' loop muted webkit-playsinline' : ' controls') + (autoplay ? ' autoplay' : '') + '>Your browser does not support HTML5 video.</video>');
+                var $video = cheerio.load('<video' + (givf ? ' loop muted webkit-playsinline' : ' controls') + (autoplay ? ' autoplay' : '') + '>Your browser does not support HTML5 video.</video>')('video');
 
                 if (iframelyData && iframelyData.links) {
 
@@ -279,8 +283,7 @@
                 return data.type === "text/html" && data.href;
             },
             generate: function(data, options) {
-
-                var $iframe = cheerio('<iframe>')
+                var $iframe = createCheerioElement('iframe')
                     .attr('src', data.href)
                     .css('border', '0')
                     .attr('allowfullscreen', '');
@@ -334,16 +337,6 @@
         }
     };
 
-    export function generateElementWrapperHtml(element, link, options) {
-
-        if (typeof element === 'string') {
-            element = cheerio(element);
-        }
-
-        var $el = wrapContainer(element, link, options);
-        return cheerio('<div>').append($el).html();
-    };
-
     export function generateLinkElementHtml(link, options) {
         var $el = generateLinkElement(link, options);
         if (_.isString($el)) {
@@ -352,7 +345,7 @@
             if (options && options.canonical && link.href !== options.canonical) {
                 $el.attr('data-embed-canonical', options.canonical);
             }
-            return cheerio('<div>').append($el).html();
+            return $el.prop('outerHTML');
         } else {
             return '';
         }