mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update identifier

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-31 01:25:54 -04:00
parent bb142cf26e
commit c6c6ec116a
8 changed files with 28 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -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",

2
dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js vendored
View file

@ -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;

5
dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html vendored
View file

@ -27,9 +27,10 @@
</button>
</p>
</form>
<div class="identificationSearchResults hide" style="text-align: center;">
<div class="identificationSearchResults hide">
<div class="identificationSearchResultList itemsContainer vertical-wrap"></div>
<h1>${SearchResults}</h1>
<div class="identificationSearchResultList itemsContainer vertical-wrap centered"></div>
</div>
<form class="identifyOptionsForm hide" style="margin:auto;">

4
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -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"
}

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View file

@ -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"
}

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -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"
}

20
dashboard-ui/scripts/itemdetailpage.js
View file

@ -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);
});
}

42
dashboard-ui/scripts/librarybrowser.js
View file

@ -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);