bootstrap-modal-rails 2.1 → 2.1.1

data/README.md

@@ -29,18 +29,24 @@ $ gem install bootstrap-modal-rails
 ### Stylesheets
 
 ```sass
-@import bootstrap-modal
+//=require bootstrap-modal
 ```
 
 ### Javascripts
+
 ```coffeescript
 #= require bootstrap-modal
 #= require bootstrap-modalmanager
 ```
 
+```javascript
+//= require bootstrap-modal
+//= require bootstrap-modalmanager
+```
+
 ## Versioning
 
-This gem will directly track the semantic versioning releases of the [https://github.com/jschr/bootstrap-modal](Bootstrap Modal) project.
+This gem will directly track the semantic versioning releases of the [Bootstrap Modal](https://github.com/jschr/bootstrap-modal) project.
 If it should be necessary a build number will be added to the version to mark releases specific to this gem.
 
 ## Note on Patches / Pull Requests

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Modal
     module Rails
-      VERSION = "2.1"
+      VERSION = "2.1.1"
     end
   end
 end

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

@@ -58,7 +58,7 @@
 
 			if (this.isShown) return;
 
-			this.$element.triggerHandler(e);
+			this.$element.trigger(e);
 
 			if (e.isDefaultPrevented()) return;
 
@@ -74,7 +74,7 @@
 
 			e = $.Event('hide');
 
-			this.$element.triggerHandler(e);
+			this.$element.trigger(e);
 
 			if (!this.isShown || e.isDefaultPrevented()) return (this.isShown = false);
 
@@ -124,14 +124,14 @@
 				.css('overflow', '')
 				.css(prop, '');
 
-			var modalOverflow = $(window).height() - 10 < this.$element.height();
-
 			if (value){
 				this.$element.find('.modal-body')
 					.css('overflow', 'auto')
 					.css(prop, value);
 			}
 
+			var modalOverflow = $(window).height() - 10 < this.$element.height();
+            
 			if (modalOverflow || this.options.modalOverflow) {
 				this.$element
 					.css('margin-top', 0)
@@ -204,7 +204,7 @@
 		hideModal: function () {
 			this.$element
 				.hide()
-				.triggerHandler('hidden');
+				.trigger('hidden');
 
 			var prop = this.options.height ? 'height' : 'max-height';
 			var value = this.options.height || this.options.maxHeight;
@@ -290,7 +290,7 @@
 
 		destroy: function () {
 			var e = $.Event('destroy');
-			this.$element.triggerHandler(e);
+			this.$element.trigger(e);
 			if (e.isDefaultPrevented()) return;
 
 			this.teardown();
@@ -356,7 +356,7 @@
 	* ============== */
 
 	$(function () {
-		$(document).off('.modal').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+		$(document).off('click.modal').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
 			var $this = $(this),
 				href = $this.attr('href'),
 				$target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))), //strip for ie7

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

@@ -82,6 +82,12 @@
 
 						modal.$element.show();
 
+						if (transition) {       
+							//modal.$element[0].style.display = 'run-in';       
+							modal.$element[0].offsetWidth;
+							//modal.$element.one($.support.transition.end, function () { modal.$element[0].style.display = 'block' });  
+						}
+						
 						modal.layout();
 
 						modal.$element
@@ -90,7 +96,7 @@
 
 						var complete = function () {
 							that.setFocus();
-							modal.$element.triggerHandler('shown');
+							modal.$element.trigger('shown');
 						};
 
 						transition ?
@@ -164,7 +170,7 @@
 
 		removeModal: function (modal) {
 			modal.$element.off('.modalmanager');
-			if (modal.$backdrop) this.removeBackdrop.call(modal);
+			if (modal.$backdrop) this.removeBackdrop(modal);
 			this.stack.splice(this.getIndexOfModal(modal), 1);
 		},
 
@@ -216,7 +222,7 @@
 				this.isLoading && this.removeSpinner();
 			}
 
-			return $backdrop
+			return $backdrop;
 		},
 
 		removeContainer: function (modal) {
@@ -390,7 +396,7 @@
 			var $this = $(this),
 				data = $this.data('modalmanager');
 
-			if (!data) $this.data('modalmanager', (data = new ModalManager(this, option)))
+			if (!data) $this.data('modalmanager', (data = new ModalManager(this, option)));
 			if (typeof option === 'string') data[option].apply(data, [].concat(args))
 		})
 	};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-modal-rails
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -53,15 +53,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 731218777553422648
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 731218777553422648
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails gemified bootstrap-modal extension by Jordan Schroter.