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 #1541 from Influence365/add-toast-1

Browse source 
Migration of display, home, playback and subtitles to ES6 modules and small fixes
This commit is contained in:
dkanada 2020-07-11 23:32:22 +09:00 • committed by GitHub
commit c0d71f9bff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 76 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -116,6 +116,10 @@
"src/components/syncPlay/timeSyncManager.js", "src/components/syncPlay/timeSyncManager.js",
"src/controllers/dashboard/logs.js", "src/controllers/dashboard/logs.js",
"src/controllers/dashboard/plugins/repositories.js", "src/controllers/dashboard/plugins/repositories.js",
"src/controllers/user/display.js",
"src/controllers/user/home.js",
"src/controllers/user/playback.js",
"src/controllers/user/subtitles.js",
"src/plugins/bookPlayer/plugin.js", "src/plugins/bookPlayer/plugin.js",
"src/plugins/bookPlayer/tableOfContents.js", "src/plugins/bookPlayer/tableOfContents.js",
"src/plugins/photoPlayer/plugin.js", "src/plugins/photoPlayer/plugin.js",

34
src/controllers/user/display.js
View file

@ -1,20 +1,23 @@
define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySettings, userSettings, autoFocuser) { import DisplaySettings from 'displaySettings';
'use strict'; import * as userSettings from 'userSettings';
import autoFocuser from 'autoFocuser';
/* eslint-disable indent */
// Shortcuts // Shortcuts
const UserSettings = userSettings.UserSettings; const UserSettings = userSettings.UserSettings;
return function (view, params) { export default function (view, params) {
function onBeforeUnload(e) { function onBeforeUnload(e) {
if (hasChanges) { if (hasChanges) {
e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?'; e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
} }
} }
var settingsInstance; let settingsInstance;
var hasChanges; let hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId(); const userId = params.userId || ApiClient.getCurrentUserId();
var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings(); const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
window.addEventListener('beforeunload', onBeforeUnload); window.addEventListener('beforeunload', onBeforeUnload);
@ -26,28 +29,23 @@ define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySett
userId: userId, userId: userId,
element: view.querySelector('.settingsContainer'), element: view.querySelector('.settingsContainer'),
userSettings: currentSettings, userSettings: currentSettings,
enableSaveButton: false, enableSaveButton: true,
enableSaveConfirmation: false, enableSaveConfirmation: true,
autoFocus: autoFocuser.isEnabled() autoFocus: autoFocuser.isEnabled()
}); });
} }
}); });
view.addEventListener('change', function () { view.addEventListener('change', function () {
hasChanges = true; hasChanges = true;
}); });
view.addEventListener('viewbeforehide', function () {
window.removeEventListener('beforeunload', onBeforeUnload);
hasChanges = false;
if (settingsInstance) {
settingsInstance.submit();
}
});
view.addEventListener('viewdestroy', function () { view.addEventListener('viewdestroy', function () {
if (settingsInstance) { if (settingsInstance) {
settingsInstance.destroy(); settingsInstance.destroy();
settingsInstance = null; settingsInstance = null;
} }
}); });
}; }
});
/* eslint-enable indent */

37
src/controllers/user/home.js
View file

@ -1,20 +1,27 @@
define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (HomescreenSettings, dom, globalize, loading, userSettings, autoFocuser) { import HomescreenSettings from 'homescreenSettings';
'use strict'; import dom from 'dom';
import globalize from 'globalize';
import loading from 'loading';
import * as userSettings from 'userSettings';
import autoFocuser from 'autoFocuser';
import 'listViewStyle';
/* eslint-disable indent */
// Shortcuts // Shortcuts
const UserSettings = userSettings.UserSettings; const UserSettings = userSettings.UserSettings;
return function (view, params) { export default function (view, params) {
function onBeforeUnload(e) { function onBeforeUnload(e) {
if (hasChanges) { if (hasChanges) {
e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?'; e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
} }
} }
var homescreenSettingsInstance; let homescreenSettingsInstance;
var hasChanges; let hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId(); const userId = params.userId || ApiClient.getCurrentUserId();
var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings(); const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
window.addEventListener('beforeunload', onBeforeUnload); window.addEventListener('beforeunload', onBeforeUnload);
@ -26,27 +33,23 @@ define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'au
userId: userId, userId: userId,
element: view.querySelector('.homeScreenSettingsContainer'), element: view.querySelector('.homeScreenSettingsContainer'),
userSettings: currentSettings, userSettings: currentSettings,
enableSaveButton: false, enableSaveButton: true,
enableSaveConfirmation: false, enableSaveConfirmation: true,
autoFocus: autoFocuser.isEnabled() autoFocus: autoFocuser.isEnabled()
}); });
} }
}); });
view.addEventListener('change', function () { view.addEventListener('change', function () {
hasChanges = true; hasChanges = true;
}); });
view.addEventListener('viewbeforehide', function () {
hasChanges = false;
if (homescreenSettingsInstance) {
homescreenSettingsInstance.submit();
}
});
view.addEventListener('viewdestroy', function () { view.addEventListener('viewdestroy', function () {
if (homescreenSettingsInstance) { if (homescreenSettingsInstance) {
homescreenSettingsInstance.destroy(); homescreenSettingsInstance.destroy();
homescreenSettingsInstance = null; homescreenSettingsInstance = null;
} }
}); });
}; }
});
/* eslint-enable indent */

