From 782e264478959b7a90a103047948db7502373a75 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 8 May 2015 12:58:27 -0400 Subject: [PATCH] add fast click back --- dashboard-ui/css/chromecast.css | 16 ++++++++++++++-- dashboard-ui/scripts/librarymenu.js | 25 +++++++++++++++---------- dashboard-ui/scripts/site.js | 15 +++++++++++---- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css index a548d66e08..4cfb5db89b 100644 --- a/dashboard-ui/css/chromecast.css +++ b/dashboard-ui/css/chromecast.css @@ -1,4 +1,4 @@ -.btnCastImage { +.btnCastImage:not(.btnCastIcon) { background-color: transparent; background-size: 100%; background-repeat: no-repeat; @@ -17,10 +17,18 @@ background-image: url(images/chromecast/ic_media_route_on_holo_dark.png); } +.btnActiveCast i { + color: #2ad !important; +} + .btnDisabledCast .btnCastImage { background-image: url(images/chromecast/ic_media_route_disabled_holo_dark.png); } +.btnDisabledCast i { + color: #555; +} + .btnCast { white-space: nowrap; } @@ -38,8 +46,12 @@ overflow: hidden; } +.btnCastIcon .headerSelectedPlayer { + top: 0; +} + @media all and (max-width: 1000px) { .headerSelectedPlayer { display: none; } -} \ No newline at end of file +} diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 1f04799f66..6dfe34fa08 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -31,21 +31,25 @@ html += '
'; - if (user.localUser) { + var btnCastVisible = user.localUser ? '' : 'visibility:hidden;'; - html += ''; - - html += ''; + if (!AppInfo.enableHeaderImages) { + html += ''; } else { - html += ''; + html += ''; + } + if (user.localUser) { + html += ''; } if (user.name) { html += ''; - if (user.imageUrl) { + if (user.imageUrl && AppInfo.enableUserImage) { var userButtonHeight = 26; @@ -100,7 +104,7 @@ } function updateViewMenuBarHeadroom(page, viewMenuBar) { - + if ($(page).hasClass('libraryPage')) { viewMenuBar.removeClass('headroomDisabled'); } else { @@ -277,12 +281,13 @@ 'mypreferencesdisplay.html?userId=' + user.localUser.Id : (user.localUser ? 'index.html' : '#'); - var paddingLeft = user.imageUrl ? 'padding-left:.7em;' : ''; + var hasUserImage = user.imageUrl && AppInfo.enableUserImage; + var paddingLeft = hasUserImage ? 'padding-left:.7em;' : ''; html += ''; var imgWidth = 44; - if (user.imageUrl) { + if (hasUserImage) { var url = user.imageUrl; if (user.supportsImageParams) { @@ -539,7 +544,7 @@ $('.libraryViewNav', page).addClass('bottomLibraryViewNav'); $(page).addClass('noSecondaryNavPage'); } else { - + $('.libraryViewNav', page).each(function () { initHeadRoom(this); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 9d53a13ac0..73a7e4b659 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -638,7 +638,7 @@ var Dashboard = { var imgWidth = 48; - if (user.imageUrl) { + if (user.imageUrl && AppInfo.enableUserImage) { var url = user.imageUrl; if (user.supportsImageParams) { @@ -1479,13 +1479,15 @@ var AppInfo = {}; AppInfo.isTouchPreferred = true; } + var isCordova = Dashboard.isRunningInCordova(); + if ($.browser.safari) { if ($.browser.mobile) { AppInfo.hasLowImageBandwidth = true; } - if (Dashboard.isRunningInCordova()) { + if (isCordova) { AppInfo.enableBottomTabs = true; AppInfo.resetOnLibraryChange = true; } @@ -1508,9 +1510,12 @@ var AppInfo = {}; AppInfo.enableMovieTrailersTab = true; } - if (!Dashboard.isRunningInCordova()) { + if (!isCordova) { AppInfo.enableFooterNotifications = true; } + + AppInfo.enableUserImage = !AppInfo.hasLowImageBandwidth || !isCordova; + AppInfo.enableHeaderImages = AppInfo.enableUserImage; } function initializeApiClient(apiClient) { @@ -1579,7 +1584,9 @@ var AppInfo = {}; function onReady() { - //FastClick.attach(document.body); + if ($.browser.safari) { + //FastClick.attach(document.body); + } if (AppInfo.hasLowImageBandwidth) { $(document.body).addClass('largeCardMargin');