From ce41d3fd159ce376b55413cef6e88fd658f4fd30 Mon Sep 17 00:00:00 2001
From: David Bailey <techdavid@users.noreply.github.com>
Date: Tue, 29 Aug 2017 15:36:37 +0100
Subject: [PATCH 1/2] Add failing test

---
 js/tests/unit/modal.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 5b265df158..d22b818d26 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -349,6 +349,20 @@ $(function () {
     $toggleBtn.trigger('click')
   })
 
+  QUnit.test('should adjust the inline padding of the modal when opening', function (assert) {
+    assert.expect(1)
+    var done = assert.async()
+
+    $('<div id="modal-test"/>')
+      .on('shown.bs.modal', function () {
+        var expectedPadding = $(this).getScrollbarWidth() + 'px'
+        var currentPadding = $(this).css('padding-right')
+        assert.strictEqual(currentPadding, expectedPadding, 'modal padding should be adjusted while opening')
+        done()
+      })
+      .bootstrapModal('show')
+  })
+
   QUnit.test('should adjust the inline body padding when opening and restore when closing', function (assert) {
     assert.expect(2)
     var done = assert.async()

From cbaf7a7b79c78ec7d877f348d12102acde6adfa0 Mon Sep 17 00:00:00 2001
From: David Bailey <techdavid@users.noreply.github.com>
Date: Tue, 29 Aug 2017 15:42:58 +0100
Subject: [PATCH 2/2] Fix failing test

_adjustDialog should be called when the modal is first displayed to prevent it jumping position when the viewport is resized
---
 js/src/modal.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/src/modal.js b/js/src/modal.js
index ab73230c8f..5892ed0451 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -135,6 +135,8 @@ const Modal = (($) => {
       this._checkScrollbar()
       this._setScrollbar()
 
+      this._adjustDialog()
+
       $(document.body).addClass(ClassName.OPEN)
 
       this._setEscapeEvent()