test/dummy/tmp/cache/assets/test/sprockets/057089195001bff3a770cec267e0877b in bootstrap-sass-rails-2.3.1.1 vs test/dummy/tmp/cache/assets/test/sprockets/057089195001bff3a770cec267e0877b in bootstrap-sass-rails-2.3.1.2

@@ -1,9 +1,9 @@
 {I"
 class:EFI"ProcessedAsset;FI"logical_path;FI"twitter/bootstrap/modal.js;TI"
pathname;FI"v/Users/mjonuschat/Documents/Development/bootstrap-sass-rails/vendor/assets/javascripts/twitter/bootstrap/modal.js;TI"content_type;FI"application/javascript;FI"
-mtime;FI"2012-11-18T17:11:19+01:00;FI"length;FiI"digest;F"%124f0b5f74ab51bae9d06f1021393940I"source;FI"/* =========================================================
- * bootstrap-modal.js v2.2.1
+mtime;Fl+ÁTQQI"length;Fi
I"digest;F"%68d8ad5c140b08e28ae1782c396169deI"source;FI"
/* =========================================================
+ * bootstrap-modal.js v2.3.1
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,12 +61,11 @@
 
           if (!that.$element.parent().length) {
             that.$element.appendTo(document.body) //don't move modals dom position
           }
 
-          that.$element
-            .show()
+          that.$element.show()
 
           if (transition) {
             that.$element[0].offsetWidth // force reflow
           }
 
@@ -140,20 +139,21 @@
           clearTimeout(timeout)
           that.hideModal()
         })
       }
 
-    , hideModal: function (that) {
-        this.$element
-          .hide()
-          .trigger('hidden')
-
-        this.backdrop()
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
       }
 
     , removeBackdrop: function () {
-        this.$backdrop.remove()
+        this.$backdrop && this.$backdrop.remove()
         this.$backdrop = null
       }
 
     , backdrop: function (callback) {
         var that = this
@@ -173,20 +173,22 @@
 
           if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
           this.$backdrop.addClass('in')
 
+          if (!callback) return
+
           doAnimate ?
             this.$backdrop.one($.support.transition.end, callback) :
             callback()
 
         } else if (!this.isShown && this.$backdrop) {
           this.$backdrop.removeClass('in')
 
           $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
-            this.removeBackdrop()
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
 
         } else if (callback) {
           callback()
         }
       }
@@ -194,10 +196,12 @@
 
 
  /* MODAL PLUGIN DEFINITION
   * ======================= */
 
+  var old = $.fn.modal
+
   $.fn.modal = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
         , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
@@ -214,10 +218,19 @@
   }
 
   $.fn.modal.Constructor = Modal
 
 
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
  /* MODAL DATA-API
   * ============== */
 
   $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
     var $this = $(this)
@@ -233,7 +246,7 @@
         $this.focus()
       })
   })
 
 }(window.jQuery);
-;FI"dependency_digest;F"%0afd7d28c6e79403714fff4b48e07cd2I"required_paths;F[I"v/Users/mjonuschat/Documents/Development/bootstrap-sass-rails/vendor/assets/javascripts/twitter/bootstrap/modal.js;TI"dependency_paths;F[{I"	path;FI"v/Users/mjonuschat/Documents/Development/bootstrap-sass-rails/vendor/assets/javascripts/twitter/bootstrap/modal.js;TI"
-mtime;FI"2012-11-18T17:11:19+01:00;FI"digest;F"%5d2ac5cc7fbfcdee1942555217f43672I"
_version;F"%5696f2e92b7a87e2ea819987dbf64f5c
+;TI"dependency_digest;F"%d1b6a0d721569ad7a15950d261c3f9f9I"required_paths;F[I"v/Users/mjonuschat/Documents/Development/bootstrap-sass-rails/vendor/assets/javascripts/twitter/bootstrap/modal.js;TI"dependency_paths;F[{I"	path;FI"v/Users/mjonuschat/Documents/Development/bootstrap-sass-rails/vendor/assets/javascripts/twitter/bootstrap/modal.js;TI"
+mtime;FI"2013-03-26T08:56:49+01:00;FI"digest;F"%8d2f5d7c01253edc059b2424dcbc5173I"
_version;F"%528eaba029222e62755ebcb12e7fbaba
\ No newline at end of file