Merge pull request #1132 from MediaBrowser/dev

3.0.5666.9
MediaBrowser · Jul 12, 2015 · f575ad4 · f575ad4
2 parents 809125e + 8d41caa
commit f575ad4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/edititemimages.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/edititemimages.js
@@ -508,7 +508,7 @@
             browsableImageStartIndex = 0;
             browsableImageType = type;
 
-            $('.lnkBrowseImages').trigger('click');
+            $('.lnkBrowseImages', $.mobile.activePage).trigger('click');
         };
     }
 

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/nowplayingbar.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/nowplayingbar.js
@@ -135,41 +135,44 @@
             });
         });
 
-        volumeSlider = $('.nowPlayingBarVolumeSlider', elem).on('change', function () {
+        // Unfortunately this is necessary because the polymer elements might not be ready immediately and there doesn't seem to be an event-driven way to find out when
+        setTimeout(function() {
+            volumeSlider = $('.nowPlayingBarVolumeSlider', elem).on('change', function () {
 
-            if (currentPlayer) {
-                currentPlayer.setVolume(this.value);
-            }
+                if (currentPlayer) {
+                    currentPlayer.setVolume(this.value);
+                }
 
-        })[0];
+            })[0];
 
-        positionSlider = $('.nowPlayingBarPositionSlider', elem).on('change', function () {
+            positionSlider = $('.nowPlayingBarPositionSlider', elem).on('change', function () {
 
-            if (currentPlayer && lastPlayerState) {
+                if (currentPlayer && lastPlayerState) {
 
-                var newPercent = parseFloat(this.value);
-                var newPositionTicks = (newPercent / 100) * lastPlayerState.NowPlayingItem.RunTimeTicks;
+                    var newPercent = parseFloat(this.value);
+                    var newPositionTicks = (newPercent / 100) * lastPlayerState.NowPlayingItem.RunTimeTicks;
 
-                currentPlayer.seek(Math.floor(newPositionTicks));
-            }
+                    currentPlayer.seek(Math.floor(newPositionTicks));
+                }
 
-        })[0];
+            })[0];
 
-        positionSlider._setPinValue = function (value) {
+            positionSlider._setPinValue = function (value) {
 
-            var state = lastPlayerState;
+                var state = lastPlayerState;
 
-            if (!state || !state.NowPlayingItem || !state.NowPlayingItem.RunTimeTicks) {
-                this.pinValue = '--:--';
-                return;
-            }
+                if (!state || !state.NowPlayingItem || !state.NowPlayingItem.RunTimeTicks) {
+                    this.pinValue = '--:--';
+                    return;
+                }
 
-            var ticks = state.NowPlayingItem.RunTimeTicks;
-            ticks /= 100;
-            ticks *= value;
+                var ticks = state.NowPlayingItem.RunTimeTicks;
+                ticks /= 100;
+                ticks *= value;
 
-            this.pinValue = Dashboard.getDisplayTime(ticks);
-        };
+                this.pinValue = Dashboard.getDisplayTime(ticks);
+            };
+        }, 300);
     }
 
     function getNowPlayingBar() {
@@ -187,9 +190,8 @@
             elem.classList.add('noMediaProgress');
         }
 
-        $.mobile.loadPage('nowplaying.html');
-
         bindEvents(elem);
+        $.mobile.loadPage('nowplaying.html');
 
         return elem;
     }
@@ -218,14 +220,11 @@
             var now = new Date().getTime();
             if ((now - lastUpdateTime) < 700) {
 
-                console.log('skipping UI update');
                 return;
             }
             lastUpdateTime = now;
         }
 
-        console.log(new Date().getTime());
-
         lastPlayerState = state;
 
         if (!muteButton) {
@@ -250,21 +249,25 @@
         updatePlayerVolumeState(state, playerInfo);
 
         var nowPlayingItem = state.NowPlayingItem || {};
-        if (!positionSlider.dragging) {
 
-            if (nowPlayingItem && nowPlayingItem.RunTimeTicks) {
+        // See bindEvents for why this is necessary
+        if (positionSlider) {
+            if (!positionSlider.dragging) {
 
-                var pct = playState.PositionTicks / nowPlayingItem.RunTimeTicks;
-                pct *= 100;
+                if (nowPlayingItem.RunTimeTicks) {
 
-                positionSlider.value = pct;
+                    var pct = playState.PositionTicks / nowPlayingItem.RunTimeTicks;
+                    pct *= 100;
 
-            } else {
+                    positionSlider.value = pct;
 
-                positionSlider.value = 0;
-            }
+                } else {
 
-            positionSlider.disabled = !playState.CanSeek;
+                    positionSlider.value = 0;
+                }
+
+                positionSlider.disabled = !playState.CanSeek;
+            }
         }
 
         var timeText = Dashboard.getDisplayTime(playState.PositionTicks);
@@ -333,10 +336,13 @@
             hideButton(unmuteButton);
         }
 
-        $(volumeSlider).visible(showVolumeSlider);
+        // See bindEvents for why this is necessary
+        if (volumeSlider) {
+            $(volumeSlider).visible(showVolumeSlider);
 
-        if (!volumeSlider.dragging) {
-            volumeSlider.value = playState.VolumeLevel || 0;
+            if (!volumeSlider.dragging) {
+                volumeSlider.value = playState.VolumeLevel || 0;
+            }
         }
     }
 

diff --git a/SharedVersion.cs b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5666.8")]
+[assembly: AssemblyVersion("3.0.5666.9")]