bootstrap-modal-rails 2.2.4 → 2.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc3NDI2N2Q4YWFhOGFmN2QzM2E4NmI2MWNjODRlMzYzZTIyYTYwMQ==
+    NWYwNGVjMDcxMzFmMDBlMGUxZDlkYjM0YTFlYjQ5ZGNkZTJlNjdiMA==
   data.tar.gz: !binary |-
-    MGZiZjc2ZjI3MjdjZDQ1ZjQ3OTQ0MjFjNzczMTZjMzFmOGU1ZjdkNw==
+    YWM0M2Q5OGM3YmFhNGRkNDY2ZTEwMzBmMGUwNzI2M2VkNDUwMTcwNw==
 SHA512:
   metadata.gz: !binary |-
-    OTY3YTY4NGQxODBiNzdkYjE4ODA1YTM4ODU0ZjA0YjMwMGMwMDdkYWQ0MWU2
-    N2FlZTM2ODU0MjVmN2IxODYwZGFiMjliZjk5ODkzZTgyZTBlYzg0NjNhOWZk
-    NTYwMzQ5NmYxOTIwYzNjNmY5YWE4ODhjMDIyMzg0MjkzZWEzZDQ=
+    MjA3ZDIxYTBiYjVmN2M5NzYzNzljMDg5YzY0M2YyZDMwMjNjZTlkYzFkYWNh
+    YmQ1Nzk4NTgxNmEwMTdhMDVhZDQ5MTg1YWIyMTczYTNjMzgyNmJmMjMxNjU5
+    NTA1MTg2MWJmN2Y0M2Q3NWVkYzQyMzZjNjUxNTQ1YWYwYjlhM2I=
   data.tar.gz: !binary |-
-    ZTFlODNkNmE4MjNlNWE1MzhjN2JkNzVmNTQ5ZTQ3YmQxZTEwNGVmN2QyNWE0
-    NmI1ZTg5YmJlNzBjZGRmZmVkOWNkNDA2MjQ4ZTRkNDUxN2FlMGE5Y2UxYjg3
-    NTBjMGU1MTM5NGMxZWU1ZDY4NGIwYTliYjdmNWY1MDRmNWQzNWM=
+    YmYyNWRmMTVmNjI1MGY3ZWZlZTUxYTU0OGNjOThkZTEzNDQzNTFjMWRlNzc5
+    ODIzYjUxMTFiMTQ2OTIwNzc3MjU0ZTk5ODA3OGQxMTlhOGNmNjhlOTIzNzQx
+    NTliMDkyZmQ0NjFhNzNiZDFkMDU2MGM5OTdkZjE4NzQ0NGFjZDU=

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

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

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modal.js v2.2.4
+ * bootstrap-modal.js v2.2.5
  * ===========================================================
  * Copyright 2012 Jordan Schroter
  *
@@ -81,7 +81,7 @@
 
 			this.$element.trigger(e);
 
-			if (!this.isShown || e.isDefaultPrevented()) return (this.isShown = false);
+			if (!this.isShown || e.isDefaultPrevented()) return;
 
 			this.isShown = false;
 
@@ -294,29 +294,26 @@
 
 		destroy: function () {
 			var e = $.Event('destroy');
+
 			this.$element.trigger(e);
-			if (e.isDefaultPrevented()) return;
 
-			this.teardown();
-		},
+			if (e.isDefaultPrevented()) return;
 
-		teardown: function () {
-			if (!this.$parent.length){
+			this.$element
+				.off('.modal')
+				.removeData('modal')
+				.removeClass('in')
+				.attr('aria-hidden', true);
+			
+			if (this.$parent !== this.$element.parent()) {
+				this.$element.appendTo(this.$parent);
+			} else if (!this.$parent.length) {
+				// modal is not part of the DOM so remove it.
 				this.$element.remove();
 				this.$element = null;
-				return;
-			}
-
-			if (this.$parent !== this.$element.parent()){
-				this.$element.appendTo(this.$parent);
 			}
 
-			this.$element.off('.modal');
-			this.$element.removeData('modal');
-			this.$element
-				.removeClass('in')
-				.attr('aria-hidden', true)
-				.trigger('destroyed');
+			this.$element.trigger('destroyed');
 		}
 	};
 

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modalmanager.js v2.2.4
+ * bootstrap-modalmanager.js v2.2.5
  * ===========================================================
  * Copyright 2012 Jordan Schroter.
  *
@@ -385,7 +385,7 @@
 	// if Boostsrap namespaced events, this would not be needed.
 	function targetIsSelf(callback){
 		return function (e) {
-			if (this === e.target){
+			if (e && this === e.target){
 				return callback.apply(this, arguments);
 			}
 		}

metadata

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