Modal: Apply any preexisting body padding again after closing #15930
Conversation
hnrch02
force-pushed
the
modal-restore-inline-padding
branch
2 times, most recently
from
78ab28f
to
5c9af62
Compare
| @@ -259,11 +260,12 @@ | |||
|
|
|||
| Modal.prototype.setScrollbar = function () { | |||
| var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) | |||
| this.originalBodyPad = this.$body.attr('style') ? bodyPad : null | |||
There was a problem hiding this comment.
Won't this break with something like:
body { padding-right: 5px; }
<body style="color: red;">?
There was a problem hiding this comment.
Yup, that's why I haven't merged it yet. Was thinking about checking it with /padding-right/i, what do you think?
There was a problem hiding this comment.
What about !!this.$body[0].style.paddingRight ?
There was a problem hiding this comment.
Much better - I keep forgetting that Element.style does not include computed styles.
hnrch02
force-pushed
the
modal-restore-inline-padding
branch
from
5c9af62
to
039ba6d
Compare
|
@cvrebert LGTY now? Added another unit test for the case you described. |
|
What about |
hnrch02
force-pushed
the
modal-restore-inline-padding
branch
from
039ba6d
to
6656f8e
Compare
|
Good catch. If only I was as wise as you are |
|
What would programming be without edge cases? :-P |
| @@ -259,11 +260,12 @@ | |||
|
|
|||
| Modal.prototype.setScrollbar = function () { | |||
| var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) | |||
| this.originalBodyPad = document.body.style.paddingRight || null | |||
There was a problem hiding this comment.
What about || '' instead of || null, and then getting rid of the ternary below?
There was a problem hiding this comment.
I'm getting a little tired, that I could have noticed.
|
Nothing of interest, certainly 😄 |
hnrch02
force-pushed
the
modal-restore-inline-padding
branch
from
6656f8e
to
3a01490
Compare
| .bootstrapModal('show') | ||
| }) | ||
|
|
||
| QUnit.test('should ignore values set via CSS when trying to restore body padding after closing', function (assert) { |
There was a problem hiding this comment.
This test description needs to be updated
|
Once that description is fixed, 👍 💯 |
hnrch02
force-pushed
the
modal-restore-inline-padding
branch
from
3a01490
to
142a9e4
Compare
Modal: Apply any preexisting body padding again after closing
Modifies #15273 to ignore padding set via CSS.