37
src/controllers/user/playback.js
View file

@ -1,20 +1,27 @@
define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (PlaybackSettings, dom, globalize, loading, userSettings, autoFocuser) { import PlaybackSettings from 'playbackSettings';
'use strict'; import dom from 'dom';
import globalize from 'globalize';
import loading from 'loading';
import * as userSettings from 'userSettings';
import autoFocuser from 'autoFocuser';
import 'listViewStyle';
/* eslint-disable indent */
// Shortcuts // Shortcuts
const UserSettings = userSettings.UserSettings; const UserSettings = userSettings.UserSettings;
return function (view, params) { export default function (view, params) {
function onBeforeUnload(e) { function onBeforeUnload(e) {
if (hasChanges) { if (hasChanges) {
e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?'; e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
} }
} }
var settingsInstance; let settingsInstance;
var hasChanges; let hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId(); const userId = params.userId || ApiClient.getCurrentUserId();
var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings(); const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
window.addEventListener('beforeunload', onBeforeUnload); window.addEventListener('beforeunload', onBeforeUnload);
@ -26,27 +33,23 @@ define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'auto
userId: userId, userId: userId,
element: view.querySelector('.settingsContainer'), element: view.querySelector('.settingsContainer'),
userSettings: currentSettings, userSettings: currentSettings,
enableSaveButton: false, enableSaveButton: true,
enableSaveConfirmation: false, enableSaveConfirmation: true,
autoFocus: autoFocuser.isEnabled() autoFocus: autoFocuser.isEnabled()
}); });
} }
}); });
view.addEventListener('change', function () { view.addEventListener('change', function () {
hasChanges = true; hasChanges = true;
}); });
view.addEventListener('viewbeforehide', function () {
hasChanges = false;
if (settingsInstance) {
settingsInstance.submit();
}
});
view.addEventListener('viewdestroy', function () { view.addEventListener('viewdestroy', function () {
if (settingsInstance) { if (settingsInstance) {
settingsInstance.destroy(); settingsInstance.destroy();
settingsInstance = null; settingsInstance = null;
} }
}); });
}; }
});
/* eslint-enable indent */

33
src/controllers/user/subtitles.js
View file

@ -1,20 +1,23 @@
define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSettings, userSettings, autoFocuser) { import SubtitleSettings from 'subtitleSettings';
'use strict'; import * as userSettings from 'userSettings';
import autoFocuser from 'autoFocuser';
/* eslint-disable indent */
// Shortcuts // Shortcuts
const UserSettings = userSettings.UserSettings; const UserSettings = userSettings.UserSettings;
return function (view, params) { export default function (view, params) {
function onBeforeUnload(e) { function onBeforeUnload(e) {
if (hasChanges) { if (hasChanges) {
e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?'; e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
} }
} }
var subtitleSettingsInstance; let subtitleSettingsInstance;
var hasChanges; let hasChanges;
var userId = params.userId || ApiClient.getCurrentUserId(); const userId = params.userId || ApiClient.getCurrentUserId();
var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings(); const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
window.addEventListener('beforeunload', onBeforeUnload); window.addEventListener('beforeunload', onBeforeUnload);
@ -26,27 +29,23 @@ define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSe
userId: userId, userId: userId,
element: view.querySelector('.settingsContainer'), element: view.querySelector('.settingsContainer'),
userSettings: currentSettings, userSettings: currentSettings,
enableSaveButton: false, enableSaveButton: true,
enableSaveConfirmation: false, enableSaveConfirmation: true,
autoFocus: autoFocuser.isEnabled() autoFocus: autoFocuser.isEnabled()
}); });
} }
}); });
view.addEventListener('change', function () { view.addEventListener('change', function () {
hasChanges = true; hasChanges = true;
}); });
view.addEventListener('viewbeforehide', function () {
hasChanges = false;
if (subtitleSettingsInstance) {
subtitleSettingsInstance.submit();
}
});
view.addEventListener('viewdestroy', function () { view.addEventListener('viewdestroy', function () {
if (subtitleSettingsInstance) { if (subtitleSettingsInstance) {
subtitleSettingsInstance.destroy(); subtitleSettingsInstance.destroy();
subtitleSettingsInstance = null; subtitleSettingsInstance = null;
} }
}); });
}; }
});
/* eslint-enable indent */