milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update components

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-28 16:21:54 -04:00
parent a6c9cc632b
commit d6b60682be
10 changed files with 76 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dashboard-ui/scripts/librarybrowser.js
View file

@ -802,6 +802,13 @@
});
}
if (item.SeriesId) {
atts.push({
name: 'seriesid',
value: item.SeriesId
});
}
if (options.collectionId) {
atts.push({
name: 'collectionid',

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -352,7 +352,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
promise = ApiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay) {
if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
return null;
}

18
dashboard-ui/scripts/site.js
View file

@ -416,10 +416,16 @@ var Dashboard = {
restartServer: function () {
var apiClient = window.ApiClient;
if (!apiClient) {
return;
}
Dashboard.suppressAjaxErrors = true;
Dashboard.showLoadingMsg();
ApiClient.restartServer().then(function () {
apiClient.restartServer().then(function () {
setTimeout(function () {
Dashboard.reloadPageWhenServerAvailable();
@ -432,8 +438,14 @@ var Dashboard = {
reloadPageWhenServerAvailable: function (retryCount) {
var apiClient = window.ApiClient;
if (!apiClient) {
return;
}
// Don't use apiclient method because we don't want it reporting authentication under the old version
ApiClient.getJSON(ApiClient.getUrl("System/Info")).then(function (info) {
apiClient.getJSON(apiClient.getUrl("System/Info")).then(function (info) {
// If this is back to false, the restart completed
if (!info.HasPendingRestart) {
@ -468,7 +480,7 @@ var Dashboard = {
getPluginSecurityInfo: function () {
var apiClient = ApiClient;
var apiClient = window.ApiClient;
if (!apiClient) {