Merge pull request #1897 from Camc314/fix-prevent-reload

Fix Message Appearing on Page Reload
jellyfin · Sep 3, 2020 · 40ba77b · 40ba77b
2 parents c5223cb + f452173
commit 40ba77b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/src/controllers/user/display/index.js b/src/controllers/user/display/index.js
@@ -8,19 +8,13 @@ import autoFocuser from 'autoFocuser';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let settingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (settingsInstance) {
                 settingsInstance.loadData();
             } else {

diff --git a/src/controllers/user/home/index.js b/src/controllers/user/home/index.js
@@ -9,19 +9,13 @@ import 'listViewStyle';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let homescreenSettingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (homescreenSettingsInstance) {
                 homescreenSettingsInstance.loadData();
             } else {

diff --git a/src/controllers/user/playback/index.js b/src/controllers/user/playback/index.js
@@ -9,19 +9,13 @@ import 'listViewStyle';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let settingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (settingsInstance) {
                 settingsInstance.loadData();
             } else {

diff --git a/src/controllers/user/subtitles/index.js b/src/controllers/user/subtitles/index.js
@@ -8,19 +8,13 @@ import autoFocuser from 'autoFocuser';
     const UserSettings = userSettings.UserSettings;
 
     export default function (view, params) {
-        function onBeforeUnload(e) {
-            if (hasChanges) {
-                e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-            }
-        }
-
         let subtitleSettingsInstance;
         let hasChanges;
+
         const userId = params.userId || ApiClient.getCurrentUserId();
         const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
-        view.addEventListener('viewshow', function () {
-            window.addEventListener('beforeunload', onBeforeUnload);
 
+        view.addEventListener('viewshow', function () {
             if (subtitleSettingsInstance) {
                 subtitleSettingsInstance.loadData();
             } else {