Selaa lähdekoodia

Don't show the hashtag but continu to open the panel if he's present

Amauri CHAMPEAUX 10 vuotta sitten
vanhempi
commit
9e16b59381
2 muutettua tiedostoa jossa 12 lisäystä ja 8 poistoa
  1. 1 1
      css/tarteaucitron.css
  2. 11 7
      tarteaucitron.js

+ 1 - 1
css/tarteaucitron.css

@@ -330,7 +330,7 @@
     right: 0;
     text-align: center;
     width: auto;
-    z-index: 2147483645;
+    z-index: 2147483646;
 }
 
 #tarteaucitronAlertSmall #tarteaucitronManager {

+ 11 - 7
tarteaucitron.js

@@ -10,7 +10,7 @@ var scripts = document.getElementsByTagName('script'),
     tarteaucitronNoAdBlocker = false;
 
 var tarteaucitron = {
-    "version": 155,
+    "version": 156,
     "cdn": cdn,
     "user": {},
     "lang": {},
@@ -529,17 +529,16 @@ var tarteaucitron = {
             tarteaucitron.userInterface.css('tarteaucitron', 'display', 'block');
             tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block');
             tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none');
-            
-            // setting hash tag
-            if (tarteaucitron.hashtag !== '') {
-                document.location.hash = tarteaucitron.hashtag;
-            }
         },
         "closePanel": function () {
             "use strict";
             tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
             tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none');
-            document.location.hash = '';
+            tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none');
+            
+            if (document.location.hash === tarteaucitron.hashtag) {
+                document.location.hash = '';
+            }
         },
         "openAlert": function () {
             "use strict";
@@ -563,9 +562,14 @@ var tarteaucitron = {
             
             tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'bottom', (parseInt(document.getElementById('tarteaucitronAlertSmall').offsetHeight, 10) + 10) + 'px');
             if (div.style.display !== 'block') {
+                tarteaucitron.cookie.number();
                 div.style.display = 'block';
+                tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
+                tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block');
             } else {
                 div.style.display = 'none';
+                tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
+                tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none');
             }
         },
         "order": function (id) {