Make JS a bit simpler

[plack-app-gruntmaster.git] / js / 10-modal.js

diff --git a/js/10-modal.js b/js/10-modal.js
index 980bab79a987ae6001413765e665d6fb7390d69c..d930f44ef0b6b3f956f0076b8055295c8f73de1e 100644 (file)
--- a/js/10-modal.js
+++ b/js/10-modal.js
@@ -1,7 +1,8 @@
-var modal, hiding;
+let modal, backdrop, hiding;
 
 function show_modal () {
        modal.classList.remove('hidden');
+       backdrop.classList.remove('hidden');
        setTimeout(function (){
                document.body.classList.add('modal-open');
        }, 20);
@@ -12,20 +13,21 @@ function hide_modal () {
 }
 
 $(function() {
-       modal = $('.modal')[0];
-       $(modal).on('transitionend', function (){
+       modal = q('.modal');
+       backdrop = q('.backdrop');
+       $(modal).on('transitionend', el => {
                if(!document.body.classList.contains('modal-open'))
                        modal.classList.add('hidden');
        });
-       $('.backdrop,.modal').each(function(el){
-               document.body.appendChild(el);
-       });
-       $('#solution').on('click', function (e){
-               show_modal();
-               e.preventDefault();
+       $('.backdrop,.modal').each(el => document.body.appendChild(el) );
+       $('#solution').on('click', e => {
+               if(window.matchMedia("(min-width: 768px)").matches){
+                       show_modal();
+                       e.preventDefault();
+               }
        });
        $('.backdrop').on('click', hide_modal);
-       window.onkeyup = function (event) {
+       window.onkeyup = event => {
                if (event.keyCode === 27)
                        hide_modal();
        }