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 slideshow

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-18 01:58:08 -04:00
parent 1c296d8d87
commit 658f5052da
32 changed files with 834 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -769,7 +769,7 @@
}
if (item.CanDownload) {
if (AppInfo.supportsDownloading) {
if (appHost.supports('filedownload')) {
commands.push('download');
}
}
@ -987,7 +987,8 @@
api_key: ApiClient.accessToken()
});
fileDownloader([{
fileDownloader.download([
{
url: downloadHref,
itemId: itemId
}]);

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

@ -1,4 +1,4 @@
define(['appSettings', 'appStorage', 'libraryBrowser', 'jQuery'], function (appSettings, appStorage, LibraryBrowser, $) {
define(['appSettings', 'appStorage', 'libraryBrowser', 'apphost', 'jQuery'], function (appSettings, appStorage, LibraryBrowser, appHost, $) {
var showOverlayTimeout;
@ -270,7 +270,7 @@
});
}
if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
if (mediaType) {
items.push({
name: Globalize.translate('ButtonDownload'),
@ -491,7 +491,8 @@
api_key: ApiClient.accessToken()
});
fileDownloader([{
fileDownloader.download([
{
url: downloadHref,
itemId: itemId
}]);
@ -1143,7 +1144,7 @@
});
}
if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
//items.push({
// name: Globalize.translate('ButtonDownload'),
// id: 'download',
@ -1214,7 +1215,7 @@
combineVersions($.mobile.activePage, items);
break;
case 'markplayed':
items.forEach(function(itemId) {
items.forEach(function (itemId) {
ApiClient.markPlayed(Dashboard.getCurrentUserId(), itemId);
});
hideSelections();

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

@ -1383,8 +1383,6 @@ var AppInfo = {};
// This doesn't perform well on iOS
AppInfo.enableHeadRoom = !isIOS;
AppInfo.supportsDownloading = !(AppInfo.isNativeApp && isIOS);
// This currently isn't working on android, unfortunately
AppInfo.supportsFileInput = !(AppInfo.isNativeApp && isAndroid);
@ -1696,8 +1694,10 @@ var AppInfo = {};
// hack for an android test before browserInfo is loaded
if (Dashboard.isRunningInCordova() && window.MainActivity) {
paths.appStorage = "cordova/android/appstorage";
paths.apphost = "cordova/apphost";
} else {
paths.appStorage = apiClientBowerPath + "/appstorage";
paths.apphost = "components/apphost";
}
paths.playlistManager = "scripts/playlistmanager";
@ -1974,10 +1974,12 @@ var AppInfo = {};
define("loading", [embyWebComponentsBowerPath + "/loading/loading-lite"], returnFirstDependency);
}
define("multi-download", [bowerPath + '/multi-download/browser'], returnFirstDependency);
if (Dashboard.isRunningInCordova() && browser.android) {
define("fileDownloader", ['cordova/android/filedownloader'], returnFirstDependency);
} else {
define("fileDownloader", ['components/filedownloader'], returnFirstDependency);
define("fileDownloader", [embyWebComponentsBowerPath + '/filedownloader'], returnFirstDependency);
}
}