fix event binding in modal.js

f5ce6617 · fat · a7a87c8e · f5ce6617 · f5ce6617 · f5ce6617
Commit f5ce6617 authored 11 years ago by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 15 additions and 15 deletions
+15 -15
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -872,18 +872,18 @@
  Modal.prototype.enforceFocus = function () {
    $(document)
      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', function (e) {
+      .on('focusin.bs.modal', $.proxy(function (e) {
-      if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-        this.$element.focus()
+          this.$element.focus()
-      }
+        }
-    }, this)
+      }, this))
  }
  Modal.prototype.escape = function () {
    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', function ( e ) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
        e.which == 27 && this.hide()
-      }, this)
+      }, this))
    } else if (!this.isShown) {
      this.$element.off('keyup.dismiss.bs.modal')
    }

--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/js/modal.js
+++ b/js/modal.js
@@ -106,18 +106,18 @@
  Modal.prototype.enforceFocus = function () {
    $(document)
      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', function (e) {
+      .on('focusin.bs.modal', $.proxy(function (e) {
-      if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-        this.$element.focus()
+          this.$element.focus()
-      }
+        }
-    }, this)
+      }, this))
  }
  Modal.prototype.escape = function () {
    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', function ( e ) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
        e.which == 27 && this.hide()
-      }, this)
+      }, this))
    } else if (!this.isShown) {
      this.$element.off('keyup.dismiss.bs.modal')
    }