';
@@ -72,6 +73,7 @@ export default class TableOfContent {
tocHtml += `
${chapter.label}`;
tocHtml += '';
});
+
tocHtml += '';
elem.innerHTML = tocHtml;
@@ -84,7 +86,6 @@ export default class TableOfContent {
this._elem = elem;
this.bindEvents();
-
dialogHelper.open(elem);
}
}
diff --git a/src/plugins/photoPlayer/plugin.js b/src/plugins/photoPlayer/plugin.js
index d8d4ee70ef..d8e55fa67e 100644
--- a/src/plugins/photoPlayer/plugin.js
+++ b/src/plugins/photoPlayer/plugin.js
@@ -9,17 +9,12 @@ export default class PhotoPlayer {
}
play(options) {
-
return new Promise(function (resolve, reject) {
-
import('slideshow').then(({default: slideshow}) => {
-
var index = options.startIndex || 0;
var apiClient = connectionManager.currentApiClient();
-
apiClient.getCurrentUser().then(function(result) {
-
var newSlideShow = new slideshow({
showTitle: false,
cover: false,
@@ -31,7 +26,6 @@ export default class PhotoPlayer {
});
newSlideShow.show();
-
resolve();
});
});
@@ -39,7 +33,6 @@ export default class PhotoPlayer {
}
canPlayMediaType(mediaType) {
-
return (mediaType || '').toLowerCase() === 'photo';
}
}
diff --git a/src/scripts/site.js b/src/scripts/site.js
index e60efc757d..65ecfd1b09 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -228,6 +228,28 @@ var Dashboard = {
} else {
Dashboard.navigate('selectserver.html');
}
+ },
+ hideLoadingMsg: function() {
+ 'use strict';
+ require(['loading'], function(loading) {
+ loading.hide();
+ });
+ },
+ showLoadingMsg: function() {
+ 'use strict';
+ require(['loading'], function(loading) {
+ loading.show();
+ });
+ },
+ confirm: function(message, title, callback) {
+ 'use strict';
+ require(['confirm'], function(confirm) {
+ confirm(message, title).then(function() {
+ callback(!0);
+ }).catch(function() {
+ callback(!1);
+ });
+ });
}
};
@@ -653,7 +675,7 @@ var AppInfo = {};
playQueueManager: componentsPath + '/playback/playqueuemanager',
nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
pluginManager: componentsPath + '/pluginManager',
- packageManager: componentsPath + '/packagemanager',
+ packageManager: componentsPath + '/packageManager',
screensaverManager: componentsPath + '/screensavermanager',
chromecastHelper: 'plugins/chromecastPlayer/chromecastHelpers'
};
@@ -737,7 +759,6 @@ var AppInfo = {};
// define legacy features
// TODO delete the rest of these
define('fnchecked', ['legacy/fnchecked'], returnFirstDependency);
- define('legacyDashboard', ['legacy/dashboard'], returnFirstDependency);
define('legacySelectMenu', ['legacy/selectmenu'], returnFirstDependency);
// there are several objects that need to be instantiated
@@ -820,10 +841,10 @@ var AppInfo = {};
define('playbackSettings', [componentsPath + '/playbackSettings/playbackSettings'], returnFirstDependency);
define('homescreenSettings', [componentsPath + '/homeScreenSettings/homeScreenSettings'], returnFirstDependency);
define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
- define('timeSyncManager', [componentsPath + '/syncplay/timeSyncManager'], returnDefault);
- define('groupSelectionMenu', [componentsPath + '/syncplay/groupSelectionMenu'], returnFirstDependency);
- define('syncPlayManager', [componentsPath + '/syncplay/syncPlayManager'], returnDefault);
- define('playbackPermissionManager', [componentsPath + '/syncplay/playbackPermissionManager'], returnDefault);
+ define('timeSyncManager', [componentsPath + '/syncPlay/timeSyncManager'], returnDefault);
+ define('groupSelectionMenu', [componentsPath + '/syncPlay/groupSelectionMenu'], returnFirstDependency);
+ define('syncPlayManager', [componentsPath + '/syncPlay/syncPlayManager'], returnDefault);
+ define('playbackPermissionManager', [componentsPath + '/syncPlay/playbackPermissionManager'], returnDefault);
define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);
define('playMenu', [componentsPath + '/playmenu'], returnFirstDependency);
@@ -847,7 +868,7 @@ var AppInfo = {};
define('userdataButtons', [componentsPath + '/userdatabuttons/userdatabuttons'], returnFirstDependency);
define('listView', [componentsPath + '/listview/listview'], returnFirstDependency);
define('indicators', [componentsPath + '/indicators/indicators'], returnFirstDependency);
- define('viewSettings', [componentsPath + '/viewsettings/viewsettings'], returnFirstDependency);
+ define('viewSettings', [componentsPath + '/viewSettings/viewSettings'], returnFirstDependency);
define('filterMenu', [componentsPath + '/filtermenu/filtermenu'], returnFirstDependency);
define('sortMenu', [componentsPath + '/sortmenu/sortmenu'], returnFirstDependency);
define('sanitizefilename', [componentsPath + '/sanitizeFilename'], returnFirstDependency);
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index f75d7003b3..b8e081a588 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1024,10 +1024,11 @@
"MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item or the global default value.",
"MessageNoAvailablePlugins": "No available plugins.",
"MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, and Albums. Click the + button to start creating collections.",
+ "MessageNoGenresAvailable": "Enable some metadata providers to pull genres from the internet.",
"MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
"MessageNoPluginsInstalled": "You have no plugins installed.",
"MessageNoServersAvailable": "No servers have been found using the automatic server discovery.",
- "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
+ "MessageNoTrailersFound": "Install the trailers channel to enhance your movie experience by adding a library of internet trailers.",
"MessageNothingHere": "Nothing here.",
"MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the pin codes that were used to perform the reset.",
"MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your server administrator for more information.",