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 playlist management

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-14 03:03:46 -05:00
parent 893b492cbb
commit 7a6ac9c251
24 changed files with 121 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/homeupcoming.js
View file

@ -38,7 +38,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

2
dashboard-ui/scripts/itembynamedetailpage.js
View file

@ -275,7 +275,7 @@
action: 'playallfromhere',
smallIcon: true,
artist: true,
queueButton: true
addToListButton: true
});
break;

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

@ -73,7 +73,6 @@
item: item,
open: false,
play: false,
queue: false,
playAllFromHere: false,
queueAllFromHere: false,
positionTo: button,
@ -1261,7 +1260,7 @@
image: false,
artist: 'auto',
containerAlbumArtist: item.AlbumArtist,
queueButton: true
addToListButton: true
});
isList = true;
}
@ -1549,6 +1548,9 @@
case 'games':
type = 'Game';
break;
case 'music':
type = 'MusicAlbum';
break;
default:
type = 'Movie';
break;

2
dashboard-ui/scripts/livetvcomponents.js
View file

@ -2,7 +2,7 @@
'use strict';
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getBackdropShape() {

2
dashboard-ui/scripts/livetvschedule.js
View file

@ -2,7 +2,7 @@
'use strict';
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function renderRecordings(elem, recordings, cardOptions) {

2
dashboard-ui/scripts/moviegenres.js
View file

@ -47,7 +47,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

2
dashboard-ui/scripts/musicalbums.js
View file

@ -99,7 +99,7 @@
items: result.Items,
context: 'music',
sortBy: query.SortBy,
queueButton: true
addToListButton: true
});
}
else if (viewStyle == "PosterCard") {

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

@ -186,14 +186,6 @@
view.querySelector('.fldExternalPlayer').classList.add('hide');
}
if (AppInfo.supportsExternalPlayerMenu) {
view.querySelector('.labelNativeExternalPlayers').classList.remove('hide');
view.querySelector('.labelGenericExternalPlayers').classList.add('hide');
} else {
view.querySelector('.labelGenericExternalPlayers').classList.remove('hide');
view.querySelector('.labelNativeExternalPlayers').classList.add('hide');
}
loadPage(view);
});

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

@ -552,26 +552,24 @@
height: imgHeight
})) : null;
if (url === currentImgUrl) {
return;
if (url !== currentImgUrl) {
currentImgUrl = url;
imageLoader.lazyImage(nowPlayingImageElement, url);
}
currentImgUrl = url;
imageLoader.lazyImage(nowPlayingImageElement, url);
userdataButtons.destroy({
element: nowPlayingUserData
});
if (nowPlayingItem.Id) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function(item) {
userdataButtons.fill({
item: item,
includePlayed: false,
element: nowPlayingUserData
});
});
} else {
userdataButtons.destroy({
element: nowPlayingUserData
});
}
}

12
dashboard-ui/scripts/playlists.js
View file

@ -207,6 +207,18 @@
reloadItems();
});
view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
require(['playlistEditor'], function (playlistEditor) {
var serverId = ApiClient.serverInfo().Id;
new playlistEditor().show({
items: [],
serverId: serverId
});
});
});
onViewStyleChange();
};

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

@ -717,7 +717,7 @@ var AppInfo = {};
AppInfo.enableHomeTabs = false;
if (isAndroid) {
AppInfo.supportsExternalPlayerMenu = true;
AppInfo.supportsExternalPlayers = true;
}
}
else {
@ -1003,12 +1003,6 @@ var AppInfo = {};
paths.hlsjs = bowerPath + "/hlsjs/dist/hls.min";
if ((window.chrome && window.chrome.sockets) || Dashboard.isRunningInCordova()) {
paths.serverdiscovery = apiClientBowerPath + "/serverdiscovery-chrome";
} else {
paths.serverdiscovery = apiClientBowerPath + "/serverdiscovery";
}
define("webActionSheet", [embyWebComponentsBowerPath + "/actionsheet/actionsheet"], returnFirstDependency);
if (Dashboard.isRunningInCordova()) {
@ -1367,7 +1361,7 @@ var AppInfo = {};
appSettings.set('externalplayers', val.toString());
}
return appSettings.get('externalplayers') == 'true';
return appSettings.get('externalplayers') === 'true';
};
return appSettings;
@ -1403,6 +1397,16 @@ var AppInfo = {};
define("registerElement", []);
}
if ((window.chrome && window.chrome.sockets)) {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery-chrome"], returnFirstDependency);
} else if (Dashboard.isRunningInCordova() && browser.android) {
define("serverdiscovery", ["cordova/serverdiscovery"], returnFirstDependency);
} else if (Dashboard.isRunningInCordova() && browser.safari) {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery-chrome"], returnFirstDependency);
} else {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery"], returnFirstDependency);
}
if (Dashboard.isRunningInCordova() && browser.safari) {
define("imageFetcher", ['cordova/imagestore'], returnFirstDependency);
} else {

2
dashboard-ui/scripts/songs.js
View file

@ -74,7 +74,7 @@
action: 'playallfromhere',
smallIcon: true,
artist: true,
queueButton: true
addToListButton: true
});
var i, length;

2
dashboard-ui/scripts/tvgenres.js
View file

@ -47,7 +47,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {