Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix prevent scrolling #136

Merged
merged 2 commits into from
Jun 2, 2014
Merged

Bugfix prevent scrolling #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b218c
Prevent hashChange event to avoid jumping
May 27, 2014
507b632
Prevent scrolling of body on small screens
drublic Jun 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions _modal-core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ html {


@media screen and (max-width: $modal-small-breakpoint) {
height: 100%;

> body {
overflow: hidden;
height: 100%;
Expand Down Expand Up @@ -201,23 +199,17 @@ html {
-webkit-transform: translate3d(0, 100%, 0); // And overwrite px if 3D transforms are supported
transform: translate3d(0, 100%, 0);

-webkit-transition: -webkit-transform .25s ease-in-out, opacity 1ms .25s;
-moz-transition: -moz-transform .25s ease-in-out, opacity 1ms .25s;
-o-transition: -o-transform .25s ease-in-out, opacity 1ms .25s;
-ms-transition: -ms-transform .25s ease-in-out, opacity 1ms .25s;
transition: transform .25s ease-in-out, opacity 1ms .25s;
-webkit-transition: opacity 1ms .25s;
-moz-transition: opacity 1ms .25s;
-o-transition: opacity 1ms .25s;
-ms-transition: opacity 1ms .25s;
transition: opacity 1ms .25s;

display: block;
bottom: auto;

&:target,
&.is-active {
-webkit-transition: -webkit-transform .25s ease-in-out;
-moz-transition: -moz-transform .25s ease-in-out;
-o-transition: -o-transform .25s ease-in-out;
-ms-transition: -ms-transform .25s ease-in-out;
transition: transform .25s ease-in-out;

height: 100%;
}

Expand Down
18 changes: 5 additions & 13 deletions build/modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ html {
overflow-y: scroll;
}
@media screen and (max-width: 30em) {
.has-overlay {
height: 100%;
}
.has-overlay > body {
overflow: hidden;
height: 100%;
Expand Down Expand Up @@ -161,20 +158,15 @@ html {
-webkit-transform: translate(0, 400px);
-webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0);
-webkit-transition: -webkit-transform .25s ease-in-out, opacity 1ms .25s;
-moz-transition: -moz-transform .25s ease-in-out, opacity 1ms .25s;
-o-transition: -o-transform .25s ease-in-out, opacity 1ms .25s;
-ms-transition: -ms-transform .25s ease-in-out, opacity 1ms .25s;
transition: transform .25s ease-in-out, opacity 1ms .25s;
-webkit-transition: opacity 1ms .25s;
-moz-transition: opacity 1ms .25s;
-o-transition: opacity 1ms .25s;
-ms-transition: opacity 1ms .25s;
transition: opacity 1ms .25s;
display: block;
bottom: auto;
}
.modal--show:target, .is-active.modal--show {
-webkit-transition: -webkit-transform .25s ease-in-out;
-moz-transition: -moz-transform .25s ease-in-out;
-o-transition: -o-transform .25s ease-in-out;
-ms-transition: -ms-transform .25s ease-in-out;
transition: transform .25s ease-in-out;
height: 100%;
}
.modal--show:before {
Expand Down
10 changes: 8 additions & 2 deletions modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,10 @@

/*
* When displaying modal, prevent background from scrolling
* @param {Object} event The incoming hashChange event
* @return {void}
*/
mainHandler: function () {
mainHandler: function (event) {
var hash = window.location.hash.replace('#', '');
var index = 0;
var tmp = [];
Expand Down Expand Up @@ -298,6 +300,9 @@
// If the hash element exists
if (modalElement) {

event.preventDefault();
event.stopPropagation();

// Get first element in selected element
modalChild = modalElement.children[0];

Expand All @@ -319,10 +324,11 @@
// If activeElement is already defined, delete it
modal.unsetActive();
}

return true;
}
};


/*
* Hide overlay when ESC is pressed
*/
Expand Down
18 changes: 5 additions & 13 deletions test/modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ html {
overflow-y: scroll;
}
@media screen and (max-width: 30em) {
.has-overlay {
height: 100%;
}
.has-overlay > body {
overflow: hidden;
height: 100%;
Expand Down Expand Up @@ -186,20 +183,15 @@ html {
-webkit-transform: translate(0, 400px);
-webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0);
-webkit-transition: -webkit-transform .25s ease-in-out, opacity 1ms .25s;
-moz-transition: -moz-transform .25s ease-in-out, opacity 1ms .25s;
-o-transition: -o-transform .25s ease-in-out, opacity 1ms .25s;
-ms-transition: -ms-transform .25s ease-in-out, opacity 1ms .25s;
transition: transform .25s ease-in-out, opacity 1ms .25s;
-webkit-transition: opacity 1ms .25s;
-moz-transition: opacity 1ms .25s;
-o-transition: opacity 1ms .25s;
-ms-transition: opacity 1ms .25s;
transition: opacity 1ms .25s;
display: block;
bottom: auto;
}
.modal--gallery:target, .modal--fade:target, .modal--plainscreen:target, .modal--zoomin:target, .modal--zoomout:target, .modal--slidefromtop:target, .modal--bouncefromtop:target, .modal--bouncefromtopshaky:target, .modal--show:target, ._modal:target, .is-active.modal--gallery, .is-active.modal--fade, .is-active.modal--plainscreen, .is-active.modal--zoomin, .is-active.modal--zoomout, .is-active.modal--slidefromtop, .is-active.modal--bouncefromtop, .is-active.modal--bouncefromtopshaky, .is-active.modal--show, .is-active._modal {
-webkit-transition: -webkit-transform .25s ease-in-out;
-moz-transition: -moz-transform .25s ease-in-out;
-o-transition: -o-transform .25s ease-in-out;
-ms-transition: -ms-transform .25s ease-in-out;
transition: transform .25s ease-in-out;
height: 100%;
}
.modal--gallery:before, .modal--fade:before, .modal--plainscreen:before, .modal--zoomin:before, .modal--zoomout:before, .modal--slidefromtop:before, .modal--bouncefromtop:before, .modal--bouncefromtopshaky:before, .modal--show:before, ._modal:before {
Expand Down