diff --git a/dashboard-ui/scripts/appsettings.js b/dashboard-ui/scripts/appsettings.js
index e132c3d234..4159b540d1 100644
--- a/dashboard-ui/scripts/appsettings.js
+++ b/dashboard-ui/scripts/appsettings.js
@@ -56,13 +56,13 @@
return appStorage.getItem('enableFullScreen') == 'true';
},
- syncPath: function (val) {
+ enableSyncToExternalStorage: function (val) {
if (val != null) {
- update('syncPath', val.toString());
+ update('enableSyncToExternalStorage', val.toString());
}
- return appStorage.getItem('syncPath');
+ return appStorage.getItem('enableSyncToExternalStorage') == 'true';
},
displayPreferencesKey: function() {
diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
index 99074b1e7d..847ea51842 100644
--- a/dashboard-ui/scripts/chromecast.js
+++ b/dashboard-ui/scripts/chromecast.js
@@ -628,6 +628,15 @@
self.setVolume(getCurrentVolume() + 2);
};
+ self.setRepeatMode = function (mode) {
+ castPlayer.sendMessage({
+ options: {
+ RepeatMode: mode
+ },
+ command: 'SetRepeatMode'
+ });
+ };
+
self.toggleMute = function () {
var state = self.lastPlayerData || {};
@@ -676,7 +685,8 @@
"SetVolume",
"SetAudioStreamIndex",
"SetSubtitleStreamIndex",
- "DisplayContent"]
+ "DisplayContent",
+ "SetRepeatMode"]
};
};
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 40e55ad497..1141b1bc6d 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -156,7 +156,7 @@
return true;
}
- $(ownerpage).on('swipeleft', function (e) {
+ $(pages).on('swipeleft', function (e) {
if (allowSwipe(e)) {
var selected = parseInt(pages.selected || '0');
@@ -168,7 +168,7 @@
}
});
- $(ownerpage).on('swiperight', function (e) {
+ $(pages).on('swiperight', function (e) {
if (allowSwipe(e)) {
var selected = parseInt(pages.selected || '0');
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 34634d4cd0..47e3ef4d75 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -573,6 +573,10 @@
currentPlayer.volumeUp();
};
+ self.setRepeatMode = function (mode) {
+ currentPlayer.setRepeatMode(mode);
+ };
+
self.playlist = function () {
return currentPlayer.playlist || [];
};
@@ -586,6 +590,9 @@
Logger.log('MediaController received command: ' + cmd.Name);
switch (cmd.Name) {
+ case 'SetRepeatMode':
+ player.setRepeatMode(cmd.Arguments.RepeatMode);
+ break;
case 'VolumeUp':
player.volumeUp();
break;
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index c2ca114edd..749369b41e 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1127,7 +1127,24 @@
self.nextTrack = function () {
- var newIndex = currentPlaylistIndex + 1;
+ var newIndex;
+
+ switch (self.getRepeatMode()) {
+
+ case 'RepeatOne':
+ newIndex = currentPlaylistIndex;
+ break;
+ case 'RepeatAll':
+ newIndex = currentPlaylistIndex + 1;
+ if (newIndex >= self.playlist.length) {
+ newIndex = 0;
+ }
+ break;
+ default:
+ newIndex = currentPlaylistIndex + 1;
+ break;
+ }
+
var newItem = self.playlist[newIndex];
if (newItem) {
@@ -1498,6 +1515,7 @@
state.PlayState.IsMuted = mediaRenderer.volume() == 0;
state.PlayState.IsPaused = mediaRenderer.paused();
state.PlayState.PositionTicks = self.getCurrentTicks(mediaRenderer);
+ state.PlayState.RepeatMode = self.getRepeatMode();
var currentSrc = mediaRenderer.currentSrc();
@@ -1751,6 +1769,15 @@
return true;
};
+ var repeatMode = 'RepeatNone';
+ self.getRepeatMode = function () {
+ return repeatMode;
+ };
+
+ self.setRepeatMode = function (mode) {
+ repeatMode = mode;
+ };
+
function onTimeUpdate() {
var currentTicks = self.getCurrentTicks(this);
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 1b0058d35d..1208c69742 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -39,10 +39,11 @@
showLatestItemsPopup: false,
shape: getSquareShape(),
showTitle: true,
+ defaultAction: 'play',
showParentTitle: true,
lazy: true,
centerText: true,
- overlayPlayButton: true
+ overlayMoreButton: true
});
ImageLoader.lazyChildren(elem);
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index ee02385408..4f3740bd55 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -16,7 +16,7 @@
$('#chkEnableFullScreen', page).checked(AppSettings.enableFullScreen()).checkboxradio("refresh");
- $('#txtSyncPath', page).val(AppSettings.syncPath());
+ $('#chkSyncToExternalCard', page).checked(AppSettings.enableSyncToExternalStorage()).checkboxradio("refresh");
Dashboard.hideLoadingMsg();
}
@@ -34,7 +34,7 @@
appStorage.setItem('enableThemeSongs-' + user.Id, $('#selectThemeSong', page).val());
appStorage.setItem('enableBackdrops-' + user.Id, $('#selectBackdrop', page).val());
- AppSettings.syncPath($('#txtSyncPath', page).val());
+ AppSettings.enableSyncToExternalStorage($('#chkSyncToExternalCard', page).checked());
ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () {
Dashboard.alert(Globalize.translate('SettingsSaved'));
diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js
index 70eb923a64..a5cce1d79d 100644
--- a/dashboard-ui/scripts/nowplayingbar.js
+++ b/dashboard-ui/scripts/nowplayingbar.js
@@ -12,6 +12,7 @@
var unpauseButton;
var pauseButton;
var positionSlider;
+ var toggleRepeatButton;
var lastPlayerState;
@@ -53,6 +54,8 @@
html += '
';
+ html += '
';
+
html += '
';
html += '
';
@@ -135,8 +138,26 @@
});
});
+ toggleRepeatButton = $('.toggleRepeatButton', elem).on('click', function () {
+
+ if (currentPlayer && lastPlayerState) {
+ var state = lastPlayerState;
+ switch ((state.PlayState || {}).RepeatMode) {
+ case 'RepeatNone':
+ currentPlayer.setRepeatMode('RepeatAll');
+ break;
+ case 'RepeatAll':
+ currentPlayer.setRepeatMode('RepeatOne');
+ break;
+ case 'RepeatOne':
+ currentPlayer.setRepeatMode('RepeatNone');
+ break;
+ }
+ }
+ })[0];
+
// 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() {
+ setTimeout(function () {
volumeSlider = $('.nowPlayingBarVolumeSlider', elem).on('change', function () {
if (currentPlayer) {
@@ -314,6 +335,24 @@
showUnmuteButton = false;
}
+ if (supportedCommands.indexOf('SetRepeatMode') == -1) {
+ toggleRepeatButton.classList.add('hide');
+ } else {
+ toggleRepeatButton.classList.remove('hide');
+ }
+
+ if (playState.RepeatMode == 'RepeatAll') {
+ toggleRepeatButton.icon = "repeat";
+ toggleRepeatButton.classList.add('repeatActive');
+ }
+ else if (playState.RepeatMode == 'RepeatOne') {
+ toggleRepeatButton.icon = "repeat-one";
+ toggleRepeatButton.classList.add('repeatActive');
+ } else {
+ toggleRepeatButton.icon = "repeat";
+ toggleRepeatButton.classList.remove('repeatActive');
+ }
+
if (supportedCommands.indexOf('SetVolume') == -1) {
showVolumeSlider = false;
}
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js
index 6573827ff0..d0673b7321 100644
--- a/dashboard-ui/scripts/nowplayingpage.js
+++ b/dashboard-ui/scripts/nowplayingpage.js
@@ -208,6 +208,24 @@
});
}
+ function toggleRepeat(player) {
+
+ if (player && lastPlayerState) {
+ var state = lastPlayerState;
+ switch ((state.PlayState || {}).RepeatMode) {
+ case 'RepeatNone':
+ player.setRepeatMode('RepeatAll');
+ break;
+ case 'RepeatAll':
+ player.setRepeatMode('RepeatOne');
+ break;
+ case 'RepeatOne':
+ player.setRepeatMode('RepeatNone');
+ break;
+ }
+ }
+ }
+
function bindEvents(page) {
$('.tabButton', page).on('click', function () {
@@ -240,10 +258,15 @@
$('.btnCommand,.btnToggleFullscreen', page).on('click', function () {
if (currentPlayer) {
- MediaController.sendCommand({
- Name: this.getAttribute('data-command')
- }, currentPlayer);
+ if (this.classList.contains('repeatToggleButton')) {
+ toggleRepeat(currentPlayer);
+ } else {
+ MediaController.sendCommand({
+ Name: this.getAttribute('data-command')
+
+ }, currentPlayer);
+ }
}
});
@@ -490,11 +513,13 @@
if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons) {
$('.volumeButton', page).css('visibility', 'hidden');
+ $('.nowPlayingPageVolumeControl', page).hide();
} else {
$('.volumeButton', page).css('visibility', 'visible');
+ $('.nowPlayingPageVolumeControl', page).show();
}
- if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons && item && item.MediaType == 'Audio') {
+ if (item && item.MediaType == 'Audio') {
$('.buttonsRow2', page).hide();
$('.buttonsRow3', page).hide();
} else {
@@ -502,6 +527,20 @@
$('.buttonsRow3', page).show();
}
+ var toggleRepeatButton = page.querySelector('.repeatToggleButton');
+
+ if (playState.RepeatMode == 'RepeatAll') {
+ toggleRepeatButton.icon = "repeat";
+ toggleRepeatButton.classList.add('nowPlayingPageRepeatActive');
+ }
+ else if (playState.RepeatMode == 'RepeatOne') {
+ toggleRepeatButton.icon = "repeat-one";
+ toggleRepeatButton.classList.add('nowPlayingPageRepeatActive');
+ } else {
+ toggleRepeatButton.icon = "repeat";
+ toggleRepeatButton.classList.remove('nowPlayingPageRepeatActive');
+ }
+
updateNowPlayingInfo(page, state);
}
diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js
index 7027a0dfe5..a198c7a79d 100644
--- a/dashboard-ui/scripts/remotecontrol.js
+++ b/dashboard-ui/scripts/remotecontrol.js
@@ -125,9 +125,7 @@
self.setVolume = function (vol) {
sendCommandByName('SetVolume', {
-
Volume: vol
-
});
};
@@ -155,6 +153,13 @@
});
};
+ self.setRepeatMode = function (mode) {
+
+ sendCommandByName('SetRepeatMode', {
+ RepeatMode: mode
+ });
+ };
+
self.displayContent = function (options) {
sendCommandByName('DisplayContent', options);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 68754c0b15..823305902e 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1065,6 +1065,7 @@ var Dashboard = {
case 'SetAudioStreamIndex':
case 'SetSubtitleStreamIndex':
case 'ToggleFullscreen':
+ case 'SetRepeatMode':
break;
default:
Logger.log('Unrecognized command: ' + cmd.Name);
@@ -1430,7 +1431,8 @@ var Dashboard = {
"SetSubtitleStreamIndex",
"DisplayContent",
"GoToSearch",
- "DisplayMessage"
+ "DisplayMessage",
+ "SetRepeatMode"
];
},
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 735daac847..308b161cd0 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -166,7 +166,8 @@
context: 'tv',
showDetailsMenu: true,
overlayPlayButton: true,
- preferThumb: true
+ preferThumb: true,
+ centerText: true
});
}
diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html
index d7746988e7..ca406bbcb8 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/thirdparty/emby-icons.html
@@ -123,6 +123,8 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
+
+
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 21d5a859e7..4bba1732bd 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -6854,7 +6854,6 @@ this.fire('dom-change');
-