Merge branch 'v4-dev' into v4-dev-xmr-docs-example-plugin

twbs · Oct 21, 2018 · 6349000 · 6349000
2 parents 9a2e841 + 9ed0b31
commit 6349000
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 410 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,15 @@
 # Enforce Unix newlines
-* text=auto eol=lf
+*.css   text eol=lf
+*.html  text eol=lf
+*.js    text eol=lf
+*.json  text eol=lf
+*.md    text eol=lf
+*.rb    text eol=lf
+*.scss  text eol=lf
+*.svg   text eol=lf
+*.txt   text eol=lf
+*.xml   text eol=lf
+*.yml   text eol=lf
 
 # Don't diff or textually merge source maps
 *.map   binary

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,7 +37,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-toc (0.8.0)
       nokogiri (~> 1.7)
-    jekyll-watch (2.1.1)
+    jekyll-watch (2.1.2)
       listen (~> 3.0)
     kramdown (1.17.0)
     liquid (4.0.1)

diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
@@ -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')