From 94cc78de1986f9458025af4627cce38b91104d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kawczy=C5=84ski?= Date: Wed, 13 Dec 2017 09:41:41 +0100 Subject: [PATCH] Add validation position char, active img with url --- .DS_Store | Bin ._.DS_Store | Bin LICENSE | 0 README.md | 0 css/style.css | 2 -- fonts/ARCADE.TTF | Bin fonts/monaco.ttf | Bin icons/.DS_Store | Bin icons/._.DS_Store | Bin index.html | 2 +- js/script.js | 19 +++++++++++++++++++ test.txt | 0 12 files changed, 20 insertions(+), 3 deletions(-) mode change 100755 => 100644 .DS_Store mode change 100755 => 100644 ._.DS_Store mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README.md mode change 100755 => 100644 css/style.css mode change 100755 => 100644 fonts/ARCADE.TTF mode change 100755 => 100644 fonts/monaco.ttf mode change 100755 => 100644 icons/.DS_Store mode change 100755 => 100644 icons/._.DS_Store mode change 100755 => 100644 index.html mode change 100755 => 100644 js/script.js mode change 100755 => 100644 test.txt diff --git a/.DS_Store b/.DS_Store old mode 100755 new mode 100644 diff --git a/._.DS_Store b/._.DS_Store old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/css/style.css b/css/style.css old mode 100755 new mode 100644 index be4e44b..7e846e6 --- a/css/style.css +++ b/css/style.css @@ -8,8 +8,6 @@ } -/*-----------------------Icon CSS high-resolution-------------------------------------*/ - /*-----------------------Character CSS high-resolution--------------------------------*/ diff --git a/fonts/ARCADE.TTF b/fonts/ARCADE.TTF old mode 100755 new mode 100644 diff --git a/fonts/monaco.ttf b/fonts/monaco.ttf old mode 100755 new mode 100644 diff --git a/icons/.DS_Store b/icons/.DS_Store old mode 100755 new mode 100644 diff --git a/icons/._.DS_Store b/icons/._.DS_Store old mode 100755 new mode 100644 diff --git a/index.html b/index.html old mode 100755 new mode 100644 index d6332bd..da0b2c7 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@

PLAY && LEARN

- +
diff --git a/js/script.js b/js/script.js old mode 100755 new mode 100644 index 664a44c..0a3f129 --- a/js/script.js +++ b/js/script.js @@ -13,6 +13,24 @@ $(document).ready(function() { $("#char-pupil-right").attr('id','char-pupil-right-move'); $("#char-arm-left").attr('id','char-arm-left-up'); $("#char-arm-right").attr('id','char-arm-right-up'); + var positionCharXCornerLeft = $('#char-container').offset().left; + var positionCharYCornerLeft = $('#char-container').offset().top; + var positionCharXRightCorner = $('#char-container').offset().left + $('#char-container').innerWidth(); + var positionCharYRightCorner = $('#char-container').offset().top + $('#char-container').innerHeight(); + + //https://stackoverflow.com/questions/8872578/if-element-is-over-another-element + //uproscic kod(funkcje/zmienne); + var positionXPoliceBuildingCornerLeft = $('#police-building').offset().left; + var positionYPoliceBuildingCornerLeft = $('#police-building').offset().top; + var positionXPoliceBuildingCornerRight = $('#police-building').offset().left + $('#police-building').innerWidth(); + var positionYPoliceBuildingCornerRight = $('#police-building').offset().top + $('#police-building').innerHeight(); + if(positionXPoliceBuildingCornerRight>positionCharXCornerLeft && positionYPoliceBuildingCornerRight>positionCharYCornerLeft && + positionXPoliceBuildingCornerLeft