From c6c6ec116a388651366e874f2f2129fe9c57e470 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 31 Jul 2016 01:25:54 -0400 Subject: [PATCH] update identifier --- .../emby-webcomponents/.bower.json | 8 ++-- .../itemidentifier/itemidentifier.js | 2 + .../itemidentifier.template.html | 5 ++- .../emby-webcomponents/strings/en-US.json | 4 +- .../bower_components/iron-icon/.bower.json | 6 +-- .../bower_components/iron-meta/.bower.json | 6 +-- dashboard-ui/scripts/itemdetailpage.js | 20 +++++---- dashboard-ui/scripts/librarybrowser.js | 42 ------------------- 8 files changed, 28 insertions(+), 65 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index b509d9891..7fca9d35a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.137", - "_release": "1.4.137", + "version": "1.4.138", + "_release": "1.4.138", "_resolution": { "type": "version", - "tag": "1.4.137", - "commit": "db46115f2b51107bb01be383bb914d392a4a91f2" + "tag": "1.4.138", + "commit": "47e65115a8237bac098ba2987c894a16c1ce2744" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js index a314e3423..ae75eab55 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js @@ -88,6 +88,7 @@ page.querySelector('.popupIdentifyForm').classList.add('hide'); identificationSearchResults.classList.remove('hide'); page.querySelector('.identifyOptionsForm').classList.add('hide'); + page.querySelector('.dialogContentInner').classList.remove('centeredContent'); var html = ''; var i, length; @@ -139,6 +140,7 @@ page.querySelector('.identificationSearchResults').classList.add('hide'); identifyOptionsForm.classList.remove('hide'); page.querySelector('#chkIdentifyReplaceImages').checked = true; + page.querySelector('.dialogContentInner').classList.add('centeredContent'); currentSearchResult = identifyResult; diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html index 70d9a95a6..c5213f6e9 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html @@ -27,9 +27,10 @@

-
+
-
+

${SearchResults}

+
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index d491aa994..f6c6d58a3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -245,6 +245,6 @@ "ValueMinutes": "{0} min", "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.", "PleaseEnterNameOrId": "Please enter a name or an external Id.", - "MessageItemSaved": "Item saved." - + "MessageItemSaved": "Item saved.", + "SearchResults": "Search Results" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index eeaddfa5d..f3338bba5 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-icon", + "homepage": "https://github.com/PolymerElements/iron-icon", "_release": "1.0.9", "_resolution": { "type": "version", "tag": "v1.0.9", "commit": "f6fb241901377e30e2c9c6cd47e3e8e8beb6574d" }, - "_source": "git://github.com/polymerelements/iron-icon.git", + "_source": "git://github.com/PolymerElements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icon" + "_originalSource": "PolymerElements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index f4bfef4a7..e1304d174 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/polymerelements/iron-meta", + "homepage": "https://github.com/PolymerElements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_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/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 0a06c1bbc..ad1e0e412 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -2090,14 +2090,6 @@ elems[i].addEventListener('click', onMoreCommandsClick); } - var childrenItemsContainer = view.querySelector('.childrenItemsContainer'); - childrenItemsContainer.addEventListener('playallfromhere', function (e) { - LibraryBrowser.playAllFromHere(_childrenItemsFunction, e.detail.index); - }); - childrenItemsContainer.addEventListener('queueallfromhere', function (e) { - LibraryBrowser.queueAllFromHere(_childrenItemsFunction, e.detail.index); - }); - view.addEventListener('click', function (e) { if (dom.parentWithClass(e.target, 'moreScenes')) { @@ -2123,10 +2115,20 @@ renderChildren(view, currentItem); }); + function editImages() { + return new Promise(function (resolve, reject) { + + require(['components/imageeditor/imageeditor'], function (ImageEditor) { + + ImageEditor.show(currentItem.Id).then(resolve, reject); + }); + }); + } + view.querySelector('.detailImageContainer').addEventListener('click', function (e) { var itemDetailGalleryLink = dom.parentWithClass(e.target, 'itemDetailGalleryLink'); if (itemDetailGalleryLink) { - LibraryBrowser.editImages(currentItem.Id).then(function () { + editImages().then(function () { reload(view, params); }); } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 43833fed2..5514ae2a9 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -354,37 +354,6 @@ } }, - getDateParamValue: function (date) { - - function formatDigit(i) { - return i < 10 ? "0" + i : i; - } - - var d = date; - - return "" + d.getFullYear() + formatDigit(d.getMonth() + 1) + formatDigit(d.getDate()) + formatDigit(d.getHours()) + formatDigit(d.getMinutes()) + formatDigit(d.getSeconds()); - }, - - playAllFromHere: function (fn, index) { - - fn(index, 100, "MediaSources,Chapters").then(function (result) { - - MediaController.play({ - items: result.Items - }); - }); - }, - - queueAllFromHere: function (query, index) { - - fn(index, 100, "MediaSources,Chapters").then(function (result) { - - MediaController.queue({ - items: result.Items - }); - }); - }, - getArtistLinksHtml: function (artists, cssClass) { var html = []; @@ -410,17 +379,6 @@ }); }, - editImages: function (itemId) { - - return new Promise(function (resolve, reject) { - - require(['components/imageeditor/imageeditor'], function (ImageEditor) { - - ImageEditor.show(itemId).then(resolve, reject); - }); - }); - }, - getHref: function (item, context, topParentId) { var href = LibraryBrowser.getHrefInternal(item, context);