Merge pull request #50 from sandeepchhapola/master

Fixed the time issue for player and images not pulling through RSS Feed issue: #120028123

Author: DanielHindi

widget/controllers/widget.nowplaying.controller.js

@@ -6,7 +6,9 @@
                 console.log('----------------------------Now Playing controller loaded-------------------');
                 //$rootScope.blackBackground = true;
                 $rootScope.showFeed = false;
+
                 var NowPlaying = this;
+                NowPlaying.currentTime=0;
                 /**
                  * WidgetMedia.item used to hold item details object
                  * @type {object}
@@ -215,12 +217,18 @@
                 function Track(track) {
                     console.log('Track-----------------------------------------------------', track);
                     this.title = track && track.title;
-                    if(track && track['media:content'] && track['media:content'] && track['media:content']['@'] && track['media:content']['@'].url){
+                    if(track && track['media:content'] && track['media:content'] && track['media:content']['@'] && track['media:content']['@'].url && track['media:content']['@'].url.substring(track['media:content']['@'].url.length-4,track['media:content']['@'].url.length)=='.mp3'){
                         this.url = track && track['media:content'] && track['media:content'] && track['media:content']['@'] && track['media:content']['@'].url;
                     }
-                    else{
+                    else if(track && track.link && track.link.substring(track.link.length-4,track.link.length)=='.mp3'){
                         this.url=track && track.link;
                     }
+                    else if(track && track.enclosures && track.enclosures[0] && track.enclosures[0].url && track.enclosures[0].url.substring(track.enclosures[0].url.length-4,track.enclosures[0].url.length)){
+                        this.url=track.enclosures[0].url;
+                    }
+                    else{
+                        console.error('**************************URL not found***********************');
+                    }
                     this.image = track && track.imageSrcUrl;
                     this.album = '';
                     this.artist = track && track.author;

widget/filters.js

@@ -109,9 +109,10 @@
         if (!imgArr || imgArr.length === 0) {
           return '';
         }
-        var img = imgArr[0]
-          , rex = /^<img[^>].*src=['"]([\/:a-zA-Z0-9\._-]+)['"].*$/i
-          , result = img.match(rex);
+        var img = imgArr[0];
+        img = img && img.replace(/"/g, '\'');
+        var regex = /<img.*?src='(.*?)'/
+          , result = regex.exec(img);
         return (result && result[1]) ? result[1] : '';
       };
     }])