diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js
index 7b7b60dc6..b25f94c0b 100644
--- a/dashboard-ui/apiclient/connectionmanager.js
+++ b/dashboard-ui/apiclient/connectionmanager.js
@@ -253,27 +253,12 @@
Events.trigger(self, 'apiclientcreated', [apiClient]);
}
- if (server.AccessToken && server.UserId) {
-
- apiClient.setAuthenticationInfo(server.AccessToken, server.UserId);
- }
- else {
-
- apiClient.clearAuthenticationInfo();
- }
-
logger.log('returning instance from getOrAddApiClient');
return apiClient;
}
self.getOrCreateApiClient = function (serverId) {
- var apiClient = self.getApiClient(serverId);
-
- if (apiClient) {
- return apiClient;
- }
-
var credentials = credentialProvider.credentials();
var servers = credentials.Servers.filter(function (s) {
return stringEqualsIgnoreCase(s.Id, serverId);
diff --git a/dashboard-ui/apiclient/sync/mediasync.js b/dashboard-ui/apiclient/sync/mediasync.js
index 866e05822..247091345 100644
--- a/dashboard-ui/apiclient/sync/mediasync.js
+++ b/dashboard-ui/apiclient/sync/mediasync.js
@@ -4,7 +4,7 @@
var self = this;
- self.sync = function (apiClient, serverInfo) {
+ self.sync = function (apiClient, serverInfo, options) {
var deferred = DeferredBuilder.Deferred();
@@ -14,7 +14,7 @@
syncData(apiClient, serverInfo, false).done(function () {
// Download new content
- getNewMedia(apiClient, serverInfo).done(function () {
+ getNewMedia(apiClient, serverInfo, options).done(function () {
// Do the second data sync
syncData(apiClient, serverInfo, false).done(function () {
@@ -160,7 +160,7 @@
return deferred.promise();
}
- function getNewMedia(apiClient, serverInfo) {
+ function getNewMedia(apiClient, serverInfo, options) {
Logger.log('Begin getNewMedia');
@@ -168,14 +168,14 @@
apiClient.getReadySyncItems(apiClient.deviceId()).done(function (jobItems) {
- getNextNewItem(jobItems, 0, apiClient, serverInfo, deferred);
+ getNextNewItem(jobItems, 0, apiClient, serverInfo, options, deferred);
}).fail(getOnFail(deferred));
return deferred.promise();
}
- function getNextNewItem(jobItems, index, apiClient, serverInfo, deferred) {
+ function getNextNewItem(jobItems, index, apiClient, serverInfo, options, deferred) {
var length = jobItems.length;
@@ -185,12 +185,22 @@
return;
}
- getNewItem(jobItems[index], apiClient, serverInfo).done(function () {
+ var hasGoneNext = false;
+ var goNext = function () {
- getNextNewItem(jobItems, index + 1, apiClient, serverInfo, deferred);
- }).fail(function () {
- getNextNewItem(jobItems, index + 1, apiClient, serverInfo, deferred);
- });
+ if (!hasGoneNext) {
+ hasGoneNext = true;
+ getNextNewItem(jobItems, index + 1, apiClient, serverInfo, options, deferred);
+ }
+ };
+
+ getNewItem(jobItems[index], apiClient, serverInfo).done(goNext).fail(goNext);
+
+ options = options || {};
+ if (options.enableBackgroundTransfer) {
+ // Give it 2 seconds, then move on
+ setTimeout(goNext, 2000);
+ }
}
function getNewItem(jobItem, apiClient, serverInfo) {
@@ -317,6 +327,10 @@
downloadImage(apiClient, serverId, itemId, imageTag, imageType).done(function () {
+ // For the sake of simplicity, limit to one image
+ deferred.resolve();
+ return;
+
getNextImage(index + 1, apiClient, localItem, deferred);
}).fail(getOnFail(deferred));
diff --git a/dashboard-ui/apiclient/sync/serversync.js b/dashboard-ui/apiclient/sync/serversync.js
index 4450910d9..b50fb491d 100644
--- a/dashboard-ui/apiclient/sync/serversync.js
+++ b/dashboard-ui/apiclient/sync/serversync.js
@@ -44,7 +44,7 @@
Logger.log("Creating ContentUploader to server: " + server.Id);
var nextAction = function () {
- syncOfflineUsers(server, deferred);
+ syncOfflineUsers(server, options, deferred);
};
options = options || {};
@@ -71,7 +71,7 @@
});
}
- function syncOfflineUsers(server, deferred) {
+ function syncOfflineUsers(server, options, deferred) {
require(['offlineusersync'], function () {
@@ -81,7 +81,7 @@
Logger.log("OfflineUserSync succeeded to server: " + server.Id);
- syncMedia(server, deferred);
+ syncMedia(server, options, deferred);
}).fail(function () {
@@ -92,13 +92,13 @@
});
}
- function syncMedia(server, deferred) {
+ function syncMedia(server, options, deferred) {
require(['mediasync'], function () {
var apiClient = connectionManager.getApiClient(server.Id);
- new MediaBrowser.MediaSync().sync(apiClient, server).done(function () {
+ new MediaBrowser.MediaSync().sync(apiClient, server, options).done(function () {
Logger.log("MediaSync succeeded to server: " + server.Id);
diff --git a/dashboard-ui/bower_components/paper-button/.bower.json b/dashboard-ui/bower_components/paper-button/.bower.json
index 84ea692b7..577fba83b 100644
--- a/dashboard-ui/bower_components/paper-button/.bower.json
+++ b/dashboard-ui/bower_components/paper-button/.bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-button",
- "version": "1.0.4",
+ "version": "1.0.5",
"description": "Material design button",
"authors": [
"The Polymer Authors"
@@ -24,7 +24,8 @@
"polymer": "Polymer/polymer#^1.1.0",
"paper-ripple": "polymerelements/paper-ripple#^1.0.0",
"paper-material": "polymerelements/paper-material#^1.0.0",
- "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0"
+ "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0",
+ "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0"
},
"devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
@@ -36,11 +37,11 @@
"iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
"paper-styles": "polymerelements/paper-styles#^1.0.0"
},
- "_release": "1.0.4",
+ "_release": "1.0.5",
"_resolution": {
"type": "version",
- "tag": "v1.0.4",
- "commit": "402fffc8bad25ea7c3135f2e5997ad00765a2d61"
+ "tag": "v1.0.5",
+ "commit": "e8367f8f0d77e420a75c8811bda9b0666b81ff8e"
},
"_source": "git://github.com/PolymerElements/paper-button.git",
"_target": "~1.0.1",
diff --git a/dashboard-ui/bower_components/paper-button/bower.json b/dashboard-ui/bower_components/paper-button/bower.json
index 2560658d9..c5e28eee9 100644
--- a/dashboard-ui/bower_components/paper-button/bower.json
+++ b/dashboard-ui/bower_components/paper-button/bower.json
@@ -1,6 +1,6 @@
{
"name": "paper-button",
- "version": "1.0.4",
+ "version": "1.0.5",
"description": "Material design button",
"authors": [
"The Polymer Authors"
@@ -24,7 +24,8 @@
"polymer": "Polymer/polymer#^1.1.0",
"paper-ripple": "polymerelements/paper-ripple#^1.0.0",
"paper-material": "polymerelements/paper-material#^1.0.0",
- "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0"
+ "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0",
+ "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0"
},
"devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
diff --git a/dashboard-ui/bower_components/paper-button/demo/index.html b/dashboard-ui/bower_components/paper-button/demo/index.html
index 9b98fe27c..253bb77ee 100644
--- a/dashboard-ui/bower_components/paper-button/demo/index.html
+++ b/dashboard-ui/bower_components/paper-button/demo/index.html
@@ -92,12 +92,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
background: #eee;
}
- paper-button.ripple::shadow paper-ripple {
- color: var(--paper-pink-a200);
- }
-
- paper-button.ripple paper-ripple {
- color: var(--paper-pink-a200);
+ paper-button.ripple {
+ --paper-button-ink-color: var(--paper-pink-a200);
}
diff --git a/dashboard-ui/bower_components/paper-button/paper-button.html b/dashboard-ui/bower_components/paper-button/paper-button.html
index 29683d31a..66bd137a0 100644
--- a/dashboard-ui/bower_components/paper-button/paper-button.html
+++ b/dashboard-ui/bower_components/paper-button/paper-button.html
@@ -12,6 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
+
@@ -93,12 +97,19 @@ Custom property | Description | Default
user-select: none;
cursor: pointer;
z-index: 0;
+ padding: 0.7em 0.57em;
@apply(--paper-button);
}
- .keyboard-focus {
+ :host([raised]) .keyboard-focus {
font-weight: bold;
+ @apply(paper-button-raised-keyboard-focus);
+ }
+
+ :host(:not([raised])) .keyboard-focus {
+ font-weight: bold;
+ @apply(paper-button-flat-keyboard-focus);
}
:host([disabled]) {
@@ -114,24 +125,25 @@ Custom property | Description | Default
display: none;
}
+ paper-ripple {
+ color: var(--paper-button-ink-color);
+ }
+
paper-material {
border-radius: inherit;
+ @apply(--layout-fit);
}
.content > ::content * {
text-transform: inherit;
}
-
- .content {
- padding: 0.7em 0.57em
- }
-
-
-
+
+
+
diff --git a/dashboard-ui/bower_components/paper-button/test/paper-button.html b/dashboard-ui/bower_components/paper-button/test/paper-button.html
index 797688cef..a4acd90ce 100644
--- a/dashboard-ui/bower_components/paper-button/test/paper-button.html
+++ b/dashboard-ui/bower_components/paper-button/test/paper-button.html
@@ -54,10 +54,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}, 1);
});
- test('has aria role "button"', function() {
- expect(button.getAttribute('role')).to.be.eql('button');
- });
-
test('can be disabled imperatively', function() {
button.disabled = true;
expect(button.getAttribute('aria-disabled')).to.be.eql('true');
@@ -78,6 +74,21 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
MockInteractions.pressEnter(button);
});
});
+
+ suite('', function() {
+ var button;
+
+ setup(function() {
+ button = fixture('TrivialButton');
+ });
+
+ test('has aria role "button"', function() {
+ expect(button.getAttribute('role')).to.be.eql('button');
+ });
+
+ a11ySuite('TrivialButton');
+ });
+