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

begin rework of image editor

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-17 12:04:04 -04:00
parent 7ea4d0b4c9
commit 5bccc1840e
53 changed files with 965 additions and 787 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/cordova/fileupload.js vendored
View file

@ -12,7 +12,13 @@
fileEntry.file(function (file) {
var mimeType = file.type;
var mimeType = (file.type || '');
if (mimeType.indexOf('image/') != 0) {
Logger.log('Skipping upload because file is not an image. path: ' + path + ' mimeType: ' + mimeType);
deferred.reject();
return;
}
Logger.log('mimeType for file ' + path + ' is ' + file);
@ -37,7 +43,7 @@
var params = {};
options.params = params;
new FileTransfer().upload(file, url, onSuccess, onFail, options);
new FileTransfer().upload(path, url, onSuccess, onFail, options);
}, function () {
Logger.log('File upload failed. fileEntry.file returned an error');

34
dashboard-ui/cordova/ios/vlcplayer.js vendored
View file

@ -130,6 +130,27 @@
//AndroidVlcPlayer.playAudioVlc(val, JSON.stringify(item), JSON.stringify(mediaSource), options.poster);
var artist = item.ArtistItems && item.ArtistItems.length ? item.ArtistItems[0].Name : null;
var metadata = {};
if (item.Name) {
metadata.title = item.Name;
}
if (artist) {
metadata.artist = artist;
}
if (item.Overview) {
metadata.description = item.Overview;
}
if (options.poster) {
metadata.image = {
url: options.poster
};
metadata.imageThumbnail = {
url: options.poster
};
}
window.audioplayer.playstream(successHandler, function () {
Logger.log('playstream failed!');
@ -139,18 +160,7 @@
ios: val
},
// metadata used for iOS lock screen, Android 'Now Playing' notification
{
"title": item.Name,
"artist": artist,
"image": {
"url": options.poster
},
"imageThumbnail": {
"url": options.poster
},
"name": item.Name,
"description": item.Overview
}
metadata
);
} else {