diff --git a/dashboard-ui/css/images/clients/androidtv-tile.png b/dashboard-ui/css/images/clients/androidtv-tile.png new file mode 100644 index 0000000000..b3dcc770c1 Binary files /dev/null and b/dashboard-ui/css/images/clients/androidtv-tile.png differ diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 5be43bc28c..fb569980fd 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -76,8 +76,7 @@ var keys = new bindKeys(self); - $(window).on("keydown", keys.keyBinding); - $(window).on("keypress keyup", keys.keyPrevent); + $(window).on("keydown", keys.keyBinding).on("keypress keyup", keys.keyPrevent); self.registerPlayer = function (player) { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index be0df11232..3764b59509 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -68,7 +68,6 @@ var Dashboard = { } return; } - Dashboard.hideLoadingMsg(); if (!Dashboard.suppressAjaxErrors) { diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js index 4a20c4cacb..75c83031fe 100644 --- a/dashboard-ui/scripts/supporterkeypage.js +++ b/dashboard-ui/scripts/supporterkeypage.js @@ -121,3 +121,47 @@ }; $(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow); + +(function () { + + function loadConnectSupporters(page) { + + $('.linkSupporterKeyMessage', page).html(Globalize.translate('MessageLinkYourSupporterKey', 5)); + + Dashboard.suppressAjaxErrors = true; + + ApiClient.ajax({ + type: "GET", + url: ApiClient.getUrl('Connect/Supporters'), + dataType: "json", + + error: function () { + // Don't show normal dashboard errors + }, + + enableGlobalAjaxListener: false + + }).done(function () { + + + + + }).fail(function () { + + $('.supporters', page).html('
' + Globalize.translate('MessageErrorLoadingSupporterInfo') + '
'); + + }).always(function () { + + Dashboard.suppressAjaxErrors = false; + + }); + + } + + $(document).on('pageshow', "#supporterKeyPage", function () { + + var page = this; + loadConnectSupporters(page); + }); + +})(); \ No newline at end of file diff --git a/dashboard-ui/scripts/syncservices.js b/dashboard-ui/scripts/syncservices.js index 2458ad52fd..9d67478c19 100644 --- a/dashboard-ui/scripts/syncservices.js +++ b/dashboard-ui/scripts/syncservices.js @@ -51,6 +51,16 @@ var page = this; reloadList(page); + + Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) { + + if (pluginSecurityInfo.IsMBSupporter) { + $('.syncPromotion', page).hide(); + } else { + $('.syncPromotion', page).show(); + } + }); + }); })(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html index a0a878dbc4..2e4fe30fca 100644 --- a/dashboard-ui/supporterkey.html +++ b/dashboard-ui/supporterkey.html @@ -86,6 +86,19 @@ + +