fix script error on now playing page

dashboard-ui/scripts/htmlmediarenderer.js

@@ -125,7 +125,13 @@
 	            .on('error', onError)[0];
         }
 
-        function enableViblast() {
+        function enableViblast(src) {
+
+            if (src) {
+                if (src.indexOf('.m3u8') == -1) {
+                    return false;
+                }
+            }
 
             return MediaPlayer.canPlayHls() && !MediaPlayer.canPlayNativeHls();
         }
@@ -259,7 +265,7 @@
             }
             else {
 
-                if (enableViblast()) {
+                if (enableViblast(val)) {
 
                     viblast(elem).setup({
                         key: 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI=',

dashboard-ui/scripts/librarybrowser.js

@@ -86,6 +86,7 @@
             }
 
             if (NavHelper.isBack()) {
+                Logger.log('Not refreshing data because IsBack=true');
                 return false;
             }
 
@@ -104,6 +105,7 @@
             }
 
             if ((now - last) < cacheDuration) {
+                Logger.log('Not refreshing data due to age');
                 return false;
             }
 
@@ -160,6 +162,7 @@
         },
 
         enableFullPaperTabs: function () {
+            //return true;
             return AppInfo.isNativeApp;
         },
 
@@ -229,11 +232,20 @@
             var selected = tabs.selected;
 
             if (selected == null) {
-                selected = parseInt(getParameterByName('tab') || '0');
-                tabs.selected = selected;
-                page.querySelector('neon-animated-pages').selected = selected;
 
-            } else if (!LibraryBrowser.enableFullPaperTabs()) {
+                Logger.log('selected tab is null, checking query string');
+
+                selected = parseInt(getParameterByName('tab') || '0');
+
+                Logger.log('selected tab will be ' + selected);
+
+                tabs.selected = selected;
+
+                if (!LibraryBrowser.enableFullPaperTabs()) {
+                    page.querySelector('neon-animated-pages').selected = selected;
+                }
+
+            } else {
                 Events.trigger(page.querySelector('neon-animated-pages'), 'tabchange');
             }
         },

dashboard-ui/scripts/mediaplayer.js

@@ -937,7 +937,9 @@
 
             if (item.MediaType === "Video") {
 
-                self.playVideo(item, self.currentMediaSource, startPosition);
+                requirejs(['videorenderer'], function () {
+                    self.playVideo(item, self.currentMediaSource, startPosition);
+                });
 
             } else if (item.MediaType === "Audio") {
 

dashboard-ui/scripts/nowplayingpage.js

@@ -362,7 +362,7 @@
         player.beginPlayerUpdates();
 
         onStateChanged.call(player, e, state);
-        loadPlaylist($.mobile.activePage);
+        loadPlaylist($($.mobile.activePage)[0]);
     }
 
     function onPlaybackStopped(e, state) {
@@ -372,7 +372,7 @@
         player.endPlayerUpdates();
 
         onStateChanged.call(player, e, {});
-        loadPlaylist($.mobile.activePage);
+        loadPlaylist($($.mobile.activePage)[0]);
     }
 
     function onStateChanged(e, state) {

dashboard-ui/scripts/site.js

@@ -1971,8 +1971,7 @@ var AppInfo = {};
 
         if (Dashboard.isRunningInCordova() && $.browser.android) {
             define("audiorenderer", ["cordova/android/vlcplayer"]);
-            //define("audiorenderer", ["scripts/htmlmediarenderer"]);
-            define("videorenderer", ["scripts/htmlmediarenderer"]);
+            define("videorenderer", ["cordova/android/vlcplayer"]);
         }
         else {
             define("audiorenderer", ["scripts/htmlmediarenderer"]);