diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index a31669e0fd..6e09abc416 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -4,7 +4,7 @@ ${TitleLiveTV} -
+
@@ -70,10 +70,6 @@
- -
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js index dd5d1b5a23..d0c5eacc90 100644 --- a/dashboard-ui/scripts/livetvsettings.js +++ b/dashboard-ui/scripts/livetvsettings.js @@ -19,7 +19,29 @@ Dashboard.hideLoadingMsg(); } - $(document).on('pageshow', "#liveTvSettingsPage", function () { + function onSubmit() { + + Dashboard.showLoadingMsg(); + + var form = this; + + ApiClient.getNamedConfiguration("livetv").done(function (config) { + + config.GuideDays = $('#selectGuideDays', form).val() || null; + config.EnableMovieProviders = $('#chkMovies', form).checked(); + + ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + } + + $(document).on('pageinitdepends', "#liveTvSettingsPage", function () { + + $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshowready', "#liveTvSettingsPage", function () { Dashboard.showLoadingMsg(); @@ -37,25 +59,4 @@ }); - window.LiveTvSettingsPage = { - - onSubmit: function () { - - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getNamedConfiguration("livetv").done(function (config) { - - config.GuideDays = $('#selectGuideDays', form).val() || null; - config.EnableMovieProviders = $('#chkMovies', form).checked(); - - ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - }; - })(jQuery, document, window); diff --git a/dashboard-ui/scripts/wizardagreement.js b/dashboard-ui/scripts/wizardagreement.js index 0919b6c2cb..ade27ad6c5 100644 --- a/dashboard-ui/scripts/wizardagreement.js +++ b/dashboard-ui/scripts/wizardagreement.js @@ -1,6 +1,8 @@ (function (window, $) { - function onSubmit(page) { + function onSubmit() { + + var page = $(this).parents('.page'); if ($('#chkAccept', page).checked()) { Dashboard.navigate('wizardfinish.html'); @@ -11,18 +13,13 @@ title: '' }); } + + return false; } - window.WizardAgreementPage = { + $(document).on('pageinitdepends', '#wizardAgreementPage', function(){ - onSubmit: function () { - - var page = $(this).parents('.page'); - - onSubmit(page); - - return false; - } - }; + $('.wizardAgreementForm').off('submit', onSubmit).on('submit', onSubmit); + }); })(window, jQuery); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js index 28834db4c3..7f641de41d 100644 --- a/dashboard-ui/scripts/wizardfinishpage.js +++ b/dashboard-ui/scripts/wizardfinishpage.js @@ -1,8 +1,8 @@ -var WizardFinishPage = { +(function(){ - onFinish: function () { + function onFinish() { - ApiClient.ajax({ + ApiClient.ajax({ url: ApiClient.getUrl('Startup/Complete'), type: 'POST' @@ -11,5 +11,11 @@ Dashboard.navigate('dashboard.html'); }); - } -}; \ No newline at end of file + } + + $(document).on('pageinitdepends', '#wizardFinishPage', function(){ + + $('.btnWizardNext', this).on('click', onFinish); + }); + +})(); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardservice.js b/dashboard-ui/scripts/wizardservice.js index dc8922c6c8..2f68245ce7 100644 --- a/dashboard-ui/scripts/wizardservice.js +++ b/dashboard-ui/scripts/wizardservice.js @@ -1,6 +1,6 @@ (function ($, document) { - $(document).on('pageinit', "#wizardServicePage", function () { + $(document).on('pageinitdepends', "#wizardServicePage", function () { var page = this; diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html index 2ac400e2b9..28c35eff79 100644 --- a/dashboard-ui/wizardagreement.html +++ b/dashboard-ui/wizardagreement.html @@ -4,7 +4,7 @@ Emby -
+
@@ -36,10 +36,6 @@
- -
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html index bfe31a3a2c..a46c931714 100644 --- a/dashboard-ui/wizardfinish.html +++ b/dashboard-ui/wizardfinish.html @@ -4,7 +4,7 @@ Emby -
+
@@ -39,7 +39,7 @@
- +
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html index 47f33a2bb3..047a0f655a 100644 --- a/dashboard-ui/wizardservice.html +++ b/dashboard-ui/wizardservice.html @@ -4,7 +4,7 @@ Emby -
+