diff --git a/js/cookie.js b/js/cookie.js index 1bccbe7bee6988966c1a7f37eb54745c7c90a386..4b4bb459c245eee9bc0057819ddb6bc7c05956b9 100644 --- a/js/cookie.js +++ b/js/cookie.js @@ -1,7 +1,3 @@ -function acceptCookie(){ - document.cookie = "cookieMessageHide=1"; - checkHide(); -} function getCookie(name){ var nameEQ = name + "="; @@ -14,11 +10,15 @@ function getCookie(name){ return null } -function checkHide(){ - let cookieInfo = document.getElementsByClassName("cookieinfo")[0]; - if (getCookie("cookieMessageHide") === "1"){ - cookieInfo.style.display = "none"; - } else { - cookieInfo.style.display = "block"; - } - } \ No newline at end of file +let cookieInfo = document.querySelector(".cookieinfo"); +if (getCookie("cookieMessageHide") === "1"){ + cookieInfo.style.display = "none"; +} else { + cookieInfo.style.display = "block"; +} + +document.querySelector(".cookieinfo-close").onclick = function() { + console.log("close"); + document.cookie = "cookieMessageHide=1"; + cookieInfo.style.display = "none"; +} diff --git a/js/script.js b/js/script.js index d33b42a8a7bf29e71923bc258ea252c0df16142b..f1dcf14c2974ff1e801d8b1cd325262d7869dae8 100644 --- a/js/script.js +++ b/js/script.js @@ -1,5 +1,5 @@ -require("./burgerMenu"); require("./cookie"); +require("./burgerMenu"); require("./dialog"); require("./error"); require("./imgPreview"); diff --git a/package.json b/package.json index 6726242891499fb791f37124208d15c12f357c31..f34f0615425d7135182c5080ea9238ac24cc4d78 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "compile": "concurrently \"yarn css\" \"yarn js\"", "css": "sass scss/:public/css --style=compressed --no-source-map", "js": "webpack --config ./webpack.conf.js", - "watch": "concurrently \"sass --watch --style compressed scss/:public/css\" \"cd public && php -S locaLhost:1234\" \"webpack --config ./webpack.conf.js --mode development\"" + "watch": "concurrently \"sass --watch --style compressed scss/:public/css\" \"cd public && php -S locaLhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\"" }, "devDependencies": { "@webpack-cli/init": "^1.1.3", diff --git a/public/internal/footer.php b/public/internal/footer.php index b764de2c5a687392dc636f048a2e6584145bb8d3..c8e31ab47b90a9d306e6f147d94f948aa2be1940 100644 --- a/public/internal/footer.php +++ b/public/internal/footer.php @@ -42,7 +42,7 @@ function getFooter(){ </div> </footer> <div class="cookieinfo"> - <div class="cookieinfo-close" onclick="acceptCookie()"> + <div class="cookieinfo-close"> ✖ </div> <span class="cookieinfo-text"> @@ -50,9 +50,6 @@ function getFooter(){ </span> </div> <script src="/js/script.js"></script> - <script> - checkHide(); - </script> </body> </html> EOF); diff --git a/webpack.conf.js b/webpack.conf.js index 14fcff37850ead43f2928241d0a747f53a206425..b235b74238354da716d5dfa363212ebc07720ba5 100644 --- a/webpack.conf.js +++ b/webpack.conf.js @@ -7,6 +7,7 @@ module.exports = { output: { path: path.resolve(__dirname, "public/js"), filename: "script.js", + libraryTarget: 'window' }, mode: "production" }