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

use shared collectioneditor

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-21 22:28:47 -04:00
parent 57631a11ff
commit 6f2b1c2ef8
9 changed files with 447 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -929,9 +929,12 @@
});
break;
case 'addtocollection':
require(['collectioneditor'], function (collectioneditor) {
require(['collectionEditor'], function (collectionEditor) {
new collectioneditor().show([itemId]);
new collectionEditor().show({
items: [itemId],
serverId: serverId
});
});
break;
case 'playlist':

13
dashboard-ui/scripts/librarylist.js
View file

@ -494,9 +494,12 @@
switch (id) {
case 'addtocollection':
require(['collectioneditor'], function (collectioneditor) {
require(['collectionEditor'], function (collectionEditor) {
new collectioneditor().show([itemId]);
new collectionEditor().show({
items: [itemId],
serverId: serverId
});
});
break;
case 'playlist':
@ -1232,9 +1235,11 @@
switch (id) {
case 'addtocollection':
require(['collectioneditor'], function (collectioneditor) {
require(['collectionEditor'], function (collectionEditor) {
new collectioneditor().show(items);
new collectionEditor().show({
items: items
});
});
hideSelections();
break;

8
dashboard-ui/scripts/moviecollections.js
View file

@ -189,9 +189,13 @@
// The button is created dynamically
$('.btnNewCollection', tabContent).on('click', function () {
require(['collectioneditor'], function (collectioneditor) {
require(['collectionEditor'], function (collectionEditor) {
new collectioneditor().show();
var serverId = ApiClient.serverInfo().Id;
new collectionEditor().show({
items: [],
serverId: serverId
});
});
});

3
dashboard-ui/scripts/site.js
View file

@ -1709,7 +1709,6 @@ var AppInfo = {};
ironCardList: 'components/ironcardlist/ironcardlist',
scrollThreshold: 'components/scrollthreshold',
directorybrowser: 'components/directorybrowser/directorybrowser',
collectioneditor: 'components/collectioneditor/collectioneditor',
playlisteditor: 'components/playlisteditor/playlisteditor',
medialibrarycreator: 'components/medialibrarycreator/medialibrarycreator',
medialibraryeditor: 'components/medialibraryeditor/medialibraryeditor',
@ -1768,11 +1767,13 @@ var AppInfo = {};
define("libjass", [bowerPath + "/libjass/libjass", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
define("collectionEditor", [embyWebComponentsBowerPath + "/collectioneditor/collectioneditor"], returnFirstDependency);
define("recordingCreator", [embyWebComponentsBowerPath + "/recordingcreator/recordingcreator"], returnFirstDependency);
define("recordingEditor", [embyWebComponentsBowerPath + "/recordingcreator/recordingeditor"], returnFirstDependency);
define("mediaInfo", [embyWebComponentsBowerPath + "/mediainfo/mediainfo"], returnFirstDependency);
define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency);
define("fetchHelper", [embyWebComponentsBowerPath + "/fetchhelper"], returnFirstDependency);
define("emby-select", [embyWebComponentsBowerPath + "/emby-select/emby-select"], returnFirstDependency);
define("tvguide", [embyWebComponentsBowerPath + "/guide/guide", 'embyRouter'], returnFirstDependency);