mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Migration of toast and upnextdialog to ES6 modules
This commit is contained in:
parent
454b81a037
commit
b6dfeb59fc
3 changed files with 60 additions and 48 deletions
|
@ -156,6 +156,8 @@
|
||||||
"src/components/syncPlay/playbackPermissionManager.js",
|
"src/components/syncPlay/playbackPermissionManager.js",
|
||||||
"src/components/syncPlay/syncPlayManager.js",
|
"src/components/syncPlay/syncPlayManager.js",
|
||||||
"src/components/syncPlay/timeSyncManager.js",
|
"src/components/syncPlay/timeSyncManager.js",
|
||||||
|
"src/components/toast/toast.js",
|
||||||
|
"src/components/upnextdialog/upnextdialog.js",
|
||||||
"src/controllers/session/addServer/index.js",
|
"src/controllers/session/addServer/index.js",
|
||||||
"src/controllers/session/forgotPassword/index.js",
|
"src/controllers/session/forgotPassword/index.js",
|
||||||
"src/controllers/session/redeemPassword/index.js",
|
"src/controllers/session/redeemPassword/index.js",
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
define(['css!./toast'], function () {
|
import 'css!./toast';
|
||||||
'use strict';
|
|
||||||
|
|
||||||
function remove(elem) {
|
function remove(elem) {
|
||||||
|
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
elem.parentNode.removeChild(elem);
|
elem.parentNode.removeChild(elem);
|
||||||
}, 300);
|
}, 300);
|
||||||
}
|
}
|
||||||
|
|
||||||
function animateRemove(elem) {
|
function animateRemove(elem) {
|
||||||
|
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
|
|
||||||
|
@ -16,9 +15,9 @@ define(['css!./toast'], function () {
|
||||||
remove(elem);
|
remove(elem);
|
||||||
|
|
||||||
}, 3300);
|
}, 3300);
|
||||||
}
|
}
|
||||||
|
|
||||||
return function (options) {
|
export default function (options) {
|
||||||
|
|
||||||
if (typeof options === 'string') {
|
if (typeof options === 'string') {
|
||||||
options = {
|
options = {
|
||||||
|
@ -38,5 +37,4 @@ define(['css!./toast'], function () {
|
||||||
animateRemove(elem);
|
animateRemove(elem);
|
||||||
|
|
||||||
}, 300);
|
}, 300);
|
||||||
};
|
}
|
||||||
});
|
|
||||||
|
|
|
@ -1,5 +1,17 @@
|
||||||
define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'layoutManager', 'focusManager', 'globalize', 'itemHelper', 'css!./upnextdialog', 'emby-button', 'flexStyles'], function (dom, playbackManager, connectionManager, events, mediaInfo, layoutManager, focusManager, globalize, itemHelper) {
|
import dom from 'dom';
|
||||||
'use strict';
|
import playbackManager from 'playbackManager';
|
||||||
|
import connectionManager from 'connectionManager';
|
||||||
|
import events from 'events';
|
||||||
|
import mediaInfo from 'mediaInfo';
|
||||||
|
import layoutManager from 'layoutManager';
|
||||||
|
import focusManager from 'focusManager';
|
||||||
|
import globalize from 'globalize';
|
||||||
|
import itemHelper from 'itemHelper';
|
||||||
|
import 'css!./upnextdialog';
|
||||||
|
import 'emby-button';
|
||||||
|
import 'flexStyles';
|
||||||
|
|
||||||
|
/* eslint-disable indent */
|
||||||
|
|
||||||
var transitionEndEventName = dom.whichTransitionEvent();
|
var transitionEndEventName = dom.whichTransitionEvent();
|
||||||
|
|
||||||
|
@ -289,14 +301,14 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
|
||||||
instance._countdownTextTimeout = setInterval(setNextVideoText.bind(instance), 400);
|
instance._countdownTextTimeout = setInterval(setNextVideoText.bind(instance), 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
function UpNextDialog(options) {
|
class UpNextDialog {
|
||||||
|
constructor(options) {
|
||||||
|
|
||||||
this.options = options;
|
this.options = options;
|
||||||
|
|
||||||
init(this, options);
|
init(this, options);
|
||||||
}
|
}
|
||||||
|
show() {
|
||||||
UpNextDialog.prototype.show = function () {
|
|
||||||
|
|
||||||
var elem = this.options.parent;
|
var elem = this.options.parent;
|
||||||
|
|
||||||
|
@ -316,20 +328,20 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
|
||||||
}
|
}
|
||||||
|
|
||||||
startComingUpNextHideTimer(this);
|
startComingUpNextHideTimer(this);
|
||||||
};
|
}
|
||||||
|
hide() {
|
||||||
UpNextDialog.prototype.hide = function () {
|
|
||||||
|
|
||||||
hideComingUpNext.call(this);
|
hideComingUpNext.call(this);
|
||||||
};
|
}
|
||||||
|
destroy() {
|
||||||
UpNextDialog.prototype.destroy = function () {
|
|
||||||
|
|
||||||
hideComingUpNext.call(this);
|
hideComingUpNext.call(this);
|
||||||
|
|
||||||
this.options = null;
|
this.options = null;
|
||||||
this.itemType = null;
|
this.itemType = null;
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return UpNextDialog;
|
export default UpNextDialog;
|
||||||
});
|
|
||||||
|
/* eslint-enable indent */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue