Merge branch 'feature/image_fix' into develop

Muffo · Nov 5, 2016 · b5507cd · b5507cd
2 parents 3fb4ea0 + 06b8a5b
commit b5507cd
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/app/scripts/content.js b/app/scripts/content.js
@@ -177,13 +177,16 @@ function onBoilerpipeArticleExtracted(data, overlay) {
 
     // Replace the preview of the article with the full text
     var articlePreviewHTML = contentElement.innerHTML;
-    contentElement.innerText = articleContent;
+    contentElement.innerHTML = articleContent;
 
-    // Put the image back at the beginning of the article
-    if (articleImage !== null) {
-        contentElement.insertBefore(articleImage, contentElement.firstChild);
-    }
+    // Clear image styles to fix formatting of images with class/style/width information in article markup
+    Array.prototype.slice.call(contentElement.querySelectorAll('img')).forEach(function(el) {
+        el.removeAttribute('class');
+        el.removeAttribute('width');
+        el.setAttribute('style', 'max-width:100%;');
+    });
 
+    // Toggle Success Overlay
     addUndoButton(articlePreviewHTML);
     successOverlay('done', overlay);
 }
@@ -239,6 +242,15 @@ function onMercuryReadabilityArticleExtracted(data, overlay) {
     // Replace the preview of the article with the full text
     var articlePreviewHTML = contentElement.innerHTML;
     contentElement.innerHTML = articleContent;
+
+    // Clear image styles to fix formatting of images with class/style/width information in article markup
+    Array.prototype.slice.call(contentElement.querySelectorAll('img')).forEach(function(el) {
+        el.removeAttribute('class');
+        el.removeAttribute('width');
+        el.setAttribute('style', 'max-width:100%;');
+    });
+
+    // Toggle success overlay
     successOverlay('done', overlay);
 
     // Put the image back at the beginning of the article