milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Migration of taskbutton and touchHelper to ES6 modules

Browse source
This commit is contained in:
Cameron 2020-07-17 11:30:39 +01:00
parent a9246f8f39
commit f296eb3475
7 changed files with 140 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

14
package.json
View file

@ -154,6 +154,9 @@
"src/plugins/bookPlayer/plugin.js",
"src/plugins/bookPlayer/tableOfContents.js",
"src/plugins/photoPlayer/plugin.js",
"src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js",
"src/scripts/settings/webSettings.js",
"src/scripts/deleteHelper.js",
"src/scripts/dfnshelper.js",
"src/scripts/dom.js",
@ -161,14 +164,13 @@
"src/scripts/filesystem.js",
"src/scripts/imagehelper.js",
"src/scripts/inputManager.js",
"src/scripts/keyboardNavigation.js",
"src/scripts/taskbutton.js",
"src/scripts/touchHelper.js",
"src/scripts/themeLoader.js",
"src/plugins/backdropScreensaver/plugin.js",
"src/components/filterdialog/filterdialog.js",
"src/components/fetchhelper.js",
"src/scripts/keyboardNavigation.js",
"src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js",
"src/scripts/themeLoader.js",
"src/scripts/settings/webSettings.js"
"src/components/fetchhelper.js"
],
"plugins": [
"@babel/plugin-transform-modules-amd",

2
src/components/maintabsmanager.js
View file

@ -85,7 +85,7 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
require(['touchHelper'], function (TouchHelper) {
var touchHelper = new TouchHelper(view.parentNode.parentNode);
var touchHelper = new TouchHelper.default(view.parentNode.parentNode);
events.on(touchHelper, 'swipeleft', onSwipeLeft);
events.on(touchHelper, 'swiperight', onSwipeRight);

4
src/controllers/dashboard/mediaLibrary.js
View file

@ -372,7 +372,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
pageIdOn('pageshow', 'mediaLibraryPage', function () {
libraryMenu.setTabs('librarysetup', 0, getTabs);
var page = this;
taskButton({
taskButton.default({
mode: 'on',
progressElem: page.querySelector('.refreshProgress'),
taskKey: 'RefreshLibrary',
@ -381,7 +381,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
});
pageIdOn('pagebeforehide', 'mediaLibraryPage', function () {
var page = this;
taskButton({
taskButton.default({
mode: 'off',
progressElem: page.querySelector('.refreshProgress'),
taskKey: 'RefreshLibrary',

4
src/controllers/livetvstatus.js
View file

@ -303,7 +303,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
}).on('pageshow', '#liveTvStatusPage', function () {
var page = this;
reload(page);
taskButton({
taskButton.default({
mode: 'on',
progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide',
@ -311,7 +311,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
});
}).on('pagehide', '#liveTvStatusPage', function () {
var page = this;
taskButton({
taskButton.default({
mode: 'off',
progressElem: page.querySelector('.refreshGuideProgress'),
taskKey: 'RefreshGuide',

2
src/controllers/playback/videoosd.js
View file

@ -1533,7 +1533,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
if (browser.touch) {
(function () {
require(['touchHelper'], function (TouchHelper) {
self.touchHelper = new TouchHelper(view, {
self.touchHelper = new TouchHelper.default(view, {
swipeYThreshold: 30,
triggerOnMove: true,
preventDefaultOnMove: true,

13
src/scripts/taskbutton.js
View file

@ -1,7 +1,11 @@
define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'globalize', 'emby-button'], function (events, userSettings, serverNotifications, connectionManager, globalize) {
'use strict';
import events from 'events';
import * as userSettings from 'userSettings';
import serverNotifications from 'serverNotifications';
import connectionManager from 'connectionManager';
import globalize from 'globalize';
import 'emby-button';
return function (options) {
export default function (options) {
function pollTasks() {
connectionManager.getApiClient(serverId).getScheduledTasks({
IsEnabled: true
@ -115,5 +119,4 @@ define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'g
startInterval();
events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
}
};
});
}

21
src/scripts/touchHelper.js
View file

@ -1,12 +1,12 @@
define(['dom', 'events'], function (dom, events) {
'use strict';
function getTouches(e) {
import dom from 'dom';
import events from 'events';
function getTouches(e) {
return e.changedTouches || e.targetTouches || e.touches;
}
}
function TouchHelper(elem, options) {
class TouchHelper {
constructor(elem, options) {
options = options || {};
var touchTarget;
@ -138,8 +138,7 @@ define(['dom', 'events'], function (dom, events) {
passive: true
});
}
TouchHelper.prototype.destroy = function () {
destroy() {
var elem = this.elem;
@ -165,7 +164,7 @@ define(['dom', 'events'], function (dom, events) {
this.touchEnd = null;
this.elem = null;
};
}
}
return TouchHelper;
});
export default TouchHelper;