bootstrap-modal-rails 2.2.0 → 2.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTBhYmUzNTI3Y2VkYjFjMzEwZGQyMzg0ODk5NGVjODNmOGI5NTkzZg==
+    ODc3NDI2N2Q4YWFhOGFmN2QzM2E4NmI2MWNjODRlMzYzZTIyYTYwMQ==
   data.tar.gz: !binary |-
-    MmZjNWFjNThhMjI4OWVhODY3N2ViZjAyY2NmZGIzODM1NTFjNDI2NA==
+    MGZiZjc2ZjI3MjdjZDQ1ZjQ3OTQ0MjFjNzczMTZjMzFmOGU1ZjdkNw==
 SHA512:
   metadata.gz: !binary |-
-    ZmZjNjEzOTc1N2VjMGVmOWM4YWYzOTRhMDRkMjY5ZTk5YTllNjAwN2ZhNzlh
-    YWY3MzlmNDg0ODIwZDJjMjU0MjI5OGM4MzcwNDM2OWE1Nzk2ZjM0ZGE2ZmE0
-    NzUwOWYyNjM1ZmEyOThlNzJmOGY5NWMzY2Y2MjlhNDRlYjJlYWI=
+    OTY3YTY4NGQxODBiNzdkYjE4ODA1YTM4ODU0ZjA0YjMwMGMwMDdkYWQ0MWU2
+    N2FlZTM2ODU0MjVmN2IxODYwZGFiMjliZjk5ODkzZTgyZTBlYzg0NjNhOWZk
+    NTYwMzQ5NmYxOTIwYzNjNmY5YWE4ODhjMDIyMzg0MjkzZWEzZDQ=
   data.tar.gz: !binary |-
-    OGFlM2I4YzVlNDRhNjI2YzkxZjYwY2Y4OGM2YmNlZTkxYmU4ZTRmZmRiNTBm
-    MTgwZjAxZmZmYWZlZTU5OWE3NjQxNTAyODU2MWI3NDM3N2YwNjQyNjNjZjYx
-    NTU1Zjc1ZDJlYWFhOTk2NTUzZDliNjIwMGQxNDAyOTdjYTRjYTg=
+    ZTFlODNkNmE4MjNlNWE1MzhjN2JkNzVmNTQ5ZTQ3YmQxZTEwNGVmN2QyNWE0
+    NmI1ZTg5YmJlNzBjZGRmZmVkOWNkNDA2MjQ4ZTRkNDUxN2FlMGE5Y2UxYjg3
+    NTBjMGU1MTM5NGMxZWU1ZDY4NGIwYTliYjdmNWY1MDRmNWQzNWM=

data/lib/bootstrap-modal-rails/version.rb

@@ -1,7 +1,7 @@
 module Bootstrap
   module Modal
     module Rails
-      VERSION = "2.2.0"
+      VERSION = "2.2.4"
     end
   end
 end

data/vendor/assets/javascripts/bootstrap-modal.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modal.js v2.2.0
+ * bootstrap-modal.js v2.2.4
  * ===========================================================
  * Copyright 2012 Jordan Schroter
  *
@@ -315,7 +315,8 @@
 			this.$element.removeData('modal');
 			this.$element
 				.removeClass('in')
-				.attr('aria-hidden', true);
+				.attr('aria-hidden', true)
+				.trigger('destroyed');
 		}
 	};
 

data/vendor/assets/javascripts/bootstrap-modalmanager.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modalmanager.js v2.2.0
+ * bootstrap-modalmanager.js v2.2.4
  * ===========================================================
  * Copyright 2012 Jordan Schroter.
  *
@@ -110,43 +110,27 @@
 			}));
 
 			modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) {
-
 				that.backdrop(modal);
-				if (modal.$backdrop){
+				// handle the case when a modal may have been removed from the dom before this callback executes
+				if (!modal.$element.parent().length) {
+					that.destroyModal(modal);
+				} else if (modal.$backdrop){
 					var transition = $.support.transition && modal.$element.hasClass('fade');
 
 					// trigger a relayout due to firebox's buggy transition end event 
 					if (transition) { modal.$element[0].offsetWidth; }
-
 					$.support.transition && modal.$element.hasClass('fade') ?
-						modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) :
-						that.destroyModal(modal);
+						modal.$backdrop.one($.support.transition.end, function () { modal.destroy(); }) :
+						modal.destroy();
 				} else {
-					that.destroyModal(modal);
+					modal.destroy();
 				}
 
 			}));
 
-			modal.$element.on('destroy.modalmanager', targetIsSelf(function (e) {
-				that.removeModal(modal);
+			modal.$element.on('destroyed.modalmanager', targetIsSelf(function (e) {
+				that.destroyModal(modal);
 			}));
-
-		},
-
-		destroyModal: function (modal) {
-			modal.destroy();
-
-			var hasOpenModal = this.hasOpenModal();
-
-			this.$element.toggleClass('modal-open', hasOpenModal);
-
-			if (!hasOpenModal){
-				this.$element.removeClass('page-overflow');
-			}
-
-			this.removeContainer(modal);
-
-			this.setFocus();
 		},
 
 		getOpenModals: function () {
@@ -172,13 +156,24 @@
 			if (!topModal) return;
 
 			topModal.focus();
-
 		},
 
-		removeModal: function (modal) {
+		destroyModal: function (modal) {
 			modal.$element.off('.modalmanager');
 			if (modal.$backdrop) this.removeBackdrop(modal);
 			this.stack.splice(this.getIndexOfModal(modal), 1);
+
+			var hasOpenModal = this.hasOpenModal();
+
+			this.$element.toggleClass('modal-open', hasOpenModal);
+
+			if (!hasOpenModal){
+				this.$element.removeClass('page-overflow');
+			}
+
+			this.removeContainer(modal);
+
+			this.setFocus();
 		},
 
 		getModalAt: function (index) {
@@ -419,4 +414,10 @@
 
 	$.fn.modalmanager.Constructor = ModalManager
 
+	// ModalManager handles the modal-open class so we need 
+	// to remove conflicting bootstrap 3 event handlers
+	$(function () {
+		$(document).off('show.bs.modal').off('hidden.bs.modal');
+	});
+
 }(jQuery);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-modal-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.4
 platform: ruby
 authors:
 - Vicente Reig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties