Increase museum z-index and use localstorage for disabling museum

2gis · Jun 14, 2018 · a96c919 · a96c919
1 parent 1a2de61
commit a96c919
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/DGMuseum/skin/basic/less/dg-museum.less b/src/DGMuseum/skin/basic/less/dg-museum.less
@@ -3,7 +3,7 @@
     top: 0;
     left: 0;
     right: 0;
-    z-index: 500;
+    z-index: 1500;
     padding: 4px 5px 8px;
     background: #333;
     color: #fff;

diff --git a/src/DGMuseum/src/DGMuseum.js b/src/DGMuseum/src/DGMuseum.js
@@ -5,8 +5,17 @@ var ie9 = (function() {
     return Boolean(all[0]);
 })();
 
+var wasPreviouslyDisabled = false;
+
+// Old Safari throws error when localStorage.getItem calls in private mode
+try {
+    wasPreviouslyDisabled = localStorage.getItem('DGMuseum') === 'false';
+} catch (err) {
+    // do nothing
+}
+
 DG.Map.mergeOptions({
-    museum: DG.Browser.ielt9 || ie9 || DG.Browser.opera12 || DG.Browser.safari51
+    museum: !wasPreviouslyDisabled && (DG.Browser.ielt9 || ie9 || DG.Browser.opera12 || DG.Browser.safari51)
 });
 
 DG.Map.Museum = DG.Handler.extend({
@@ -70,6 +79,14 @@ DG.Map.Museum = DG.Handler.extend({
 
     _onCloseButtonClick: function(e) {
         DG.DomEvent.stop(e);
+
+        // Old Safari throws error when localStorage.getItem calls in private mode
+        try {
+            localStorage.setItem('DGMuseum', 'false');
+        } catch (err) {
+            // do nothing
+        }
+
         this.disable();
     },