From b5a723314be46bf08cc78042035511bf56289267 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 26 Sep 2015 10:51:26 -0400 Subject: [PATCH] update now playing --- dashboard-ui/apiclient/connectionmanager.js | 13 +++++ .../apiclient/sync/contentuploader.js | 23 +------- dashboard-ui/apiclient/sync/serversync.js | 8 ++- .../bower_components/iron-meta/.bower.json | 6 +- .../paper-behaviors/.bower.json | 4 +- .../bower_components/paper-ripple/.bower.json | 6 +- .../bower_components/velocity/.bower.json | 11 ++-- .../bower_components/velocity/bower.json | 4 +- .../bower_components/velocity/test/index.html | 57 ++++++++++++++++++- .../bower_components/velocity/velocity.js | 30 ++++++++-- .../bower_components/velocity/velocity.min.js | 6 +- dashboard-ui/css/search.css | 1 - dashboard-ui/mysyncsettings.html | 13 +++++ dashboard-ui/nowplaying.html | 23 +++++--- dashboard-ui/scripts/appsettings.js | 15 +++++ dashboard-ui/scripts/itemdetailpage.js | 28 ++++++++- dashboard-ui/scripts/localsync.js | 2 + dashboard-ui/scripts/mysyncsettings.js | 11 ++++ dashboard-ui/scripts/nowplayingpage.js | 23 +++++++- dashboard-ui/scripts/search.js | 2 +- dashboard-ui/scripts/site.js | 3 +- dashboard-ui/strings/html/server.json | 4 +- dashboard-ui/themes/ios.css | 2 +- 23 files changed, 229 insertions(+), 66 deletions(-) diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js index 5bf55ed945..dca4fcee75 100644 --- a/dashboard-ui/apiclient/connectionmanager.js +++ b/dashboard-ui/apiclient/connectionmanager.js @@ -665,6 +665,19 @@ return deferred.promise(); } + self.getSavedServers = function () { + + var credentials = credentialProvider.credentials(); + + var servers = credentials.Servers.slice(0); + + servers.sort(function (a, b) { + return (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0); + }); + + return servers; + }; + self.getAvailableServers = function () { logger.log('Begin getAvailableServers'); diff --git a/dashboard-ui/apiclient/sync/contentuploader.js b/dashboard-ui/apiclient/sync/contentuploader.js index f11559e5c9..75e5e45f71 100644 --- a/dashboard-ui/apiclient/sync/contentuploader.js +++ b/dashboard-ui/apiclient/sync/contentuploader.js @@ -10,25 +10,6 @@ var apiClient = connectionManager.getApiClient(server.Id); - apiClient.getDevicesOptions().done(function (devicesOptions) { - - if (!devicesOptions.EnabledCameraUploadDevices || devicesOptions.EnabledCameraUploadDevices.indexOf(apiClient.deviceId()) == -1) { - Logger.log("Camera upload is not enabled for this device."); - deferred.reject(); - } - else { - uploadImagesInternal(server, apiClient, deferred); - } - - }).fail(function () { - deferred.reject(); - }); - - return deferred.promise(); - }; - - function uploadImagesInternal(server, apiClient, deferred) { - apiClient.getContentUploadHistory().done(function (result) { uploadImagesWithHistory(server, result, apiClient, deferred); @@ -36,7 +17,9 @@ }).fail(function () { deferred.reject(); }); - } + + return deferred.promise(); + }; function uploadImagesWithHistory(server, uploadHistory, apiClient, deferred) { diff --git a/dashboard-ui/apiclient/sync/serversync.js b/dashboard-ui/apiclient/sync/serversync.js index b50fb491db..64aa74566e 100644 --- a/dashboard-ui/apiclient/sync/serversync.js +++ b/dashboard-ui/apiclient/sync/serversync.js @@ -49,7 +49,13 @@ options = options || {}; - if (options.uploadPhotos === false) { + var uploadPhotos = options.uploadPhotos !== false; + + if (options.cameraUploadServers && options.cameraUploadServers.indexOf(server.Id) == -1) { + uploadPhotos = false; + } + + if (!uploadPhotos) { nextAction(); return; } diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 8119ebcf41..9e650790be 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 dbdd848f9b..e4eac82735 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/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index c9e9b86273..d289efd9cf 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/bower_components/velocity/.bower.json b/dashboard-ui/bower_components/velocity/.bower.json index f54eb11e16..602ac26801 100644 --- a/dashboard-ui/bower_components/velocity/.bower.json +++ b/dashboard-ui/bower_components/velocity/.bower.json @@ -1,6 +1,6 @@ { "name": "velocity", - "version": "1.2.2", + "version": "1.2.3", "homepage": "http://velocityjs.org", "authors": [ { @@ -38,14 +38,13 @@ "type": "git", "url": "http://github.com/julianshapiro/velocity.git" }, - "_release": "1.2.2", + "_release": "1.2.3", "_resolution": { "type": "version", - "tag": "1.2.2", - "commit": "6b227928631aab5694255df3c219736c4c02449d" + "tag": "1.2.3", + "commit": "1ad0a8196fa973f96e347a9b7f5bdaf7498ed1a6" }, "_source": "git://github.com/julianshapiro/velocity.git", "_target": "~1.2.2", - "_originalSource": "velocity", - "_direct": true + "_originalSource": "velocity" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/velocity/bower.json b/dashboard-ui/bower_components/velocity/bower.json index 768ee61394..feb02b9417 100644 --- a/dashboard-ui/bower_components/velocity/bower.json +++ b/dashboard-ui/bower_components/velocity/bower.json @@ -1,6 +1,6 @@ { "name": "velocity", - "version": "1.2.2", + "version": "1.2.3", "homepage": "http://velocityjs.org", "authors": [ { "name" : "Julian Shapiro", @@ -31,7 +31,7 @@ "jquery": "*" }, "repository" : - { + { "type" : "git", "url" : "http://github.com/julianshapiro/velocity.git" } diff --git a/dashboard-ui/bower_components/velocity/test/index.html b/dashboard-ui/bower_components/velocity/test/index.html index e668129aa1..6237de5efd 100644 --- a/dashboard-ui/bower_components/velocity/test/index.html +++ b/dashboard-ui/bower_components/velocity/test/index.html @@ -42,7 +42,6 @@