fix the localStorage issue from opnsense#1915

fabianfrz · Dec 2, 2017 · 28b6dff · 28b6dff
1 parent 5b20a3d
commit 28b6dff
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
@@ -228,6 +228,15 @@ function addMultiSelectClearUI() {
     });
 }
 
+function checkSessionStorageExists() {
+  if ('sessionStorage' in window) {
+    if (window.sessionStorage != null) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * setup form help buttons
  */
@@ -243,17 +252,21 @@ function initFormHelpUI() {
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
         if ($('[id*="show_all_help"]').hasClass("fa-toggle-on")) {
-            sessionStorage.setItem('all_help_preset', 1);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('all_help_preset', 1);
+            }
             $('[for*="help_for"]').addClass("show");
             $('[for*="help_for"]').removeClass("hidden");
         } else {
             $('[for*="help_for"]').addClass("hidden");
             $('[for*="help_for"]').removeClass("show");
-            sessionStorage.setItem('all_help_preset', 0);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('all_help_preset', 0);
+            }
         }
         event.preventDefault();
     });
-    if (sessionStorage.getItem('all_help_preset') == 1) {
+    if (checkSessionStorageExists() && sessionStorage.getItem('all_help_preset') == 1) {
         // show all help messages when preset was stored
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
@@ -266,7 +279,7 @@ function initFormHelpUI() {
  * handle advanced show/hide
  */
 function initFormAdvancedUI() {
-    if (sessionStorage.getItem('show_advanced_preset') == 1) {
+    if (checkSessionStorageExists() && sessionStorage.getItem('show_advanced_preset') == 1) {
         // show advanced options when preset was stored
         $('[id*="show_advanced"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_advanced"]').toggleClass("text-success text-danger");
@@ -282,10 +295,14 @@ function initFormAdvancedUI() {
         if ($('[id*="show_advanced"]').hasClass("fa-toggle-on")) {
             $('[data-advanced*="true"]').show();
             $('[data-advanced*="hidden_row"]').remove(); // the table row is deleted to keep correct table striping
-            sessionStorage.setItem('show_advanced_preset', 1);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('show_advanced_preset', 1);
+            }
         } else {
             $('[data-advanced*="true"]').after("<tr data-advanced='hidden_row'></tr>").hide(); // the table row is added to keep correct table striping
-            sessionStorage.setItem('show_advanced_preset', 0);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('show_advanced_preset', 0);
+            }
         }
     });
 }