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 + + + @@ -97,7 +100,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }); test('can be queried for all available icons', function () { - expect(iconset.getIconNames()).to.deep.eql(['my-icons:circle', 'my-icons:square']); + expect(iconset.getIconNames()).to.deep.eql(['my-icons:circle', 'my-icons:square', 'my-icons:rect']); }); test('supports any icon defined in the svg', function () { @@ -110,6 +113,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }); }); + test('prefers a viewBox attribute over the iconset size', function () { + iconset.applyIcon(div, 'rect'); + expect(div.firstElementChild.getAttribute('viewBox')).to.be.equal('0 0 50 25'); + }); + + test('uses the iconset size when viewBox is not defined on the element', function () { + iconset.applyIcon(div, 'circle'); + expect(div.firstElementChild.getAttribute('viewBox')).to.be.equal('0 0 20 20'); + }); + }); }); diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 7edb440aca..f5249f57ac 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -1,6 +1,6 @@ { "name": "iron-selector", - "version": "1.0.5", + "version": "1.0.6", "description": "Manages a set of elements that can be selected", "private": true, "license": "http://polymer.github.io/LICENSE.txt", @@ -32,11 +32,11 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.0.5", + "_release": "1.0.6", "_resolution": { "type": "version", - "tag": "v1.0.5", - "commit": "396ef93a5d3467810cec0328c53f09037d6ee8e1" + "tag": "v1.0.6", + "commit": "08fa18c70b79abdee8a02486223ab9a4f0acc72c" }, "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/iron-selector/bower.json b/dashboard-ui/bower_components/iron-selector/bower.json index 4e2a5b9b4b..aaff8b87d8 100644 --- a/dashboard-ui/bower_components/iron-selector/bower.json +++ b/dashboard-ui/bower_components/iron-selector/bower.json @@ -1,6 +1,6 @@ { "name": "iron-selector", - "version": "1.0.5", + "version": "1.0.6", "description": "Manages a set of elements that can be selected", "private": true, "license": "http://polymer.github.io/LICENSE.txt", diff --git a/dashboard-ui/bower_components/iron-selector/iron-selectable.html b/dashboard-ui/bower_components/iron-selector/iron-selectable.html index 4aa5c72fd9..d8689f674d 100644 --- a/dashboard-ui/bower_components/iron-selector/iron-selectable.html +++ b/dashboard-ui/bower_components/iron-selector/iron-selectable.html @@ -111,7 +111,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN * @type {object} * @default {template: 1} */ - excludedLocalNames: { + _excludedLocalNames: { type: Object, value: function() { return { @@ -223,7 +223,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }, _filterItem: function(node) { - return !this.excludedLocalNames[node.localName]; + return !this._excludedLocalNames[node.localName]; }, _valueToItem: function(value) { diff --git a/dashboard-ui/bower_components/iron-selector/test/excluded-local-names.html b/dashboard-ui/bower_components/iron-selector/test/excluded-local-names.html index 28207ca9cc..8c0e6e185a 100644 --- a/dashboard-ui/bower_components/iron-selector/test/excluded-local-names.html +++ b/dashboard-ui/bower_components/iron-selector/test/excluded-local-names.html @@ -57,22 +57,22 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN test2 = fixture('test2'); }); - test('default `excludedLocalNames`', function() { - assert.isTrue('template' in test1.excludedLocalNames); - assert.isTrue('template' in test2.excludedLocalNames); + test('default `_excludedLocalNames`', function() { + assert.isTrue('template' in test1._excludedLocalNames); + assert.isTrue('template' in test2._excludedLocalNames); }); - test('custom `excludedLocalNames`', function() { - test1.excludedLocalNames.foo = 1; + test('custom `_excludedLocalNames`', function() { + test1._excludedLocalNames.foo = 1; - assert.isTrue('foo' in test1.excludedLocalNames); - assert.isFalse('foo' in test2.excludedLocalNames); + assert.isTrue('foo' in test1._excludedLocalNames); + assert.isFalse('foo' in test2._excludedLocalNames); }); test('items', function() { - test1.excludedLocalNames.span = 1; - test2.excludedLocalNames.div = 1; + test1._excludedLocalNames.span = 1; + test2._excludedLocalNames.div = 1; var NOT_FOUND = -1; var items1 = test1.items.map(function(el) { return el.localName; }); diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index e4eac82735..dbdd848f9b 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-checkbox/.bower.json b/dashboard-ui/bower_components/paper-checkbox/.bower.json index c0c7cdeeaa..be0b3fa025 100644 --- a/dashboard-ui/bower_components/paper-checkbox/.bower.json +++ b/dashboard-ui/bower_components/paper-checkbox/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-checkbox", - "version": "1.0.10", + "version": "1.0.11", "description": "A material design checkbox", "authors": [ "The Polymer Authors" @@ -35,11 +35,11 @@ "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0", "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, - "_release": "1.0.10", + "_release": "1.0.11", "_resolution": { "type": "version", - "tag": "v1.0.10", - "commit": "ce4a8e8663892e95fccc0142055db214fa292d6d" + "tag": "v1.0.11", + "commit": "00a147c81fe766f5c90222b2d1b0d8b5ddb12be5" }, "_source": "git://github.com/PolymerElements/paper-checkbox.git", "_target": "~1.0.5", diff --git a/dashboard-ui/bower_components/paper-checkbox/bower.json b/dashboard-ui/bower_components/paper-checkbox/bower.json index 4b0c6f4f5b..fad9848e16 100644 --- a/dashboard-ui/bower_components/paper-checkbox/bower.json +++ b/dashboard-ui/bower_components/paper-checkbox/bower.json @@ -1,6 +1,6 @@ { "name": "paper-checkbox", - "version": "1.0.10", + "version": "1.0.11", "description": "A material design checkbox", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-checkbox/demo/index.html b/dashboard-ui/bower_components/paper-checkbox/demo/index.html index df630d35b1..8ec9d4995a 100644 --- a/dashboard-ui/bower_components/paper-checkbox/demo/index.html +++ b/dashboard-ui/bower_components/paper-checkbox/demo/index.html @@ -80,7 +80,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN

Color

- Oxygen + Oxygen Carbon Hydrogen Nitrogen diff --git a/dashboard-ui/bower_components/paper-checkbox/paper-checkbox.html b/dashboard-ui/bower_components/paper-checkbox/paper-checkbox.html index 4e1135d5ad..fbcca61aeb 100644 --- a/dashboard-ui/bower_components/paper-checkbox/paper-checkbox.html +++ b/dashboard-ui/bower_components/paper-checkbox/paper-checkbox.html @@ -14,7 +14,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN +