diff --git a/dashboard-ui/apiclient/sync/multiserversync.js b/dashboard-ui/apiclient/sync/multiserversync.js index 7f1a86899..8171b3e48 100644 --- a/dashboard-ui/apiclient/sync/multiserversync.js +++ b/dashboard-ui/apiclient/sync/multiserversync.js @@ -8,9 +8,9 @@ var deferred = DeferredBuilder.Deferred(); - connectionManager.getAvailableServers().done(function (result) { - syncNext(result, 0, options, deferred); - }); + var servers = connectionManager.getSavedServers(); + + syncNext(servers, 0, options, deferred); return deferred.promise(); }; diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790b..8119ebcf4 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index e4eac8273..dbdd848f9 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 f3f659945..ae5f73d32 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 }); } @@ -55,20 +55,20 @@ Logger.log('- BackgroundFetch failed'); } - var syncInterval = 3600000; + var syncInterval = 1800000; function restartInterval() { setInterval(function () { - startSync(); + //startSync(); }, syncInterval); if (lastStart > 0 && (new Date().getTime() - lastStart) >= syncInterval) { setTimeout(function () { - startSync(); + //startSync(); }, 5000); } diff --git a/dashboard-ui/cordova/localassetmanager.js b/dashboard-ui/cordova/localassetmanager.js index a2882c205..d8bfff88b 100644 --- a/dashboard-ui/cordova/localassetmanager.js +++ b/dashboard-ui/cordova/localassetmanager.js @@ -474,7 +474,74 @@ function downloadFile(url, localPath, enableBackground) { - return downloadWithFileTransfer(url, localPath, enableBackground); + if (!enableBackground) { + return downloadWithFileTransfer(url, localPath); + } + + var deferred = DeferredBuilder.Deferred(); + + if (localStorage.getItem('sync-' + url) == '1') { + Logger.log('file was downloaded previously'); + deferred.resolveWith(null, [localPath]); + return deferred.promise(); + } + + Logger.log('downloading: ' + url + ' to ' + localPath); + + createDirectory(getParentDirectoryPath(localPath)).done(function () { + + resolveFile(localPath, { create: true }, function (targetFile) { + + var downloader = new BackgroundTransfer.BackgroundDownloader(); + // Create a new download operation. + var download = downloader.createDownload(url, targetFile); + + var isResolved = false; + + // Give it a short period of time to see if it has already been completed before. Either way, move on and resolve it. + var timeoutHandle = setTimeout(function () { + + isResolved = true; + // true indicates that it's queued + deferred.resolveWith(null, [localPath, true]); + }, 1000); + + // Start the download and persist the promise to be able to cancel the download. + download.startAsync().then(function () { + + clearTimeout(timeoutHandle); + // on success + Logger.log('Downloaded local url: ' + localPath); + if (isResolved) { + // If we've already moved on, set this property so that we'll see it later + localStorage.setItem('sync-' + url, '1'); + } else { + // true indicates that it's queued + deferred.resolveWith(null, [localPath, false]); + } + + }, function () { + + clearTimeout(timeoutHandle); + + // on error + Logger.log('Error downloading url: ' + url); + + if (!isResolved) { + deferred.reject(); + } + + }, function (value) { + + // on progress + //Logger.log('download progress: ' + value); + }); + + }); + + }).fail(getOnFail(deferred));; + + return deferred.promise(); } var activeDownloads = []; @@ -549,7 +616,7 @@ // true indicates that it's queued deferred.resolveWith(null, [localPath, isQueued]); } - }, 2000); + }, 3000); } }, function () { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 3473ab767..1804e4f09 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -198,22 +198,6 @@ } } -.galleryImageContainer { - display: inline-block; - margin: 5px; -} - - .galleryImageContainer:hover { - -moz-box-shadow: 0 0 0 5px #38c; - -webkit-box-shadow: 0 0 0 5px #38c; - box-shadow: 0 0 0 5px #38c; - } - -.galleryImage { - max-height: 300px; - max-width: 300px; -} - .storeStarRating { background-image: url(data:image/png;base64,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); background-position: left center; @@ -518,9 +502,9 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .itemDetailGalleryLink img:hover { - -moz-box-shadow: 0 0 20px 3px #38c; - -webkit-box-shadow: 0 0 20px 3px #38c; - box-shadow: 0 0 20px 3px #38c; + -moz-box-shadow: 0 0 20px 3px #52B54B; + -webkit-box-shadow: 0 0 20px 3px #52B54B; + box-shadow: 0 0 20px 3px #52B54B; } .primaryDetailsContainer { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index ed56b3603..5c09cbde8 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -308,10 +308,6 @@ display: none; } -.libraryViewNav a:not(.ui-btn-active):hover { - color: #2ad; -} - @media all and (max-width: 400px) { .libraryMenuButtonText { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index f64176211..7f962d2c5 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -774,6 +774,13 @@ textarea { vertical-align: middle; } +@media all and (max-height: 800px) { + + .header { + display: none !important; + } +} + .btnCurrentUser { text-decoration: none; } @@ -1585,9 +1592,9 @@ progress { margin: 0 0 3em 0; } -.syncActivityForTarget paper-fab { - border-radius: 0; -} + .syncActivityForTarget paper-fab { + border-radius: 0; + } @media all and (min-width: 800px) { diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 47d728f30..6bbd14351 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -144,13 +144,15 @@