diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html index 3818e38962..3c6443cbdd 100644 --- a/dashboard-ui/mypreferencesdisplay.html +++ b/dashboard-ui/mypreferencesdisplay.html @@ -114,12 +114,6 @@ - -
- -

*${LegendTheseSettingsShared}

diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html index 735a111c16..88b4d8c3fc 100644 --- a/dashboard-ui/mypreferenceshome.html +++ b/dashboard-ui/mypreferenceshome.html @@ -138,12 +138,6 @@ - -
- -

*${LegendTheseSettingsShared}

diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html index 2459d83c9d..44d7bb3d50 100644 --- a/dashboard-ui/mypreferenceslanguages.html +++ b/dashboard-ui/mypreferenceslanguages.html @@ -118,12 +118,6 @@ - -
- -

*${LegendTheseSettingsShared}

diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index 94b6f73a96..5571cbe61f 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -54,7 +54,7 @@ var applicationID = "2D4B1DA3"; // This is the beta version used for testing new changes - //applicationID = '27C4EB5B'; + applicationID = '27C4EB5B'; var messageNamespace = 'urn:x-cast:com.connectsdk'; diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index e000846714..e36f479771 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -25,18 +25,10 @@ appStorage.setItem('enableThemeSongs-' + user.Id, $('#selectThemeSong', page).val()); appStorage.setItem('enableBackdrops-' + user.Id, $('#selectBackdrop', page).val()); - ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () { - Dashboard.alert(Globalize.translate('SettingsSaved')); - - loadForm(page, user); - }); + ApiClient.updateUserConfiguration(user.Id, user.Configuration); } - function onSubmit() { - - var page = $(this).parents('.page')[0]; - - Dashboard.showLoadingMsg(); + function save(page) { var userId = getParameterByName('userId') || Dashboard.getCurrentUserId(); @@ -45,18 +37,26 @@ saveUser(page, user); }); + } + + function onSubmit() { + + var page = $(this).parents('.page')[0]; + + save(page); // Disable default form submission return false; } - $(document).on('pageinit', "#displayPreferencesPage", function () { + pageIdOn('pageinit', "displayPreferencesPage", function () { var page = this; $('.displayPreferencesForm').off('submit', onSubmit).on('submit', onSubmit); - }).on('pageshow', "#displayPreferencesPage", function () { + }); + pageIdOn('pageshow', "displayPreferencesPage", function () { var page = this; @@ -82,6 +82,14 @@ } else { $('.languageSection', page).hide(); } + + }); + pageIdOn('pagebeforehide', "displayPreferencesPage", function () { + + var page = this; + + save(page); + }); })(jQuery, window, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js index e0e7eed34f..a54d610de1 100644 --- a/dashboard-ui/scripts/mypreferenceshome.js +++ b/dashboard-ui/scripts/mypreferenceshome.js @@ -199,19 +199,11 @@ ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, AppSettings.displayPreferencesKey()).then(function () { - ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () { - Dashboard.alert(Globalize.translate('SettingsSaved')); - - loadForm(page, user, displayPreferences); - }); + ApiClient.updateUserConfiguration(user.Id, user.Configuration); }); } - function onSubmit() { - - var page = $(this).parents('.page')[0]; - - Dashboard.showLoadingMsg(); + function save(page) { var userId = getParameterByName('userId') || Dashboard.getCurrentUserId(); @@ -222,14 +214,20 @@ saveUser(page, user, displayPreferences); }); - }); + } + + function onSubmit() { + + var page = $(this).parents('.page')[0]; + + save(page); // Disable default form submission return false; } - $(document).on('pageinit', "#homeScreenPreferencesPage", function () { + pageIdOn('pageinit', "homeScreenPreferencesPage", function () { var page = this; @@ -272,7 +270,9 @@ $('.homeScreenPreferencesForm').off('submit', onSubmit).on('submit', onSubmit); - }).on('pageshow', "#homeScreenPreferencesPage", function () { + }); + + pageIdOn('pageshow', "homeScreenPreferencesPage", function () { var page = this; @@ -290,4 +290,11 @@ }); }); + pageIdOn('pagebeforehide', "homeScreenPreferencesPage", function () { + + var page = this; + + save(page); + }); + })(jQuery, window, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js index aad219ad4f..dc957259aa 100644 --- a/dashboard-ui/scripts/mypreferenceslanguages.js +++ b/dashboard-ui/scripts/mypreferenceslanguages.js @@ -96,22 +96,10 @@ AppSettings.enableCinemaMode(page.querySelector('.chkEnableCinemaMode').checked); - ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () { - - Dashboard.hideLoadingMsg(); - Dashboard.alert(Globalize.translate('SettingsSaved')); - - }, function () { - Dashboard.hideLoadingMsg(); - }); + ApiClient.updateUserConfiguration(user.Id, user.Configuration); } - function onSubmit() { - - var page = $(this).parents('.page')[0]; - - Dashboard.showLoadingMsg(); - + function save(page) { AppSettings.enableExternalPlayers(page.querySelector('.chkExternalVideoPlayer').checked); if ($('#selectMaxBitrate', page).val()) { @@ -131,12 +119,19 @@ saveUser(page, result); }); + } + + function onSubmit() { + + var page = $(this).parents('.page')[0]; + + save(page); // Disable default form submission return false; } - $(document).on('pageinit', "#languagePreferencesPage", function () { + pageIdOn('pageinit', "languagePreferencesPage", function () { var page = this; @@ -147,9 +142,9 @@ }); $('.languagePreferencesForm').off('submit', onSubmit).on('submit', onSubmit); + }); - - }).on('pageshow', "#languagePreferencesPage", function () { + pageIdOn('pageshow', "languagePreferencesPage", function () { var page = this; @@ -170,4 +165,11 @@ loadPage(page); }); + pageIdOn('pagebeforehide', "languagePreferencesPage", function () { + + var page = this; + + save(page); + }); + })(jQuery, window, document); \ No newline at end of file