diff --git a/dashboard-ui/apiclient/apiclient.js b/dashboard-ui/apiclient/apiclient.js
index 9072a0c028..d023a534e8 100644
--- a/dashboard-ui/apiclient/apiclient.js
+++ b/dashboard-ui/apiclient/apiclient.js
@@ -166,7 +166,7 @@
var accessToken = currentServerInfo.AccessToken;
if (accessToken) {
- headers['X-MediaBrowser-Token'] = accessToken;
+ headers['X-Emby-Token'] = accessToken;
}
};
@@ -356,6 +356,10 @@
throw new Error("serverAddress is yet not set");
}
+ if (url.toLowerCase().indexOf('/emby') == -1) {
+ url += '/emby';
+ }
+
if (name.charAt(0) != '/') {
url += '/';
}
@@ -407,7 +411,7 @@
throw new Error("Cannot open web socket without access token.");
}
- var url = serverAddress.replace('http', 'ws');
+ var url = self.getUrl("socket").replace("/socket", "").replace('http', 'ws');
url += "?api_key=" + accessToken;
url += "&deviceId=" + deviceId;
diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js
index 944a7c6b4b..6ea1e10ced 100644
--- a/dashboard-ui/apiclient/connectionmanager.js
+++ b/dashboard-ui/apiclient/connectionmanager.js
@@ -79,9 +79,13 @@
}
}
+ function getEmbyServerUrl(baseUrl, handler) {
+ return baseUrl + "/emby/" + handler;
+ }
+
function tryConnect(url, timeout) {
- url += "/system/info/public";
+ url = getEmbyServerUrl(url, "system/info/public");
logger.log('tryConnect url: ' + url);
@@ -399,14 +403,14 @@
var url = MediaBrowser.ServerInfo.getServerAddress(server, connectionMode);
- url += "/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
+ url = getEmbyServerUrl(url, "Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId);
return HttpClient.send({
type: "GET",
url: url,
dataType: "json",
headers: {
- "X-MediaBrowser-Token": server.ExchangeToken
+ "X-Emby-Token": server.ExchangeToken
}
}).done(function (auth) {
@@ -430,10 +434,10 @@
HttpClient.send({
type: "GET",
- url: url + "/system/info",
+ url: getEmbyServerUrl(url, "System/Info"),
dataType: "json",
headers: {
- "X-MediaBrowser-Token": server.AccessToken
+ "X-Emby-Token": server.AccessToken
}
}).done(function (systemInfo) {
@@ -445,10 +449,10 @@
HttpClient.send({
type: "GET",
- url: url + "/users/" + server.UserId,
+ url: getEmbyServerUrl(url, "users/" + server.UserId),
dataType: "json",
headers: {
- "X-MediaBrowser-Token": server.AccessToken
+ "X-Emby-Token": server.AccessToken
}
}).done(function (user) {
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 75f9aadbc3..845de2758a 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.6",
"_resolution": {
"type": "version",
"tag": "v1.0.6",
"commit": "af5c98b1cf9b3d180a6326c99ac9c7057eee647f"
},
- "_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-iconset-svg/.bower.json b/dashboard-ui/bower_components/iron-iconset-svg/.bower.json
index 005062a400..8cca5c4efb 100644
--- a/dashboard-ui/bower_components/iron-iconset-svg/.bower.json
+++ b/dashboard-ui/bower_components/iron-iconset-svg/.bower.json
@@ -1,7 +1,7 @@
{
"name": "iron-iconset-svg",
"description": "Manages a set of svg icons",
- "version": "1.0.5",
+ "version": "1.0.6",
"keywords": [
"web-components",
"polymer",
@@ -30,11 +30,11 @@
"web-component-tester": "*"
},
"homepage": "https://github.com/polymerelements/iron-iconset-svg",
- "_release": "1.0.5",
+ "_release": "1.0.6",
"_resolution": {
"type": "version",
- "tag": "v1.0.5",
- "commit": "54d35698c1e06462452997f8731ea31a4bf1638c"
+ "tag": "v1.0.6",
+ "commit": "ebd17924942abe6110aa0fe81b1b31e1fcc34a9f"
},
"_source": "git://github.com/polymerelements/iron-iconset-svg.git",
"_target": "^1.0.0",
diff --git a/dashboard-ui/bower_components/iron-iconset-svg/bower.json b/dashboard-ui/bower_components/iron-iconset-svg/bower.json
index 829d33d888..843d9bde6b 100644
--- a/dashboard-ui/bower_components/iron-iconset-svg/bower.json
+++ b/dashboard-ui/bower_components/iron-iconset-svg/bower.json
@@ -1,7 +1,7 @@
{
"name": "iron-iconset-svg",
"description": "Manages a set of svg icons",
- "version": "1.0.5",
+ "version": "1.0.6",
"keywords": [
"web-components",
"polymer",
diff --git a/dashboard-ui/bower_components/iron-iconset-svg/iron-iconset-svg.html b/dashboard-ui/bower_components/iron-iconset-svg/iron-iconset-svg.html
index 308d6fad20..1613dbe860 100644
--- a/dashboard-ui/bower_components/iron-iconset-svg/iron-iconset-svg.html
+++ b/dashboard-ui/bower_components/iron-iconset-svg/iron-iconset-svg.html
@@ -179,13 +179,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
_prepareSvgClone: function(sourceSvg, size) {
if (sourceSvg) {
- var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
- svg.setAttribute('viewBox', ['0', '0', size, size].join(' '));
+ var content = sourceSvg.cloneNode(true),
+ svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg'),
+ viewBox = content.getAttribute('viewBox') || '0 0 ' + size + ' ' + size;
+ svg.setAttribute('viewBox', viewBox);
svg.setAttribute('preserveAspectRatio', 'xMidYMid meet');
// TODO(dfreedm): `pointer-events: none` works around https://crbug.com/370136
// TODO(sjmiles): inline style may not be ideal, but avoids requiring a shadow-root
svg.style.cssText = 'pointer-events: none; display: block; width: 100%; height: 100%;';
- svg.appendChild(sourceSvg.cloneNode(true)).removeAttribute('id');
+ svg.appendChild(content).removeAttribute('id');
return svg;
}
return null;
diff --git a/dashboard-ui/bower_components/iron-iconset-svg/test/iron-iconset-svg.html b/dashboard-ui/bower_components/iron-iconset-svg/test/iron-iconset-svg.html
index 3e5d643c6b..b80a5506ac 100644
--- a/dashboard-ui/bower_components/iron-iconset-svg/test/iron-iconset-svg.html
+++ b/dashboard-ui/bower_components/iron-iconset-svg/test/iron-iconset-svg.html
@@ -42,6 +42,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN