Skip to content

test(Modal): reuse Modal.prototype._getScrollbarWidth in tests #27472

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

Merged
Johann-S merged 3 commits into from
Oct 21, 2018
Merged

test(Modal): reuse Modal.prototype._getScrollbarWidth in tests #27472

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d79c6f0
test(Modal): reuse _getScrollbarWidth in tests
Oct 21, 2018
e479b49
Merge branch 'v4-dev' into modal-scrollbar-measure
Johann-S Oct 21, 2018
4a79874
Merge branch 'v4-dev' into modal-scrollbar-measure
Johann-S Oct 21, 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
9 changes: 1 addition & 8 deletions js/tests/unit/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@ $(function () {
// Enable the scrollbar measurer
$('<style type="text/css"> .modal-scrollbar-measure { position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll; } </style>').appendTo('head')
// Function to calculate the scrollbar width which is then compared to the padding or margin changes
$.fn.getScrollbarWidth = function () {
var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure'
document.body.appendChild(scrollDiv)
var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
document.body.removeChild(scrollDiv)
return scrollbarWidth
}
$.fn.getScrollbarWidth = $.fn.modal.Constructor.prototype._getScrollbarWidth

// Simulate scrollbars
$('html').css('padding-right', '16px')
Expand Down