${TabSuggestions}
${TabGuide}
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index 7b22ef26d8..f4976c6cb1 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -74,7 +74,7 @@
$('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
}
- $(document).on('pageinit', "#liveTvChannelsPage", function () {
+ $(document).on('pageinitdepends', "#liveTvChannelsPage", function () {
var page = this;
@@ -109,7 +109,7 @@
reloadItems(page);
});
- }).on('pageshow', "#liveTvChannelsPage", function () {
+ }).on('pageshown', "#liveTvChannelsPage", function () {
// Can't use pagebeforeshow here or the loading popup won't center correctly
var page = this;
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index b9568808ea..dc336c1fa6 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -102,7 +102,7 @@
});
}
- $(document).on('pagebeforeshow', "#liveTvRecordingsPage", function () {
+ $(document).on('pageshown', "#liveTvRecordingsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index db7df3ae32..326e3d8dd1 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -116,7 +116,7 @@
}).checkboxradio('refresh');
}
- $(document).on('pagebeforeshow', "#liveTvSeriesTimersPage", function () {
+ $(document).on('pageshown', "#liveTvSeriesTimersPage", function () {
var page = this;
@@ -138,8 +138,6 @@
reload(page);
});
- }).on('pageshow', "#liveTvSeriesTimersPage", function () {
-
updateFilterControls(this);
});
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index b87300a9ae..d0c45707ba 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -1,7 +1,7 @@
(function ($, document) {
- function reload(page) {
-
+ function loadRecommendedPrograms(page) {
+
Dashboard.showLoadingMsg();
ApiClient.getLiveTvRecommendedPrograms({
@@ -25,7 +25,13 @@
});
$('.activeProgramItems', page).html(html).lazyChildren();
+ Dashboard.hideLoadingMsg();
});
+ }
+
+ function reload(page) {
+
+ loadRecommendedPrograms(page);
ApiClient.getLiveTvRecommendedPrograms({
@@ -98,7 +104,7 @@
});
}
- $(document).on('pagebeforeshow', "#liveTvSuggestedPage", function () {
+ $(document).on('pageshown', "#liveTvSuggestedPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index 83b6027018..52b51cebfc 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -107,7 +107,7 @@
});
}
- $(document).on('pagebeforeshow', "#liveTvTimersPage", function () {
+ $(document).on('pageshown', "#liveTvTimersPage", function () {
var page = this;