Merge pull request #52 from sandeepchhapola/master

Showed video iframe coming in RSS Feed below "View Source", ticket: #120469503
BuildFire · Jun 22, 2016 · 1cf4e9c · 1cf4e9c
2 parents e0a7067 + e70be12
commit 1cf4e9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/widget/controllers/widget.home.controller.js b/widget/controllers/widget.home.controller.js
@@ -132,7 +132,7 @@
                     } else {
                         if (item['media:thumbnail'] && item['media:thumbnail']['@'] && item['media:thumbnail']['@'].url) {
                             return item['media:thumbnail']['@'].url;
-                        } else if (item['media:group'] && item['media:group']['media:content'] && item['media:group']['media:content']['media:thumbnail']['@'] && item['media:group']['media:content']['media:thumbnail']['@'].url) {
+                        } else if (item['media:group'] && item['media:group']['media:content'] && item['media:group']['media:content']['media:thumbnail'] && item['media:group']['media:content']['media:thumbnail']['@'] && item['media:group']['media:content']['media:thumbnail']['@'].url) {
                             return item['media:group']['media:content']['media:thumbnail']['@'].url;
                         } else if (item.description) {
                             return $filter('extractImgSrc')(item.description);

diff --git a/widget/controllers/widget.nowplaying.controller.js b/widget/controllers/widget.nowplaying.controller.js
@@ -8,6 +8,7 @@
                 $rootScope.showFeed = false;
 
                 var NowPlaying = this;
+                NowPlaying.playing = false;
                 NowPlaying.currentTime=0;
                 /**
                  * WidgetMedia.item used to hold item details object

diff --git a/widget/filters.js b/widget/filters.js
@@ -93,7 +93,7 @@
         if (html) {
             var img = new RegExp('<img.*?src=\"' + src + '\".*?>');
             html = html.replace(/(<[^>]+) style=".*?"/i, '$1', "");
-            html = html.replace(/<iframe.+?<\/iframe>/g, '');
+            html = html.replace(/(<iframe[^>]+) height="([^"]*)"|width="([^"]*)"<\/iframe>/ig, '$1', "");
             html = html.replace(img, '');
             html = html.replace(/(<a\b[^><]*)>/ig, '$1 target="_blank">');
         }