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

Merge pull request #1269 from jellyfin/photos

Browse source 
Convert photo player to class
This commit is contained in:
dkanada 2020-05-30 20:47:13 +09:00 • committed by GitHub
commit 19849d8afb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -113,6 +113,7 @@
"src/components/actionSheet/actionSheet.js", "src/components/actionSheet/actionSheet.js",
"src/components/playmenu.js", "src/components/playmenu.js",
"src/components/indicators/indicators.js", "src/components/indicators/indicators.js",
"src/components/photoPlayer/plugin.js",
"src/scripts/keyboardNavigation.js", "src/scripts/keyboardNavigation.js",
"src/scripts/settings/appSettings.js", "src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js", "src/scripts/settings/userSettings.js",

33
src/components/photoPlayer/plugin.js
View file

@ -1,23 +1,18 @@
define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackManager', 'appRouter', 'appSettings', 'connectionManager'], function (browser, require, events, appHost, loading, dom, playbackManager, appRouter, appSettings, connectionManager) { import connectionManager from 'connectionManager';
'use strict';
function PhotoPlayer() { export default class PhotoPlayer {
constructor() {
var self = this; this.name = 'Photo Player';
this.type = 'mediaplayer';
self.name = 'Photo Player'; this.id = 'photoplayer';
self.type = 'mediaplayer'; this.priority = 1;
self.id = 'photoplayer';
// Let any players created by plugins take priority
self.priority = 1;
} }
PhotoPlayer.prototype.play = function (options) { play(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['slideshow'], function (slideshow) { import('slideshow').then(({default: slideshow}) => {
var index = options.startIndex || 0; var index = options.startIndex || 0;
@ -41,12 +36,10 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
}); });
}); });
}); });
}; }
PhotoPlayer.prototype.canPlayMediaType = function (mediaType) { canPlayMediaType(mediaType) {
return (mediaType || '').toLowerCase() === 'photo'; return (mediaType || '').toLowerCase() === 'photo';
}; }
}
return PhotoPlayer;
});