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

Fix ember-remodal doesn't remove padding-right when the modal closes in some cases #282

Closed
wants to merge 7 commits into from
Closed

Fix ember-remodal doesn't remove padding-right when the modal closes in some cases #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90a2ffa
Add aria-hidden to wrapper, trap Tab key focus inside modal
danielpost Feb 27, 2017
168f9ae
Actually add aria-hidden
danielpost Feb 27, 2017
e2dcac7
Fix ember-remodal doesn't remove padding-right when the modal closes …
al3xnag May 2, 2017
28501e0
Fix ember-remodal doesn't remove padding-right when the modal closes
al3xnag Oct 11, 2017
d0e8efb
Merge remote-tracking branch 'danielpost/master'
al3xnag Jan 24, 2018
3314a33
Update dist folder
al3xnag Jan 24, 2018
613854a
Revert Tab key focus trapping: it does not work properly
al3xnag Jan 24, 2018
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
23 changes: 16 additions & 7 deletions dist/remodal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,20 @@

var $html = $('html');
var lockedClass = namespacify('is-locked');
var scrollbarWidth;
var paddingRight;
var $body;

if (!$html.hasClass(lockedClass)) {
$body = $(document.body);

scrollbarWidth = getScrollbarWidth();

// Zepto does not support '-=', '+=' in the `css` method
paddingRight = parseInt($body.css('padding-right'), 10) + getScrollbarWidth();
paddingRight = parseInt($body.css('padding-right'), 10) + scrollbarWidth;

$body.css('padding-right', paddingRight + 'px');
$body.attr('data-scrollbar-width', scrollbarWidth);
$html.addClass(lockedClass);
}
}
Expand All @@ -277,16 +281,20 @@

var $html = $('html');
var lockedClass = namespacify('is-locked');
var scrollbarWidth;
var paddingRight;
var $body;

if ($html.hasClass(lockedClass)) {
$body = $(document.body);

// Zepto does not support '-=', '+=' in the `css` method
paddingRight = parseInt($body.css('padding-right'), 10) - getScrollbarWidth();
scrollbarWidth = Number($body.attr('data-scrollbar-width')) || 0;

$body.css('padding-right', paddingRight + 'px');
paddingRight = parseInt($body[0].style.paddingRight, 10) - scrollbarWidth;
paddingRight = (paddingRight > 0) ? paddingRight + 'px' : '';

$body.css('padding-right', paddingRight);
$body.removeAttr('data-scrollbar-width');
$html.removeClass(lockedClass);
}
}
Expand Down Expand Up @@ -404,7 +412,7 @@

instance.$bg.removeClass(instance.settings.modifier);
instance.$overlay.removeClass(instance.settings.modifier).hide();
instance.$wrapper.hide();
instance.$wrapper.hide().attr('aria-hidden', 'true');
unlockScreen();
setState(instance, STATES.CLOSED, true);
}
Expand Down Expand Up @@ -541,6 +549,7 @@
remodal.settings.modifier + ' ' +
namespacify('is', STATES.CLOSED))
.hide()
.attr('aria-hidden', 'true')
.append(remodal.$modal);
$appendTo.append(remodal.$wrapper);

Expand Down Expand Up @@ -615,7 +624,7 @@
lockScreen();
remodal.$bg.addClass(remodal.settings.modifier);
remodal.$overlay.addClass(remodal.settings.modifier).show();
remodal.$wrapper.show().scrollTop(0);
remodal.$wrapper.show().attr('aria-hidden', 'false').scrollTop(0);
remodal.$modal.focus();

syncWithAnimation(
Expand Down Expand Up @@ -659,7 +668,7 @@
function() {
remodal.$bg.removeClass(remodal.settings.modifier);
remodal.$overlay.removeClass(remodal.settings.modifier).hide();
remodal.$wrapper.hide();
remodal.$wrapper.hide().attr('aria-hidden', 'true');
unlockScreen();

setState(remodal, STATES.CLOSED, false, reason);
Expand Down
2 changes: 1 addition & 1 deletion dist/remodal.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading