diff --git a/dashboard-ui/devices.html b/dashboard-ui/devices.html index 72c3ebbab5..f075ded563 100644 --- a/dashboard-ui/devices.html +++ b/dashboard-ui/devices.html @@ -12,7 +12,7 @@
${TabDevices} ${TabCameraUpload} - ${TabSync} +
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html index 5fbfc5aef4..2b1b1e7151 100644 --- a/dashboard-ui/devicesupload.html +++ b/dashboard-ui/devicesupload.html @@ -12,7 +12,7 @@
${TabDevices} ${TabCameraUpload} - ${TabSync} +
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js index 92855e4648..b768069b67 100644 --- a/dashboard-ui/scripts/edititemimages.js +++ b/dashboard-ui/scripts/edititemimages.js @@ -18,32 +18,10 @@ } function getBaseRemoteOptions() { + var options = {}; - if (currentItem.Type == "Year") { - options.year = currentItem.Name; - } - else if (currentItem.Type == "MusicArtist") { - options.artist = currentItem.Name; - } - else if (currentItem.Type == "Person") { - options.person = currentItem.Name; - } - else if (currentItem.Type == "Genre") { - options.genre = currentItem.Name; - } - else if (currentItem.Type == "GameGenre") { - options.gameGenre = currentItem.Name; - } - else if (currentItem.Type == "MusicGenre") { - options.musicGenre = currentItem.Name; - } - else if (currentItem.Type == "Studio") { - options.studio = currentItem.Name; - } - else { - options.itemId = currentItem.Id; - } + options.itemId = currentItem.Id; return options; } diff --git a/dashboard-ui/scripts/forgotpassword.js b/dashboard-ui/scripts/forgotpassword.js index dcd8a28c55..989867b7b1 100644 --- a/dashboard-ui/scripts/forgotpassword.js +++ b/dashboard-ui/scripts/forgotpassword.js @@ -30,8 +30,6 @@ msg += "
"; msg += result.PinFile; msg += "
"; - msg += "
"; - msg += Globalize.translate('MessageForgotPasswordFileExpiration', parseISO8601Date(result.PinExpirationDate, { toLocal: true }).toLocaleString()); Dashboard.alert({ diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index 36adab7af9..aeabebf709 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -4,7 +4,9 @@ var page = this; - ApiClient.getJSON(ApiClient.getUrl('System/Logs')).done(function (logs) { + var apiClient = ApiClient; + + apiClient.getJSON(apiClient.getUrl('System/Logs')).done(function (logs) { var html = ''; @@ -12,9 +14,12 @@ html += logs.map(function (log) { - var logUrl = ApiClient.getUrl('System/Logs/Log', { + var logUrl = apiClient.getUrl('System/Logs/Log', { name: log.Name }); + + logUrl += "&api_key=" + apiClient.accessToken(); + var logHtml = '
  • '; logHtml += '

    '; diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 33bc8b59d1..5c5519312b 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -345,9 +345,11 @@ var WizardLibraryPage = { Dashboard.showLoadingMsg(); - ApiClient.ajax({ + var apiClient = ApiClient; + + apiClient.ajax({ type: "POST", - url: ApiClient.getUrl('System/Configuration/MetadataPlugins/Autoset') + url: apiClient.getUrl('System/Configuration/MetadataPlugins/Autoset') }).done(function () { @@ -440,14 +442,16 @@ var WizardLibraryPage = { pollTasks(page); - if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000"); + var apiClient = ApiClient; + + if (apiClient.isWebSocketOpen()) { + apiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000"); } - $(ApiClient).on("websocketmessage", onWebSocketMessage).on('websocketopen', function () { + $(apiClient).on("websocketmessage", onWebSocketMessage).on('websocketopen', function () { - if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000"); + if (apiClient.isWebSocketOpen()) { + apiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000"); } }); @@ -455,11 +459,13 @@ var WizardLibraryPage = { var page = this; - if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop"); + var apiClient = ApiClient; + + if (apiClient.isWebSocketOpen()) { + apiClient.sendWebSocketMessage("ScheduledTasksInfoStop"); } - $(ApiClient).off("websocketmessage", onWebSocketMessage); + $(apiClient).off("websocketmessage", onWebSocketMessage); }); })(jQuery, document, window); diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 3deb5750ae..8148f5b554 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1120,7 +1120,7 @@ } // Live streams seem to function better with mp4 - var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm' || !mediaSource.RunTimeTicks; + var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm'; if (mp4BeforeWebm) { html += ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index bb421e2a4c..aeceb5c61a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -12,7 +12,6 @@ cache: false }); } - })(); // TODO: Deprecated in 1.9 @@ -21,6 +20,7 @@ $.support.cors = true; $(document).one('click', WebNotifications.requestPermission); var Dashboard = { + jQueryMobileInit: function () { // Page diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 071f286c82..9ee5d3599a 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -110,6 +110,7 @@ function isAvailable(item, user) { + return false; return item.SupportsSync; } diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js index 559f33946d..28834db4c3 100644 --- a/dashboard-ui/scripts/wizardfinishpage.js +++ b/dashboard-ui/scripts/wizardfinishpage.js @@ -2,14 +2,14 @@ onFinish: function () { - ApiClient.getServerConfiguration().done(function (config) { + ApiClient.ajax({ - config.IsStartupWizardCompleted = true; + url: ApiClient.getUrl('Startup/Complete'), + type: 'POST' - ApiClient.updateServerConfiguration(config).done(function () { + }).done(function () { - Dashboard.navigate('dashboard.html'); - }); + Dashboard.navigate('dashboard.html'); }); } }; \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js index 63723f799a..6a7dda6b3b 100644 --- a/dashboard-ui/scripts/wizardsettings.js +++ b/dashboard-ui/scripts/wizardsettings.js @@ -4,16 +4,23 @@ Dashboard.showLoadingMsg(); + var apiClient = ApiClient; + // After saving chapter task, now save server config - ApiClient.getServerConfiguration().done(function (config) { + apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).done(function (config) { config.PreferredMetadataLanguage = $('#selectLanguage', page).val(); config.MetadataCountryCode = $('#selectCountry', page).val(); config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked(); - config.EnableInternetProviders = $('#chkEnableInternetProviders', page).checked(); - ApiClient.updateServerConfiguration(config).done(function (result) { + apiClient.ajax({ + + type: 'POST', + data: config, + url: apiClient.getUrl('Startup/Configuration') + + }).done(function () { navigateToNextPage(); @@ -37,9 +44,11 @@ Dashboard.showLoadingMsg(); - var promise1 = ApiClient.getServerConfiguration(); - var promise2 = ApiClient.getCultures(); - var promise3 = ApiClient.getCountries(); + var apiClient = ApiClient; + + var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration')); + var promise2 = apiClient.getCultures(); + var promise3 = apiClient.getCountries(); $.when(promise1, promise2, promise3).done(function (response1, response2, response3) { @@ -50,7 +59,9 @@ function navigateToNextPage() { - ApiClient.getSystemInfo().done(function(info) { + var apiClient = ApiClient; + + apiClient.getJSON(apiClient.getUrl('Startup/Info')).done(function (info) { if (info.SupportsRunningAsService) { Dashboard.navigate('wizardservice.html'); diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js index 3e53f1cc45..4c358c76be 100644 --- a/dashboard-ui/scripts/wizardstartpage.js +++ b/dashboard-ui/scripts/wizardstartpage.js @@ -17,11 +17,17 @@ var apiClient = ApiClient; - apiClient.getServerConfiguration().done(function (config) { + apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).done(function (config) { config.UICulture = $('#selectLocalizationLanguage', page).val(); - apiClient.updateServerConfiguration(config).done(function (result) { + apiClient.ajax({ + + type: 'POST', + data: config, + url: apiClient.getUrl('Startup/Configuration') + + }).done(function () { Dashboard.navigate('wizarduser.html'); @@ -37,29 +43,13 @@ var apiClient = ApiClient; - apiClient.getPublicUsers().done(function (u) { + var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration')); - var user = u.filter(function (i) { - return i.Configuration.IsAdministrator; - })[0]; + var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options")); - apiClient.authenticateUserByName(user.Name, '').done(function (result) { + $.when(promise1, promise2).done(function (response1, response2) { - user = result.User; - - Dashboard.setCurrentUser(user.Id, result.AccessToken); - - var promise1 = apiClient.getServerConfiguration(); - - var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options")); - - $.when(promise1, promise2).done(function (response1, response2) { - - loadPage(page, response1[0], response2[0]); - - }); - - }); + loadPage(page, response1[0], response2[0]); }); }); diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js index 243cc34ce5..aa3c53e483 100644 --- a/dashboard-ui/scripts/wizarduserpage.js +++ b/dashboard-ui/scripts/wizarduserpage.js @@ -1,60 +1,51 @@ (function ($, document, window) { - function getUsers() { - return ApiClient.getUsers({IsGuest: false}); + function getApiClient() { + return ApiClient; } - function onSaveComplete(user) { - - var page = $.mobile.activePage; - var userId = user.Id; - - var metadataKey = "xbmcmetadata"; + function onUpdateUserComplete(result) { Dashboard.hideLoadingMsg(); - ApiClient.getNamedConfiguration(metadataKey).done(function (config) { + if (result.UserLinkResult) { - config.UserId = userId; + var msgKey = result.UserLinkResult.IsPending ? 'MessagePendingMediaBrowserAccountAdded' : 'MessageMediaBrowserAccountAdded'; - ApiClient.updateNamedConfiguration(metadataKey, config).done(function () { + Dashboard.alert({ + message: Globalize.translate(msgKey), + title: Globalize.translate('HeaderMediaBrowserAccountAdded'), + + callback: function () { + Dashboard.navigate('wizardlibrary.html'); + } }); - }); - - var callback = function() { + } else { Dashboard.navigate('wizardlibrary.html'); - }; - - ConnectHelper.updateUserInfo(user, $('#txtConnectUserName', page).val(), callback, callback); + } } function submit(form) { Dashboard.showLoadingMsg(); - getUsers().done(function (users) { + var apiClient = getApiClient(); - var user; + apiClient.ajax({ - if (users.length) { + type: 'POST', + data: { - user = users[0]; + Name: $('#txtUsername', form).val(), + ConnectUserName: $('#txtConnectUserName', form).val() - user.Name = $('#txtUsername', form).val(); + }, + url: apiClient.getUrl('Startup/User'), + dataType: 'json' - ApiClient.updateUser(user).done(function () { - - onSaveComplete(user); - }); - - } else { - - ApiClient.createUser($('#txtUsername', form).val()).done(onSaveComplete); - } - - }); + }).done(onUpdateUserComplete); } function wizardUserPage() { @@ -77,9 +68,9 @@ var page = this; - getUsers().done(function (users) { + var apiClient = getApiClient(); - var user = users[0]; + apiClient.getJSON(apiClient.getUrl('Startup/User')).done(function (user) { $('#txtUsername', page).val(user.Name); $('#txtConnectUserName', page).val(user.ConnectUserName);