+
+
-
-
-
-
-
-
-
-
-
@@ -82,6 +79,8 @@
+
+
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index fc303ed78e..a54676c30b 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -54,6 +54,8 @@
centerText: true
});
+ html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
+
$('#items', page).html(html).trigger('create').createPosterItemMenus();
$('.btnNextPage', page).on('click', function () {
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js
index ef131e8af8..d762ec8302 100644
--- a/dashboard-ui/scripts/nowplayingpage.js
+++ b/dashboard-ui/scripts/nowplayingpage.js
@@ -17,7 +17,7 @@
html += streams.map(function (s) {
- var streamHtml = '
';
+ var streamHtml = '';
streamHtml += (s.Codec || '').toUpperCase();
@@ -25,7 +25,7 @@
streamHtml += ' ' + s.Profile;
}
- streamHtml += '
';
+ streamHtml += '
';
var extras = [];
@@ -45,7 +45,7 @@
streamHtml += extras.join(' - ');
- streamHtml += '
';
+ streamHtml += '';
return streamHtml;
@@ -67,11 +67,11 @@
var html = '
Select Subtitles';
- html += '
Off';
+ html += '
Off
';
html += streams.map(function (s) {
- var streamHtml = '
';
+ var streamHtml = '';
streamHtml += (s.Language || 'Unknown language');
@@ -85,11 +85,11 @@
streamHtml += ' (Forced)';
}
- streamHtml += '
';
+ streamHtml += '
';
streamHtml += (s.Codec || '').toUpperCase();
- streamHtml += '
';
+ streamHtml += '';
return streamHtml;
@@ -102,12 +102,15 @@
function bindEvents(page) {
- $('.radioTabButton', page).on('change', function () {
+ $('.tabButton', page).on('click', function () {
- var elem = $('.' + this.value, page);
+ var elem = $('.' + this.getAttribute('data-tab'), page);
elem.siblings('.tabContent').hide();
elem.show();
+
+ $('.tabButton', page).removeClass('ui-btn-active');
+ $(this).addClass('ui-btn-active');
});
$('.btnCommand,.btnToggleFullscreen', page).on('click', function () {
@@ -442,8 +445,7 @@
var page = this;
- $('.radioTabButton', page).checked(false).checkboxradio('refresh');
- $('.radioTabButton:first', page).checked(true).checkboxradio('refresh').trigger('change');
+ $('.tabButton:first', page).trigger('click');
$(function () {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 720c063c00..c601f495a8 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -849,6 +849,25 @@ var Dashboard = {
case 'GoToSearch':
Search.showSearchPanel($.mobile.activePage);
break;
+ case 'DisplayMessage':
+ {
+ var args = cmd.Arguments;
+
+ if (args.TimeoutMs && WebNotifications.supported()) {
+ var notification = {
+ title: args.Header,
+ body: args.Text,
+ timeout: args.TimeoutMs
+ };
+
+ WebNotifications.show(notification);
+ }
+ else {
+ Dashboard.showFooterNotification({ html: "
" + args.Header + ": " + args.Text, timeout: args.TimeoutMs });
+ }
+
+ break;
+ }
case 'VolumeUp':
case 'VolumeDown':
case 'Mute':
@@ -948,25 +967,6 @@ var Dashboard = {
Dashboard.processGeneralCommand(cmd);
}
- else if (msg.MessageType === "MessageCommand") {
-
- var cmd = msg.Data;
-
- if (cmd.TimeoutMs && WebNotifications.supported()) {
- var notification = {
- title: cmd.Header,
- body: cmd.Text,
- timeout: cmd.TimeoutMs
- };
-
- WebNotifications.show(notification);
- }
- else {
- Dashboard.showFooterNotification({ html: "
" + cmd.Header + ": " + cmd.Text, timeout: cmd.TimeoutMs });
- }
-
- }
-
},
onBrowseCommand: function (cmd) {
@@ -1308,7 +1308,8 @@ var Dashboard = {
"SetAudioStreamIndex",
"SetSubtitleStreamIndex",
"DisplayContent",
- "GoToSearch"
+ "GoToSearch",
+ "DisplayMessage"
];
}