diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js index dca4fcee7..f5afddf75 100644 --- a/dashboard-ui/apiclient/connectionmanager.js +++ b/dashboard-ui/apiclient/connectionmanager.js @@ -737,7 +737,7 @@ var deferred = DeferredBuilder.Deferred(); require(['serverdiscovery'], function () { - ServerDiscovery.findServers(1500).done(function (foundServers) { + ServerDiscovery.findServers(1000).done(function (foundServers) { var servers = foundServers.map(function (foundServer) { diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index dbdd848f9..e4eac8273 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -42,7 +42,7 @@ "tag": "v1.0.4", "commit": "a7ac7fbdb79b4d82416ec9b41613575386d0d226" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/cordova/ios/backgroundfetch.js b/dashboard-ui/cordova/ios/backgroundfetch.js index ae5f73d32..9f171343f 100644 --- a/dashboard-ui/cordova/ios/backgroundfetch.js +++ b/dashboard-ui/cordova/ios/backgroundfetch.js @@ -7,7 +7,7 @@ var fetcher = window.BackgroundFetch; fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, { - stopOnTerminate: true // <-- false is default + stopOnTerminate: false // <-- false is default }); } diff --git a/dashboard-ui/cordova/ios/tabbar.js b/dashboard-ui/cordova/ios/tabbar.js index f88bf96cf..f161f912a 100644 --- a/dashboard-ui/cordova/ios/tabbar.js +++ b/dashboard-ui/cordova/ios/tabbar.js @@ -83,7 +83,6 @@ TabBar.showItems(); initComplete = true; - showTabs(); ignoreNextSelection = true; TabBar.selectItem('Library'); @@ -98,6 +97,26 @@ TabBar.show(); } + function showUserTabs() { + + Dashboard.getCurrentUser().done(function (user) { + + var tabs = ['Library', 'Favorites', 'Search', 'NowPlaying']; + + if (user.Policy.EnableSync) { + + tabs.push('Sync'); + } + + tabs.push('Settings'); + + TabBar.showNamedItems(tabs); + + // We need to make sure the above completes first + setTimeout(showTabs, 500); + }); + } + var isFirstHide = true; function hideTabs() { @@ -118,24 +137,14 @@ init(); - Events.on(ConnectionManager, 'localusersignedin', showTabs); + showUserTabs(); + + Events.on(ConnectionManager, 'localusersignedin', showUserTabs); Events.on(ConnectionManager, 'localusersignedout', hideTabs); Events.on(MediaController, 'beforeplaybackstart', onPlaybackStart); Events.on(MediaController, 'playbackstop', onPlaybackStop); }); - pageClassOn('pageshow', "page", function () { - - var page = this; - - if (page.classList.contains('libraryPage')) { - showTabs(); - } - else { - hideTabs(); - } - }); - function onPlaybackStart(e, state, player) { if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video' && player.isLocalPlayer) { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 5c09cbde8..733d07393 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -146,6 +146,7 @@ cursor: default; position: relative; top: 1px; + white-space: nowrap; } .logoLibraryMenuButtonText { diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index 1acbe574c..9ddce1083 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -71,7 +71,7 @@
- +
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html index fbf69d887..00088f422 100644 --- a/dashboard-ui/mypreferenceshome.html +++ b/dashboard-ui/mypreferenceshome.html @@ -10,7 +10,7 @@
-
+

${HeaderHomePage}

diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index 482bc01d3..cc8b2b2c8 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -582,7 +582,13 @@ self.enableCustomVideoControls = function () { if (AppInfo.isNativeApp && $.browser.safari) { - return true; + + if (navigator.userAgent.toLowerCase().indexOf('iphone') != -1) { + return true; + } + + // Need to disable it in order to support picture in picture + return false; } return self.canAutoPlayVideo() && !$.browser.mobile; diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js index 733bf3f3e..5894742b8 100644 --- a/dashboard-ui/scripts/mypreferenceshome.js +++ b/dashboard-ui/scripts/mypreferenceshome.js @@ -273,12 +273,6 @@ var page = this; - if (AppInfo.enableCustomHomeSections) { - page.querySelector('.homeSections').classList.remove('hide'); - } else { - page.querySelector('.homeSections').classList.add('hide'); - } - Dashboard.showLoadingMsg(); var userId = getParameterByName('userId') || Dashboard.getCurrentUserId(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a9d28b2fc..38c596e16 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1726,7 +1726,6 @@ var AppInfo = {}; AppInfo.enableSearchInTopMenu = true; AppInfo.enableHomeFavorites = true; AppInfo.enableNowPlayingBar = true; - AppInfo.enableCustomHomeSections = true; AppInfo.enableHomeTabs = true; AppInfo.enableNowPlayingPageBottomTabs = true; @@ -1747,7 +1746,6 @@ var AppInfo = {}; AppInfo.enableNavDrawer = false; AppInfo.enableSearchInTopMenu = false; AppInfo.enableHomeFavorites = false; - AppInfo.enableCustomHomeSections = false; AppInfo.enableHomeTabs = false; AppInfo.enableNowPlayingPageBottomTabs = false; diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css index d05c61e70..90b378589 100644 --- a/dashboard-ui/themes/android.css +++ b/dashboard-ui/themes/android.css @@ -22,10 +22,14 @@ background: rgba(56,56,56,.85); } -.libraryViewNav a { - font-weight: 500 !important; +.libraryViewNav { + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); } + .libraryViewNav a { + font-weight: 500 !important; + } + paper-tab { font-weight: 500 !important; } @@ -34,3 +38,11 @@ paper-tab { .libraryViewNav .ui-btn-active { border-bottom-color: #52B54B !important; } + +.channelTimeslotHeader { + border-right-color: #52B54B !important; +} + +.channelTimeslotHeader, .timeslotHeader { + background: #52B54B !important; +} diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index 2925da72f..b2c0ee89d 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -112,11 +112,11 @@ body { } .channelTimeslotHeader { - border-right-color: #007AFF !important; + border-right-color: #52B54B !important; } .channelTimeslotHeader, .timeslotHeader { - background: #007AFF !important; + background: #52B54B !important; } .libraryViewNav, paper-tabs { diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 8cd699b56..05ffe2258 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -325,6 +325,19 @@ paper-slider { width: 100%; } +.paper-slider-0 #sliderKnobInner.paper-slider { + background-color: #52B54B; +} + +.paper-slider-0 paper-ripple.paper-slider { + color: #52B54B; +} +.paper-progress-0 #primaryProgress.paper-progress { + background-color: #52B54B; +} +.paper-progress-0 #secondaryProgress.paper-progress { + background-color: #92B54B; +} paper-menu-item { padding: .35em .5em; cursor: pointer;