Merge pull request #51 from sandeepchhapola/master

Fixed twice image display issue for rss feed content, ticket : #120475249
BuildFire · Jun 1, 2016 · cdda8a2 · cdda8a2
2 parents 57f3eab + 5f0ad34
commit cdda8a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/widget/filters.js b/widget/filters.js
@@ -89,11 +89,13 @@
    * @param html
    */
     .filter('removeHtmlStyle', [function () {
-      return function (html) {
+      return function (html, src) {
         if (html) {
-          html = html.replace(/(<[^>]+) style=".*?"/i, '$1', "");
-          html = html.replace(/<iframe.+?<\/iframe>/g, '');
-          html = html.replace(/(<a\b[^><]*)>/ig, '$1 target="_blank">');
+            var img = new RegExp('<img.*?src=\"' + src + '\".*?>');
+            html = html.replace(/(<[^>]+) style=".*?"/i, '$1', "");
+            html = html.replace(/<iframe.+?<\/iframe>/g, '');
+            html = html.replace(img, '');
+            html = html.replace(/(<a\b[^><]*)>/ig, '$1 target="_blank">');
         }
         return html;
       };

diff --git a/widget/templates/Feed_Layout_1.html b/widget/templates/Feed_Layout_1.html
@@ -62,7 +62,7 @@
         <!--<a class="text-primary">Share</a>-->
       </div>
       <hr class="small">
-      <p id="description" ng-bind-html="WidgetMedia.item.description|removeHtmlStyle|safeHtml"></p>
+      <p id="description" ng-bind-html="WidgetMedia.item.description|removeHtmlStyle:WidgetMedia.imageUrl|safeHtml"></p>
     </div>
   </div>
 </div>
diff --git a/widget/templates/Feed_Layout_2.html b/widget/templates/Feed_Layout_2.html
@@ -53,7 +53,7 @@ <h5 class="margin-bottom-zero whiteTheme">{{WidgetMedia.item.summary|truncate:10
           		<!--<a class="text-primary">Share</a>-->
         	</div>
         	<hr class="small">
-        	<p ng-bind-html="WidgetMedia.item.description|removeHtmlStyle|safeHtml"></p>
+        	<p ng-bind-html="WidgetMedia.item.description|removeHtmlStyle:WidgetMedia.imageUrl|safeHtml"></p>
       	</div>
   	</div>
 </div>