Update 10-bootstrap-modal.js

diff --git a/js/10-bootstrap-modal.js b/js/10-bootstrap-modal.js
index 738129628f86faab13317950b73d7c5818979b15..920f333166d22e835124545059e0c9286bab75d5 100644 (file)
--- a/js/10-bootstrap-modal.js
+++ b/js/10-bootstrap-modal.js
@@ -1,5 +1,5 @@
 /* ========================================================================
 /* ========================================================================

- * Bootstrap: modal.js v3.3.2
+ * Bootstrap: modal.js v3.3.4

  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.


@@ -14,12 +14,15 @@
   // ======================
 
   var Modal = function (element, options) {
   // ======================
 
   var Modal = function (element, options) {

-    this.options        = options
-    this.$body          = $(document.body)
-    this.$element       = $(element)
-    this.$backdrop      =
-    this.isShown        = null
-    this.scrollbarWidth = 0
+    this.options             = options
+    this.$body               = $(document.body)
+    this.$element            = $(element)
+    this.$dialog             = this.$element.find('.modal-dialog')
+    this.$backdrop           = null
+    this.isShown             = null
+    this.originalBodyPad     = null
+    this.scrollbarWidth      = 0
+    this.ignoreBackdropClick = false

 
     if (this.options.remote) {
       this.$element
 
     if (this.options.remote) {
       this.$element


@@ -30,7 +33,7 @@
     }
   }
 
     }
   }
 

-  Modal.VERSION  = '3.3.2'
+  Modal.VERSION  = '3.3.4'

 
   Modal.TRANSITION_DURATION = 300
   Modal.BACKDROP_TRANSITION_DURATION = 150
 
   Modal.TRANSITION_DURATION = 300
   Modal.BACKDROP_TRANSITION_DURATION = 150


@@ -64,6 +67,12 @@
 
     this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
 
     this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 

+    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
+      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
+        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
+      })
+    })
+

     this.backdrop(function () {
       var transition = $.support.transition && that.$element.hasClass('fade')
 
     this.backdrop(function () {
       var transition = $.support.transition && that.$element.hasClass('fade')
 


@@ -75,7 +84,6 @@
         .show()
         .scrollTop(0)
 
         .show()
         .scrollTop(0)
 

-      if (that.options.backdrop) that.adjustBackdrop()

       that.adjustDialog()
 
       if (transition) {
       that.adjustDialog()
 
       if (transition) {


@@ -91,7 +99,7 @@
       var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
 
       transition ?
       var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
 
       transition ?

-        that.$element.find('.modal-dialog') // wait for modal to slide in
+        that.$dialog // wait for modal to slide in

           .one('bsTransitionEnd', function () {
             that.$element.trigger('focus').trigger(e)
           })
           .one('bsTransitionEnd', function () {
             that.$element.trigger('focus').trigger(e)
           })


@@ -120,6 +128,9 @@
       .removeClass('in')
       .attr('aria-hidden', true)
       .off('click.dismiss.bs.modal')
       .removeClass('in')
       .attr('aria-hidden', true)
       .off('click.dismiss.bs.modal')

+      .off('mouseup.dismiss.bs.modal')
+
+    this.$dialog.off('mousedown.dismiss.bs.modal')

 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element


@@ -180,13 +191,18 @@
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')

-        .prependTo(this.$element)
-        .on('click.dismiss.bs.modal', $.proxy(function (e) {
-          if (e.target !== e.currentTarget) return
-          this.options.backdrop == 'static'
-            ? this.$element[0].focus.call(this.$element[0])
-            : this.hide.call(this)
-        }, this))
+        .appendTo(this.$body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (this.ignoreBackdropClick) {
+          this.ignoreBackdropClick = false
+          return
+        }
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus()
+          : this.hide()
+      }, this))

 
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
 
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 


@@ -221,16 +237,9 @@
   // these following methods are used to handle overflowing modals
 
   Modal.prototype.handleUpdate = function () {
   // these following methods are used to handle overflowing modals
 
   Modal.prototype.handleUpdate = function () {

-    if (this.options.backdrop) this.adjustBackdrop()

     this.adjustDialog()
   }
 
     this.adjustDialog()
   }
 

-  Modal.prototype.adjustBackdrop = function () {
-    this.$backdrop
-      .css('height', 0)
-      .css('height', this.$element[0].scrollHeight)
-  }
-

   Modal.prototype.adjustDialog = function () {
     var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
 
   Modal.prototype.adjustDialog = function () {
     var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
 


@@ -248,17 +257,23 @@
   }
 
   Modal.prototype.checkScrollbar = function () {
   }
 
   Modal.prototype.checkScrollbar = function () {

-    this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
+    var fullWindowWidth = window.innerWidth
+    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
+      var documentElementRect = document.documentElement.getBoundingClientRect()
+      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
+    }
+    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth

     this.scrollbarWidth = this.measureScrollbar()
   }
 
   Modal.prototype.setScrollbar = function () {
     var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
     this.scrollbarWidth = this.measureScrollbar()
   }
 
   Modal.prototype.setScrollbar = function () {
     var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)

+    this.originalBodyPad = document.body.style.paddingRight || ''

     if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
   }
 
   Modal.prototype.resetScrollbar = function () {
     if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
   }
 
   Modal.prototype.resetScrollbar = function () {

-    this.$body.css('padding-right', '')
+    this.$body.css('padding-right', this.originalBodyPad)

   }
 
   Modal.prototype.measureScrollbar = function () { // thx walsh
   }
 
   Modal.prototype.measureScrollbar = function () { // thx walsh