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 remote-tracking branch 'upstream/master' into more-es6

Browse source
This commit is contained in:
MrTimscampi 2020-08-06 22:39:11 +02:00
commit 936ff4186d
310 changed files with 9162 additions and 13374 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/backdropScreensaver/plugin.js
View file

@ -23,9 +23,7 @@ class BackdropScreensaver {
const apiClient = connectionManager.currentApiClient();
apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
if (result.Items.length) {
import('slideshow').then(({default: Slideshow}) => {
const newSlideShow = new Slideshow({
showTitle: true,

49
src/plugins/bookPlayer/plugin.js
View file

@ -2,6 +2,7 @@ import connectionManager from 'connectionManager';
import loading from 'loading';
import keyboardnavigation from 'keyboardnavigation';
import dialogHelper from 'dialogHelper';
import dom from 'dom';
import events from 'events';
import 'css!./style';
import 'material-icons';
@ -93,23 +94,22 @@ export class BookPlayer {
onWindowKeyUp(e) {
let key = keyboardnavigation.getKeyName(e);
let rendition = this._rendition;
// TODO: depending on the event this can be the document or the rendition itself
let rendition = this._rendition || this;
let book = rendition.book;
if (this._loaded === false) return;
switch (key) {
case 'l':
case 'ArrowRight':
case 'Right':
if (this._loaded) {
book.package.metadata.direction === 'rtl' ? rendition.prev() : rendition.next();
}
book.package.metadata.direction === 'rtl' ? rendition.prev() : rendition.next();
break;
case 'j':
case 'ArrowLeft':
case 'Left':
if (this._loaded) {
book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev();
}
book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev();
break;
case 'Escape':
if (this._tocElement) {
@ -123,6 +123,25 @@ export class BookPlayer {
}
}
onTouchStart(e) {
// TODO: depending on the event this can be the document or the rendition itself
let rendition = this._rendition || this;
let book = rendition.book;
// check that the event is from the book or the document
if (!book || this._loaded === false) return;
// epubjs stores pages off the screen or something for preloading
// get the modulus of the touch event to account for the increased width
if (!e.touches || e.touches.length === 0) return;
let touch = e.touches[0].clientX % dom.getWindowSize().innerWidth;
if (touch < dom.getWindowSize().innerWidth / 2) {
book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev();
} else {
book.package.metadata.direction === 'rtl' ? rendition.prev() : rendition.next();
}
}
onDialogClosed() {
this.stop();
}
@ -139,8 +158,11 @@ export class BookPlayer {
this.bindMediaElementEvents();
document.addEventListener('keyup', this.onWindowKeyUp);
document.addEventListener('touchstart', this.onTouchStart);
// FIXME: I don't really get why document keyup event is not triggered when epub is in focus
this._rendition.on('keyup', this.onWindowKeyUp);
this._rendition.on('touchstart', this.onTouchStart);
}
unbindMediaElementEvents() {
@ -155,9 +177,13 @@ export class BookPlayer {
if (this._mediaElement) {
this.unbindMediaElementEvents();
}
document.removeEventListener('keyup', this.onWindowKeyUp);
document.removeEventListener('touchstart', this.onTouchStart);
if (this._rendition) {
this._rendition.off('keyup', this.onWindowKeyUp);
this._rendition.off('touchstart', this.onTouchStart);
}
}
@ -169,13 +195,11 @@ export class BookPlayer {
createMediaElement() {
let elem = this._mediaElement;
if (elem) {
return elem;
}
elem = document.getElementById('bookPlayer');
if (!elem) {
elem = dialogHelper.createDialog({
exitAnimationDuration: 400,
@ -185,6 +209,7 @@ export class BookPlayer {
exitAnimation: 'fadeout',
removeOnClose: true
});
elem.id = 'bookPlayer';
let html = '';
@ -222,7 +247,7 @@ export class BookPlayer {
return new Promise((resolve, reject) => {
import('epubjs').then(({default: epubjs}) => {
let downloadHref = apiClient.getItemDownloadUrl(item.Id);
let book = epubjs.default(downloadHref, {openAs: 'epub'});
let book = epubjs(downloadHref, {openAs: 'epub'});
let rendition = book.renderTo(elem, {width: '100%', height: '97%'});
this._currentSrc = downloadHref;
@ -230,6 +255,7 @@ export class BookPlayer {
let cancellationToken = {
shouldCancel: false
};
this._cancellationToken = cancellationToken;
return rendition.display().then(() => {
@ -253,7 +279,6 @@ export class BookPlayer {
epubElem.style.display = 'block';
rendition.on('relocated', (locations) => {
this._progress = book.locations.percentageFromCfi(locations.start.cfi);
events.trigger(this, 'timeupdate');
});
@ -262,7 +287,7 @@ export class BookPlayer {
return resolve();
});
}, () => {
console.error('Failed to display epub');
console.error('failed to display epub');
return reject();
});
});

5
src/plugins/chromecastPlayer/chromecastHelpers.js → src/plugins/chromecastPlayer/chromecastHelper.js
View file

@ -11,7 +11,6 @@ define(['events'], function (events) {
// This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
// http://creativecommons.org/licenses/by-sa/4.0/
(function () {
// Original URL regex from the Android android.text.util.Linkify function, found here:
// http://stackoverflow.com/a/19696443
//
@ -152,14 +151,12 @@ define(['events'], function (events) {
var cache = {};
function isValidIpAddress(address) {
var links = LinkParser.parse(address);
return links.length == 1;
}
function isLocalIpAddress(address) {
address = address.toLowerCase();
if (address.indexOf('127.0.0.1') !== -1) {
@ -173,7 +170,6 @@ define(['events'], function (events) {
}
function getServerAddress(apiClient) {
var serverAddress = apiClient.serverAddress();
if (isValidIpAddress(serverAddress) && !isLocalIpAddress(serverAddress)) {
@ -215,7 +211,6 @@ define(['events'], function (events) {
}
function getCachedValue(key) {
var obj = cache[key];
if (obj && (new Date().getTime() - obj.time) < 180000) {

60
src/plugins/chromecastPlayer/plugin.js
View file

@ -1,6 +1,8 @@
define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', 'globalize', 'events', 'require', 'castSenderApiLoader'], function (appSettings, userSettings, playbackManager, connectionManager, globalize, events, require, castSenderApiLoader) {
'use strict';
playbackManager = playbackManager.default || playbackManager;
// Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
var currentResolve;
var currentReject;
@ -8,7 +10,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
var PlayerName = 'Google Cast';
function sendConnectionResult(isOk) {
var resolve = currentResolve;
var reject = currentReject;
@ -55,12 +56,11 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
// production version registered with google
// replace this value if you want to test changes on another instance
var applicationStable = 'F007D354';
var applicationNightly = '6F511C87';
var applicationUnstable = '6F511C87';
var messageNamespace = 'urn:x-cast:com.connectsdk';
var CastPlayer = function () {
/* device variables */
// @type {DEVICE_STATE} A state for device
this.deviceState = DEVICE_STATE.IDLE;
@ -101,8 +101,8 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
var applicationID = applicationStable;
if (userSettings.chromecastVersion() === 'nightly') {
applicationID = applicationNightly;
if (userSettings.chromecastVersion() === 'unstable') {
applicationID = applicationUnstable;
}
// request session
@ -325,7 +325,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
CastPlayer.prototype.sendMessage = function (message) {
var player = this;
var receiverName = null;
@ -366,7 +365,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
return new Promise(function (resolve, reject) {
require(['chromecastHelper'], function (chromecastHelper) {
require(['./chromecastHelper'], function (chromecastHelper) {
chromecastHelper.getServerAddress(apiClient).then(function (serverAddress) {
message.serverAddress = serverAddress;
player.sendMessageInternal(message).then(resolve, reject);
@ -391,7 +390,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
* @param {Object} mediaSession A new media object.
*/
CastPlayer.prototype.onMediaDiscovered = function (how, mediaSession) {
console.debug('chromecast new media session ID:' + mediaSession.mediaSessionId + ' (' + how + ')');
this.currentMediaSession = mediaSession;
@ -453,9 +451,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
function normalizeImages(state) {
if (state && state.NowPlayingItem) {
var item = state.NowPlayingItem;
if (!item.ImageTags || !item.ImageTags.Primary) {
@ -475,7 +471,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
function getItemsForPlayback(apiClient, query) {
var userId = apiClient.getCurrentUserId();
if (query.Ids && query.Ids.split(',').length === 1) {
@ -486,7 +481,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
});
} else {
query.Limit = query.Limit || 100;
query.ExcludeLocationTypes = 'Virtual';
query.EnableTotalRecordCount = false;
@ -496,9 +490,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
function bindEventForRelay(instance, eventName) {
events.on(instance._castPlayer, eventName, function (e, data) {
console.debug('cc: ' + eventName);
var state = instance.getPlayerStateInternal(data);
@ -507,7 +499,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
function initializeChromecast() {
var instance = this;
instance._castPlayer = new CastPlayer();
@ -519,7 +510,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}));
events.on(instance._castPlayer, 'connect', function (e) {
if (currentResolve) {
sendConnectionResult(true);
} else {
@ -532,7 +522,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
});
events.on(instance._castPlayer, 'playbackstart', function (e, data) {
console.debug('cc: playbackstart');
instance._castPlayer.initializeCastPlayer();
@ -542,7 +531,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
});
events.on(instance._castPlayer, 'playbackstop', function (e, data) {
console.debug('cc: playbackstop');
var state = instance.getPlayerStateInternal(data);
@ -560,7 +548,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
});
events.on(instance._castPlayer, 'playbackprogress', function (e, data) {
console.debug('cc: positionchange');
var state = instance.getPlayerStateInternal(data);
@ -575,7 +562,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
bindEventForRelay(instance, 'shufflequeuemodechange');
events.on(instance._castPlayer, 'playstatechange', function (e, data) {
console.debug('cc: playstatechange');
var state = instance.getPlayerStateInternal(data);
@ -584,7 +570,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}
function ChromecastPlayer() {
// playbackManager needs this
this.name = PlayerName;
this.type = 'mediaplayer';
@ -592,7 +577,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
this.isLocalPlayer = false;
this.lastPlayerData = {};
castSenderApiLoader.load().then(initializeChromecast.bind(this));
new castSenderApiLoader.default().load().then(initializeChromecast.bind(this));
}
ChromecastPlayer.prototype.tryPair = function (target) {
@ -624,7 +609,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
// This is a privately used method
ChromecastPlayer.prototype.getCurrentTargetInfo = function () {
var appName = null;
var castPlayer = this._castPlayer;
@ -661,7 +645,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.getPlayerStateInternal = function (data) {
var triggerStateChange = false;
if (data && !this.lastPlayerData) {
triggerStateChange = true;
@ -682,13 +665,11 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.playWithCommand = function (options, command) {
if (!options.items) {
var apiClient = connectionManager.getApiClient(options.serverId);
var instance = this;
return apiClient.getItem(apiClient.getCurrentUserId(), options.ids[0]).then(function (item) {
options.items = [item];
return instance.playWithCommand(options, command);
});
@ -705,7 +686,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.seek = function (position) {
position = parseInt(position);
position = position / 10000000;
@ -737,7 +717,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.setMaxStreamingBitrate = function (options) {
this._castPlayer.sendMessage({
options: options,
command: 'SetMaxStreamingBitrate'
@ -773,11 +752,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
vol = Math.max(vol, 0);
this._castPlayer.session.setReceiverVolumeLevel(vol);
};
ChromecastPlayer.prototype.endSession = function () {
var instance = this;
this.stop().then(function () {
@ -799,7 +776,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.setVolume = function (vol) {
vol = Math.min(vol, 100);
vol = Math.max(vol, 0);
vol = vol / 100;
@ -836,7 +812,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.displayContent = function (options) {
this._castPlayer.sendMessage({
options: options,
command: 'DisplayContent'
@ -844,7 +819,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.setMute = function (isMuted) {
var castPlayer = this._castPlayer;
if (isMuted) {
@ -873,7 +847,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.playTrailers = function (item) {
this._castPlayer.sendMessage({
options: {
ItemId: item.Id,
@ -902,7 +875,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.toggleMute = function () {
this._castPlayer.sendMessage({
options: {},
command: 'ToggleMute'
@ -946,7 +918,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.getVolume = function () {
var state = this.lastPlayerData || {};
state = state.PlayState || {};
@ -971,7 +942,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.currentTime = function (val) {
if (val != null) {
return this.seek(val);
}
@ -1008,45 +978,36 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.shuffle = function (item) {
var apiClient = connectionManager.getApiClient(item.ServerId);
var userId = apiClient.getCurrentUserId();
var instance = this;
apiClient.getItem(userId, item.Id).then(function (item) {
instance.playWithCommand({
items: [item]
}, 'Shuffle');
});
};
ChromecastPlayer.prototype.instantMix = function (item) {
var apiClient = connectionManager.getApiClient(item.ServerId);
var userId = apiClient.getCurrentUserId();
var instance = this;
apiClient.getItem(userId, item.Id).then(function (item) {
instance.playWithCommand({
items: [item]
}, 'InstantMix');
});
};
ChromecastPlayer.prototype.canPlayMediaType = function (mediaType) {
mediaType = (mediaType || '').toLowerCase();
return mediaType === 'audio' || mediaType === 'video';
};
@ -1064,13 +1025,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.play = function (options) {
if (options.items) {
return this.playWithCommand(options, 'PlayNow');
} else {
if (!options.serverId) {
throw new Error('serverId required!');
}
@ -1083,10 +1040,8 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
Ids: options.ids.join(',')
}).then(function (result) {
options.items = result.Items;
return instance.playWithCommand(options, 'PlayNow');
});
}
};
@ -1119,7 +1074,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
};
ChromecastPlayer.prototype.getPlayerState = function () {
return this.getPlayerStateInternal() || {};
};

15
src/plugins/experimentalWarnings/plugin.js
View file

@ -1,14 +1,7 @@
define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (connectionManager, globalize, userSettings, appHost) {
'use strict';
function getRequirePromise(deps) {
return new Promise(function (resolve, reject) {
require(deps, resolve);
});
}
// TODO: Replace with date-fns
// https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
function getWeek(date) {
var d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
@ -19,13 +12,13 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
}
function showMessage(text, userSettingsKey, appHostFeature) {
if (appHost.supports(appHostFeature)) {
return Promise.resolve();
}
var now = new Date();
// TODO: Use date-fns
userSettingsKey += now.getFullYear() + '-w' + getWeek(now);
if (userSettings.get(userSettingsKey, false) === '1') {
@ -33,11 +26,9 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
}
return new Promise(function (resolve, reject) {
userSettings.set(userSettingsKey, '1', false);
require(['alert'], function (alert) {
return alert(text).then(resolve, resolve);
});
});
@ -56,14 +47,12 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
}
function ExpirementalPlaybackWarnings() {
this.name = 'Experimental playback warnings';
this.type = 'preplayintercept';
this.id = 'expirementalplaybackwarnings';
}
ExpirementalPlaybackWarnings.prototype.intercept = function (options) {
var item = options.item;
if (!item) {
return Promise.resolve();

31
src/plugins/htmlAudioPlayer/plugin.js
View file

@ -68,7 +68,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
// issue head request to get content type
return new Promise(function (resolve, reject) {
require(['fetchHelper'], function (fetchHelper) {
fetchHelper.ajax({
url: url,
@ -96,7 +95,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
self.priority = 1;
self.play = function (options) {
self._started = false;
self._timeUpdated = false;
self._currentTime = null;
@ -106,7 +104,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
function setCurrentSrc(elem, options) {
elem.removeEventListener('error', onError);
unBindEvents(elem);
@ -131,17 +128,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
return enableHlsPlayer(val, options.item, options.mediaSource, 'Audio').then(function () {
return new Promise(function (resolve, reject) {
requireHlsPlayer(function () {
var hls = new Hls({
manifestLoadingTimeOut: 20000,
xhrSetup: function(xhr, url) {
xhr.withCredentials = true;
}
//appendErrorMaxRetry: 6,
//debug: true
});
hls.loadSource(val);
hls.attachMedia(elem);
@ -153,16 +146,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
self._currentSrc = val;
});
});
}, function () {
elem.autoplay = true;
// Safari will not send cookies without this
elem.crossOrigin = 'use-credentials';
return htmlMediaHelper.applySrc(elem, val, options).then(function () {
self._currentSrc = val;
return htmlMediaHelper.playWithPromise(elem, onError);
@ -191,16 +181,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
self.stop = function (destroyPlayer) {
cancelFadeTimeout();
var elem = self._mediaElement;
var src = self._currentSrc;
if (elem && src) {
if (!destroyPlayer || !supportsFade()) {
elem.pause();
htmlMediaHelper.onEndedInternal(self, elem, onError);
@ -214,7 +201,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
var originalVolume = elem.volume;
return fade(self, elem, elem.volume).then(function () {
elem.pause();
elem.volume = originalVolume;
@ -233,7 +219,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
function createMediaElement() {
var elem = self._mediaElement;
if (elem) {
@ -258,12 +243,10 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onEnded() {
htmlMediaHelper.onEndedInternal(self, this, onError);
}
function onTimeUpdate() {
// Get the player position + the transcoding offset
var time = this.currentTime;
@ -275,7 +258,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onVolumeChange() {
if (!self._isFadingOut) {
htmlMediaHelper.saveVolume(this.volume);
events.trigger(self, 'volumechange');
@ -283,7 +265,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onPlaying(e) {
if (!self._started) {
self._started = true;
this.removeAttribute('controls');
@ -294,7 +275,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onPlay(e) {
events.trigger(self, 'unpause');
}
@ -307,7 +287,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onError() {
var errorCode = this.error ? (this.error.code || 0) : 0;
var errorMessage = this.error ? (this.error.message || '') : '';
console.error('media element error: ' + errorCode.toString() + ' ' + errorMessage);
@ -351,12 +330,10 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
HtmlAudioPlayer.prototype.canPlayMediaType = function (mediaType) {
return (mediaType || '').toLowerCase() === 'audio';
};
HtmlAudioPlayer.prototype.getDeviceProfile = function (item) {
if (appHost.getDeviceProfile) {
return appHost.getDeviceProfile(item);
}
@ -366,7 +343,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
// Save this for when playback stops, because querying the time at that point might return 0
HtmlAudioPlayer.prototype.currentTime = function (val) {
var mediaElement = this._mediaElement;
if (mediaElement) {
if (val != null) {
@ -384,7 +360,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
HtmlAudioPlayer.prototype.duration = function (val) {
var mediaElement = this._mediaElement;
if (mediaElement) {
var duration = mediaElement.duration;
@ -399,10 +374,8 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
HtmlAudioPlayer.prototype.seekable = function () {
var mediaElement = this._mediaElement;
if (mediaElement) {
var seekable = mediaElement.seekable;
if (seekable && seekable.length) {
var start = seekable.start(0);
var end = seekable.end(0);
@ -423,7 +396,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
HtmlAudioPlayer.prototype.getBufferedRanges = function () {
var mediaElement = this._mediaElement;
if (mediaElement) {
return htmlMediaHelper.getBufferedRanges(this, mediaElement);
}
@ -453,7 +425,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
HtmlAudioPlayer.prototype.paused = function () {
var mediaElement = this._mediaElement;
if (mediaElement) {
return mediaElement.paused;
@ -487,7 +458,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
HtmlAudioPlayer.prototype.getVolume = function () {
var mediaElement = this._mediaElement;
if (mediaElement) {
return Math.min(Math.round(mediaElement.volume * 100), 100);
}
};
@ -501,7 +471,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
HtmlAudioPlayer.prototype.setMute = function (mute) {
var mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.muted = mute;

1724
src/plugins/htmlVideoPlayer/plugin.js
View file

File diff suppressed because it is too large Load diff

15
src/plugins/htmlVideoPlayer/style.css
View file

@ -33,16 +33,22 @@ video::-webkit-media-controls {
text-shadow: 0.14em 0.14em 0.14em rgba(0, 0, 0, 1);
-webkit-font-smoothing: antialiased;
font-family: inherit;
line-height: normal; /* Restore value. See -webkit-media-text-track-container 'line-height' */
}
.htmlvideoplayer-moveupsubtitles::-webkit-media-text-track-display {
/* style the text itself */
margin-top: -2em;
.htmlvideoplayer::-webkit-media-text-track-container {
font-size: 170% !important; /* Override element inline style */
line-height: 50%; /* Child element cannot set line height smaller than its parent has. This allow smaller values for children */
}
.htmlvideoplayer::-webkit-media-text-track-display {
max-width: 70%;
margin-left: 15%;
}
.videoSubtitles {
position: fixed;
bottom: 10%;
bottom: 0;
text-align: center;
left: 0;
right: 0;
@ -53,7 +59,6 @@ video::-webkit-media-controls {
.videoSubtitlesInner {
max-width: 70%;
background-color: rgba(0, 0, 0, 0.8);
padding: 0.25em;
margin: auto;
display: inline-block;
}

27
src/plugins/logoScreensaver/plugin.js
View file

@ -1,7 +1,5 @@
define(['pluginManager'], function (pluginManager) {
return function () {
var self = this;
self.name = 'Logo ScreenSaver';
@ -12,7 +10,6 @@ define(['pluginManager'], function (pluginManager) {
var interval;
function animate() {
var animations = [
bounceInLeft,
@ -59,23 +56,6 @@ define(['pluginManager'], function (pluginManager) {
return elem.animate(keyframes, timing);
}
function shake(elem, iterations) {
var keyframes = [
{ transform: 'translate3d(0, 0, 0)', offset: 0 },
{ transform: 'translate3d(-10px, 0, 0)', offset: 0.1 },
{ transform: 'translate3d(10px, 0, 0)', offset: 0.2 },
{ transform: 'translate3d(-10px, 0, 0)', offset: 0.3 },
{ transform: 'translate3d(10px, 0, 0)', offset: 0.4 },
{ transform: 'translate3d(-10px, 0, 0)', offset: 0.5 },
{ transform: 'translate3d(10px, 0, 0)', offset: 0.6 },
{ transform: 'translate3d(-10px, 0, 0)', offset: 0.7 },
{ transform: 'translate3d(10px, 0, 0)', offset: 0.8 },
{ transform: 'translate3d(-10px, 0, 0)', offset: 0.9 },
{ transform: 'translate3d(0, 0, 0)', offset: 1 }];
var timing = { duration: 900, iterations: iterations };
return elem.animate(keyframes, timing);
}
function swing(elem, iterations) {
var keyframes = [
{ transform: 'translate(0%)', offset: 0 },
@ -118,7 +98,6 @@ define(['pluginManager'], function (pluginManager) {
}
function rotateIn(elem, iterations) {
var transformOrigin = elem.style['transform-origin'];
var keyframes = [{ transform: 'rotate3d(0, 0, 1, -200deg)', opacity: '0', transformOrigin: 'center', offset: 0 },
{ transform: 'none', opacity: '1', transformOrigin: 'center', offset: 1 }];
var timing = { duration: 900, iterations: iterations };
@ -126,12 +105,10 @@ define(['pluginManager'], function (pluginManager) {
}
function rotateOut(elem, iterations) {
var transformOrigin = elem.style['transform-origin'];
var keyframes = [{ transform: 'none', opacity: '1', transformOrigin: 'center', offset: 0 },
{ transform: 'rotate3d(0, 0, 1, 200deg)', opacity: '0', transformOrigin: 'center', offset: 1 }];
var timing = { duration: 900, iterations: iterations };
return elem.animate(keyframes, timing);
}
function fadeOut(elem, iterations) {
@ -150,9 +127,7 @@ define(['pluginManager'], function (pluginManager) {
}
self.show = function () {
require(['css!' + pluginManager.mapPath(self, 'style.css')], function () {
var elem = document.querySelector('.logoScreenSaver');
if (!elem) {
@ -169,13 +144,11 @@ define(['pluginManager'], function (pluginManager) {
};
self.hide = function () {
stopInterval();
var elem = document.querySelector('.logoScreenSaver');
if (elem) {
var onAnimationFinish = function () {
elem.parentNode.removeChild(elem);
};

41
src/plugins/sessionPlayer/plugin.js
View file

@ -2,6 +2,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
'use strict';
serverNotifications = serverNotifications.default || serverNotifications;
playbackManager = playbackManager.default || playbackManager;
function getActivePlayerId() {
var info = playbackManager.getPlayerInfo();
@ -9,7 +10,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function sendPlayCommand(apiClient, options, playType) {
var sessionId = getActivePlayerId();
var ids = options.ids || options.items.map(function (i) {
@ -46,14 +46,12 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function sendPlayStateCommand(apiClient, command, options) {
var sessionId = getActivePlayerId();
apiClient.sendPlayStateCommand(sessionId, command, options);
}
function getCurrentApiClient(instance) {
var currentServerId = instance.currentServerId;
if (currentServerId) {
@ -64,7 +62,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function sendCommandByName(instance, name, options) {
var command = {
Name: name
};
@ -77,7 +74,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function unsubscribeFromPlayerUpdates(instance) {
instance.isUpdating = true;
var apiClient = getCurrentApiClient(instance);
@ -89,7 +85,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function processUpdatedSessions(instance, sessions, apiClient) {
var serverId = apiClient.serverId();
sessions.map(function (s) {
@ -105,7 +100,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
})[0];
if (session) {
normalizeImages(session, apiClient);
var eventNames = getChangedEvents(instance.lastPlayerData, session);
@ -114,9 +108,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
for (var i = 0, length = eventNames.length; i < length; i++) {
events.trigger(instance, eventNames[i], [session]);
}
} else {
instance.lastPlayerData = session;
playbackManager.setDefaultPlayerActive();
@ -124,7 +116,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function getChangedEvents(state1, state2) {
var names = [];
if (!state1) {
@ -144,11 +135,9 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function onPollIntervalFired() {
var instance = this;
var apiClient = getCurrentApiClient(instance);
if (!apiClient.isMessageChannelOpen()) {
apiClient.getSessions().then(function (sessions) {
processUpdatedSessions(instance, sessions, apiClient);
});
@ -156,7 +145,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function subscribeToPlayerUpdates(instance) {
instance.isUpdating = true;
var apiClient = getCurrentApiClient(instance);
@ -169,9 +157,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function normalizeImages(state, apiClient) {
if (state && state.NowPlayingItem) {
var item = state.NowPlayingItem;
if (!item.ImageTags || !item.ImageTags.Primary) {
@ -194,7 +180,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
function SessionPlayer() {
var self = this;
this.name = 'Remote Control';
@ -208,11 +193,9 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}
SessionPlayer.prototype.beginPlayerUpdates = function () {
this.playerListenerCount = this.playerListenerCount || 0;
if (this.playerListenerCount <= 0) {
this.playerListenerCount = 0;
subscribeToPlayerUpdates(this);
@ -222,24 +205,20 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.endPlayerUpdates = function () {
this.playerListenerCount = this.playerListenerCount || 0;
this.playerListenerCount--;
if (this.playerListenerCount <= 0) {
unsubscribeFromPlayerUpdates(this);
this.playerListenerCount = 0;
}
};
SessionPlayer.prototype.getPlayerState = function () {
return this.lastPlayerData || {};
};
SessionPlayer.prototype.getTargets = function () {
var apiClient = getCurrentApiClient(this);
var sessionQuery = {
@ -247,14 +226,11 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
if (apiClient) {
var name = this.name;
return apiClient.getSessions(sessionQuery).then(function (sessions) {
return sessions.filter(function (s) {
return s.DeviceId !== apiClient.deviceId();
}).map(function (s) {
return {
name: s.DeviceName,
@ -275,16 +251,13 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
} : null
};
});
});
} else {
return Promise.resolve([]);
}
};
SessionPlayer.prototype.sendCommand = function (command) {
var sessionId = getActivePlayerId();
var apiClient = getCurrentApiClient(this);
@ -292,7 +265,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.play = function (options) {
options = Object.assign({}, options);
if (options.items) {
@ -307,27 +279,22 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.shuffle = function (item) {
sendPlayCommand(getCurrentApiClient(this), { ids: [item.Id] }, 'PlayShuffle');
};
SessionPlayer.prototype.instantMix = function (item) {
sendPlayCommand(getCurrentApiClient(this), { ids: [item.Id] }, 'PlayInstantMix');
};
SessionPlayer.prototype.queue = function (options) {
sendPlayCommand(getCurrentApiClient(this), options, 'PlayNext');
};
SessionPlayer.prototype.queueNext = function (options) {
sendPlayCommand(getCurrentApiClient(this), options, 'PlayLast');
};
SessionPlayer.prototype.canPlayMediaType = function (mediaType) {
mediaType = (mediaType || '').toLowerCase();
return mediaType === 'audio' || mediaType === 'video';
};
@ -356,7 +323,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.currentTime = function (val) {
if (val != null) {
return this.seek(val);
}
@ -403,7 +369,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.setMute = function (isMuted) {
if (isMuted) {
sendCommandByName(this, 'Mute');
} else {
@ -502,14 +467,12 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.setRepeatMode = function (mode) {
sendCommandByName(this, 'SetRepeatMode', {
RepeatMode: mode
});
};
SessionPlayer.prototype.setQueueShuffleMode = function (mode) {
sendCommandByName(this, 'SetShuffleQueue', {
ShuffleMode: mode
});
@ -520,7 +483,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.displayContent = function (options) {
sendCommandByName(this, 'DisplayContent', options);
};
@ -557,7 +519,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
};
SessionPlayer.prototype.tryPair = function (target) {
return Promise.resolve();
};

39
src/plugins/youtubePlayer/plugin.js
View file

@ -1,4 +1,3 @@
import require from 'require';
import events from 'events';
import browser from 'browser';
import appRouter from 'appRouter';
@ -17,15 +16,11 @@ function zoomIn(elem, iterations) {
}
function createMediaElement(instance, options) {
return new Promise(function (resolve, reject) {
const dlg = document.querySelector('.youtubePlayerContainer');
if (!dlg) {
import('css!./style').then(() => {
loading.show();
const dlg = document.createElement('div');
@ -49,9 +44,7 @@ function createMediaElement(instance, options) {
} else {
resolve(videoElement);
}
});
} else {
resolve(dlg.querySelector('#player'));
}
@ -75,7 +68,6 @@ function clearTimeUpdateInterval(instance) {
}
function onEndedInternal(instance) {
clearTimeUpdateInterval(instance);
const resizeListener = instance.resizeListener;
if (resizeListener) {
@ -103,43 +95,34 @@ function onPlayerReady(event) {
}
function onTimeUpdate(e) {
events.trigger(this, 'timeupdate');
}
function onPlaying(instance, playOptions, resolve) {
if (!instance.started) {
instance.started = true;
resolve();
clearTimeUpdateInterval(instance);
instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
if (playOptions.fullscreen) {
appRouter.showVideoOsd().then(function () {
instance.videoDialog.classList.remove('onTop');
});
} else {
appRouter.setTransparency('backdrop');
instance.videoDialog.classList.remove('onTop');
}
import('loading').then(({default: loading}) => {
loading.hide();
});
}
}
function setCurrentSrc(instance, elem, options) {
return new Promise(function (resolve, reject) {
import('queryString').then(({default: queryString}) => {
instance._currentSrc = options.url;
const params = queryString.parse(options.url.split('?')[1]);
// 3. This function creates an <iframe> (and YouTube player)
@ -193,13 +176,11 @@ function setCurrentSrc(instance, elem, options) {
window.onYouTubeIframeAPIReady();
}
});
});
}
class YoutubePlayer {
constructor() {
this.name = 'Youtube Player';
this.type = 'mediaplayer';
this.id = 'youtubeplayer';
@ -208,21 +189,17 @@ class YoutubePlayer {
this.priority = 1;
}
play(options) {
this.started = false;
const instance = this;
return createMediaElement(this, options).then(function (elem) {
return setCurrentSrc(instance, elem, options);
});
}
stop(destroyPlayer) {
const src = this._currentSrc;
if (src) {
if (this.currentYoutubePlayer) {
this.currentYoutubePlayer.stopVideo();
}
@ -236,34 +213,28 @@ class YoutubePlayer {
return Promise.resolve();
}
destroy() {
appRouter.setTransparency('none');
const dlg = this.videoDialog;
if (dlg) {
this.videoDialog = null;
dlg.parentNode.removeChild(dlg);
}
}
canPlayMediaType(mediaType) {
mediaType = (mediaType || '').toLowerCase();
return mediaType === 'audio' || mediaType === 'video';
}
canPlayItem(item) {
// Does not play server items
return false;
}
canPlayUrl(url) {
return url.toLowerCase().indexOf('youtube.com') !== -1;
}
getDeviceProfile() {
return Promise.resolve({});
}
currentSrc() {
@ -278,7 +249,6 @@ class YoutubePlayer {
}
// Save this for when playback stops, because querying the time at that point might return 0
currentTime(val) {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -291,7 +261,6 @@ class YoutubePlayer {
}
}
duration(val) {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -300,7 +269,6 @@ class YoutubePlayer {
return null;
}
pause() {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -315,7 +283,6 @@ class YoutubePlayer {
}
}
unpause() {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -330,7 +297,6 @@ class YoutubePlayer {
}
}
paused() {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -347,7 +313,6 @@ class YoutubePlayer {
return this.getVolume();
}
setVolume(val) {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -357,7 +322,6 @@ class YoutubePlayer {
}
}
getVolume() {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {
@ -365,7 +329,6 @@ class YoutubePlayer {
}
}
setMute(mute) {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (mute) {
@ -373,14 +336,12 @@ class YoutubePlayer {
currentYoutubePlayer.mute();
}
} else {
if (currentYoutubePlayer) {
currentYoutubePlayer.unMute();
}
}
}
isMuted() {
const currentYoutubePlayer = this.currentYoutubePlayer;
if (currentYoutubePlayer) {