diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 4072b4af76..f0a9c76d51 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", + "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a" }, - "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-a11y-keys-behavior" + "_originalSource": "polymerelements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index f499351883..5d7b926afb 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -27,14 +27,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-behaviors", + "homepage": "https://github.com/polymerelements/iron-behaviors", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "663ad706b43989f4961d945b8116cf4db346532f" }, - "_source": "git://github.com/PolymerElements/iron-behaviors.git", + "_source": "git://github.com/polymerelements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-behaviors" + "_originalSource": "polymerelements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-input/.bower.json b/dashboard-ui/bower_components/paper-input/.bower.json index 8387d1f610..8cc77ad014 100644 --- a/dashboard-ui/bower_components/paper-input/.bower.json +++ b/dashboard-ui/bower_components/paper-input/.bower.json @@ -50,7 +50,7 @@ "tag": "v1.0.14", "commit": "120a0610aca5c86194977e30f696b09716f93bbc" }, - "_source": "git://github.com/PolymerElements/paper-input.git", - "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-input" + "_source": "git://github.com/polymerelements/paper-input.git", + "_target": "^1.0.9", + "_originalSource": "polymerelements/paper-input" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index d289efd9cf..c9e9b86273 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -30,14 +30,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/paper-ripple", + "homepage": "https://github.com/PolymerElements/paper-ripple", "_release": "1.0.2", "_resolution": { "type": "version", "tag": "v1.0.2", "commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc" }, - "_source": "git://github.com/polymerelements/paper-ripple.git", + "_source": "git://github.com/PolymerElements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-ripple" + "_originalSource": "PolymerElements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/cordova/ios/backgroundfetch.js b/dashboard-ui/cordova/ios/backgroundfetch.js index 1b4f79552c..049fa0b665 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: false // <-- false is default + stopOnTerminate: true // <-- false is default }); } @@ -27,7 +27,7 @@ fetcher.finish(); // <-- N.B. You MUST called #finish so that native-side can signal completion of the background-thread to the os. } - function startSync(uploadPhotos) { + function startSync(reportToFetcher) { lastStart = new Date().getTime(); require(['localsync'], function () { @@ -37,11 +37,11 @@ return; } - var syncOptions = { - uploadPhotos: uploadPhotos - }; + var promise = LocalSync.sync(); - LocalSync.sync(syncOptions).done(onSyncFinish).fail(onSyncFail); + if (reportToFetcher) { + promise.done(onSyncFinish).fail(onSyncFail); + } }); } @@ -61,12 +61,15 @@ setInterval(function () { - //startSync(true); + startSync(); }, syncInterval); if (lastStart > 0 && (now - lastStart) >= syncInterval) { - //startSync(true); + + setTimeout(function () { + startSync(); + }, 3000); } } diff --git a/dashboard-ui/css/nowplaying.css b/dashboard-ui/css/nowplaying.css index 4020f759bf..fd9241807c 100644 --- a/dashboard-ui/css/nowplaying.css +++ b/dashboard-ui/css/nowplaying.css @@ -2,11 +2,18 @@ padding-top: 0 !important; } - .nowPlayingPage .btnCommand, .nowPlayingPage .btnPlayStateCommand { - margin: 2px 1px; - width: 70px; - height: 70px; - } +.nowPlayingPagePaperTabs.bottom { + position: fixed; + bottom: 0; + left: 0; + right: 0; +} + +.nowPlayingPage .btnCommand, .nowPlayingPage .btnPlayStateCommand { + margin: 2px 1px; + width: 70px; + height: 70px; +} .nowPlayingPageImage img { max-height: 360px; diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index db7199a2ee..4dd45a68cc 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -6,6 +6,14 @@
+ + + ${TabNowPlaying} + ${TabControls} + ${TabPlaylist} + + +
@@ -149,14 +157,6 @@ - - - ${TabNowPlaying} - ${TabControls} - ${TabPlaylist} - - -
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index 8f7f760693..b951fd84df 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -773,7 +773,13 @@ }); var tabs = page.querySelector('paper-tabs'); - tabs.alignBottom = true; + + if (AppInfo.enableNowPlayingPageBottomTabs) { + tabs.alignBottom = true; + tabs.classList.add('bottom'); + } else { + tabs.classList.remove('bottom'); + } LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 3947251bc3..855e81630c 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1728,6 +1728,7 @@ var AppInfo = {}; AppInfo.enableNowPlayingBar = true; AppInfo.enableCustomHomeSections = true; AppInfo.enableHomeTabs = true; + AppInfo.enableNowPlayingPageBottomTabs = true; AppInfo.enableAppStorePolicy = isCordova; @@ -1749,6 +1750,7 @@ var AppInfo = {}; AppInfo.enableNowPlayingBar = false; AppInfo.enableCustomHomeSections = false; AppInfo.enableHomeTabs = false; + AppInfo.enableNowPlayingPageBottomTabs = false; } else { if (isMobile) { diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index c449282708..da5f68a8d1 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -154,6 +154,13 @@ h1, h1 a { padding: 0 !important; } +@media all and (max-width: 400px) { + + .libraryMenuButtonText { + display: block; + } +} + .libraryPanelHeader span { font-weight: 400; } @@ -218,7 +225,3 @@ paper-tab { .nowPlayingPageBackButton { display: none !important; } - -.nowPlayingPagePaperTabs { - display: none !important; -} diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index c0ec7b2764..b72fed9ec1 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -255,10 +255,6 @@ paper-tabs { box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); } - paper-tabs.bottomTabs { - box-shadow: 0px -2px 6px rgba(0, 0, 0, 0.15); - } - paper-tab { text-transform: uppercase; font-weight: 400;