From be200035e3b9bbd75888a1fd48f9e04d18638375 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 23 Dec 2015 15:07:03 -0500 Subject: [PATCH] update components --- .../emby-apiclient/.bower.json | 8 +++--- .../emby-apiclient/connectservice.js | 5 ++++ .../emby-webcomponents/.bower.json | 28 +++++++++++++++++++ .../emby-webcomponents/LICENSE | 22 +++++++++++++++ .../emby-webcomponents/bower.json | 19 +++++++++++++ .../emby-webcomponents}/requirehtml.js | 0 .../iron-flex-layout/.bower.json | 6 ++-- dashboard-ui/scripts/site.js | 2 +- 8 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 dashboard-ui/bower_components/emby-webcomponents/.bower.json create mode 100644 dashboard-ui/bower_components/emby-webcomponents/LICENSE create mode 100644 dashboard-ui/bower_components/emby-webcomponents/bower.json rename dashboard-ui/{components => bower_components/emby-webcomponents}/requirehtml.js (100%) diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index af80dd8258..3dad57dd05 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.16", - "_release": "1.0.16", + "version": "1.0.17", + "_release": "1.0.17", "_resolution": { "type": "version", - "tag": "1.0.16", - "commit": "a454b78f6e617aef9359736c57f38ac40fcc8d61" + "tag": "1.0.17", + "commit": "3ce9bb842c3188d3440aef5319b01a24e57603cb" }, "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "~1.0.3", diff --git a/dashboard-ui/bower_components/emby-apiclient/connectservice.js b/dashboard-ui/bower_components/emby-apiclient/connectservice.js index f08f6df20a..a1f10a87e6 100644 --- a/dashboard-ui/bower_components/emby-apiclient/connectservice.js +++ b/dashboard-ui/bower_components/emby-apiclient/connectservice.js @@ -1,5 +1,10 @@ define([], function () { + function replaceAll(str, find, replace) { + + return str.split(find).join(replace); + } + return { cleanPassword: function (password) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json new file mode 100644 index 0000000000..edfd95b985 --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -0,0 +1,28 @@ +{ + "name": "emby-webcomponents", + "authors": [ + "The Emby Authors" + ], + "repository": { + "type": "git", + "url": "git://github.com/MediaBrowser/emby-webcomponents.git" + }, + "license": "https://github.com/MediaBrowser/emby-webcomponents/blob/master/LICENSE", + "homepage": "https://github.com/MediaBrowser/emby-webcomponents", + "dependencies": { + "requirejs": "requirejs#^2.1.22" + }, + "devDependencies": {}, + "ignore": [], + "version": "1.0.0", + "_release": "1.0.0", + "_resolution": { + "type": "version", + "tag": "1.0.0", + "commit": "e5ea8f8503ae36e45609e77aae4ecae170cb5dea" + }, + "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", + "_target": "~1.0.0", + "_originalSource": "emby-webcomponents", + "_direct": true +} \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/LICENSE b/dashboard-ui/bower_components/emby-webcomponents/LICENSE new file mode 100644 index 0000000000..ddc9f6ea34 --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Media Browser + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/dashboard-ui/bower_components/emby-webcomponents/bower.json b/dashboard-ui/bower_components/emby-webcomponents/bower.json new file mode 100644 index 0000000000..b31e2944df --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/bower.json @@ -0,0 +1,19 @@ +{ + "name": "emby-webcomponents", + "authors": [ + "The Emby Authors" + ], + "repository": { + "type": "git", + "url": "git://github.com/MediaBrowser/emby-webcomponents.git" + }, + "license": "https://github.com/MediaBrowser/emby-webcomponents/blob/master/LICENSE", + "homepage": "https://github.com/MediaBrowser/emby-webcomponents", + "dependencies": { + "requirejs": "requirejs#^2.1.22" + }, + "devDependencies": { + + }, + "ignore": [] +} diff --git a/dashboard-ui/components/requirehtml.js b/dashboard-ui/bower_components/emby-webcomponents/requirehtml.js similarity index 100% rename from dashboard-ui/components/requirehtml.js rename to dashboard-ui/bower_components/emby-webcomponents/requirehtml.js diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index 0985b733c6..846bf5c150 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -28,14 +28,14 @@ "iron-component-page": "polymerelements/iron-component-page#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-flex-layout", + "homepage": "https://github.com/polymerelements/iron-flex-layout", "_release": "1.2.2", "_resolution": { "type": "version", "tag": "v1.2.2", "commit": "41c4f35be1368afb770312b907a258175565dbdf" }, - "_source": "git://github.com/PolymerElements/iron-flex-layout.git", + "_source": "git://github.com/polymerelements/iron-flex-layout.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-flex-layout" + "_originalSource": "polymerelements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 3a345338da..29ef578e55 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1835,7 +1835,7 @@ var AppInfo = {}; map: { '*': { 'css': 'components/requirecss', - 'html': 'components/requirehtml' + 'html': bowerPath + '/emby-webcomponents/requirehtml' } }, urlArgs: urlArgs,