bootstrap-modal-rails 2.1.1 → 2.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTBhYmUzNTI3Y2VkYjFjMzEwZGQyMzg0ODk5NGVjODNmOGI5NTkzZg==
+  data.tar.gz: !binary |-
+    MmZjNWFjNThhMjI4OWVhODY3N2ViZjAyY2NmZGIzODM1NTFjNDI2NA==
+SHA512:
+  metadata.gz: !binary |-
+    ZmZjNjEzOTc1N2VjMGVmOWM4YWYzOTRhMDRkMjY5ZTk5YTllNjAwN2ZhNzlh
+    YWY3MzlmNDg0ODIwZDJjMjU0MjI5OGM4MzcwNDM2OWE1Nzk2ZjM0ZGE2ZmE0
+    NzUwOWYyNjM1ZmEyOThlNzJmOGY5NWMzY2Y2MjlhNDRlYjJlYWI=
+  data.tar.gz: !binary |-
+    OGFlM2I4YzVlNDRhNjI2YzkxZjYwY2Y4OGM2YmNlZTkxYmU4ZTRmZmRiNTBm
+    MTgwZjAxZmZmYWZlZTU5OWE3NjQxNTAyODU2MWI3NDM3N2YwNjQyNjNjZjYx
+    NTU1Zjc1ZDJlYWFhOTk2NTUzZDliNjIwMGQxNDAyOTdjYTRjYTg=

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

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

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modal.js v2.1
+ * bootstrap-modal.js v2.2.0
  * ===========================================================
  * Copyright 2012 Jordan Schroter
  *
@@ -33,12 +33,17 @@
 		constructor: Modal,
 
 		init: function (element, options) {
+			var that = this;
+
 			this.options = options;
 
 			this.$element = $(element)
 				.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this));
 
-			this.options.remote && this.$element.find('.modal-body').load(this.options.remote);
+			this.options.remote && this.$element.find('.modal-body').load(this.options.remote, function () {
+				var e = $.Event('loaded');
+				that.$element.trigger(e);
+			});
 
 			var manager = typeof this.options.manager === 'function' ?
 				this.options.manager.call(this) : this.options.manager;
@@ -202,10 +207,6 @@
 		},
 
 		hideModal: function () {
-			this.$element
-				.hide()
-				.trigger('hidden');
-
 			var prop = this.options.height ? 'height' : 'max-height';
 			var value = this.options.height || this.options.maxHeight;
 
@@ -215,6 +216,9 @@
 					.css(prop, '');
 			}
 
+			this.$element
+				.hide()
+				.trigger('hidden');
 		},
 
 		removeLoading: function () {
@@ -346,7 +350,8 @@
 		resize: false,
 		attentionAnimation: 'shake',
 		manager: 'body',
-		spinner: '<div class="loading-spinner" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
+		spinner: '<div class="loading-spinner" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>',
+		backdropTemplate: '<div class="modal-backdrop" />'
 	};
 
 	$.fn.modal.Constructor = Modal;

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modalmanager.js v2.1
+ * bootstrap-modalmanager.js v2.2.0
  * ===========================================================
  * Copyright 2012 Jordan Schroter.
  *
@@ -79,7 +79,6 @@
 					modal.$element.appendTo(modal.$container);
 
 					that.backdrop(modal, function () {
-
 						modal.$element.show();
 
 						if (transition) {       
@@ -113,8 +112,12 @@
 			modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) {
 
 				that.backdrop(modal);
-
 				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);
@@ -131,7 +134,6 @@
 		},
 
 		destroyModal: function (modal) {
-
 			modal.destroy();
 
 			var hasOpenModal = this.hasOpenModal();
@@ -147,12 +149,17 @@
 			this.setFocus();
 		},
 
-		hasOpenModal: function () {
+		getOpenModals: function () {
+			var openModals = [];
 			for (var i = 0; i < this.stack.length; i++){
-				if (this.stack[i].isShown) return true;
+				if (this.stack[i].isShown) openModals.push(this.stack[i]);
 			}
 
-			return false;
+			return openModals;
+		},
+
+		hasOpenModal: function () {
+			return this.getOpenModals().length > 0;
 		},
 
 		setFocus: function () {
@@ -209,11 +216,12 @@
 			modal.$backdrop = null;
 		},
 
-		createBackdrop: function (animate) {
+		createBackdrop: function (animate, tmpl) {
 			var $backdrop;
 
 			if (!this.$backdropHandle) {
-				$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+				$backdrop = $(tmpl)
+					.addClass(animate)
 					.appendTo(this.$element);
 			} else {
 				$backdrop = this.$backdropHandle;
@@ -234,8 +242,7 @@
 			var $container;
 
 			$container = $('<div class="modal-scrollable">')
-				.css('z-index', getzIndex( 'modal',
-					modal ? this.getIndexOfModal(modal) : this.stack.length ))
+				.css('z-index', getzIndex('modal', this.getOpenModals().length))
 				.appendTo(this.$element);
 
 			if (modal && modal.options.backdrop != 'static') {
@@ -260,9 +267,9 @@
 			if (modal.isShown && showBackdrop) {
 				var doAnimate = $.support.transition && animate && !this.$backdropHandle;
 
-				modal.$backdrop = this.createBackdrop(animate);
+				modal.$backdrop = this.createBackdrop(animate, modal.options.backdropTemplate);
 
-				modal.$backdrop.css('z-index', getzIndex( 'backdrop', this.getIndexOfModal(modal) ));
+				modal.$backdrop.css('z-index', getzIndex( 'backdrop', this.getOpenModals().length ));
 
 				if (doAnimate) modal.$backdrop[0].offsetWidth; // force reflow
 
@@ -311,16 +318,18 @@
 
 			if (!this.isLoading) {
 
-				this.$backdropHandle = this.createBackdrop('fade');
+				this.$backdropHandle = this.createBackdrop('fade', this.options.backdropTemplate);
 
 				this.$backdropHandle[0].offsetWidth; // force reflow
 
+				var openModals = this.getOpenModals();
+
 				this.$backdropHandle
-					.css('z-index', getzIndex('backdrop', this.stack.length))
+					.css('z-index', getzIndex('backdrop', openModals.length + 1))
 					.addClass('in');
 
 				var $spinner = $(this.options.spinner)
-					.css('z-index', getzIndex('modal', this.stack.length))
+					.css('z-index', getzIndex('modal', openModals.length + 1))
 					.appendTo(this.$element)
 					.addClass('in');
 
@@ -404,7 +413,8 @@
 	$.fn.modalmanager.defaults = {
 		backdropLimit: 999,
 		resize: true,
-		spinner: '<div class="loading-spinner fade" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
+		spinner: '<div class="loading-spinner fade" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>',
+		backdropTemplate: '<div class="modal-backdrop" />'
 	};
 
 	$.fn.modalmanager.Constructor = ModalManager

data/vendor/assets/stylesheets/bootstrap-modal-bs3patch.css

@@ -0,0 +1,35 @@
+/*!
+ * Bootstrap Modal
+ *
+ * Copyright Jordan Schroter
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Boostrap 3 patch for for bootstrap-modal. Include BEFORE bootstrap-modal.css!
+ */
+
+body.modal-open, 
+.modal-open .navbar-fixed-top, 
+.modal-open .navbar-fixed-bottom {
+  margin-right: 0;
+}
+
+.modal {
+  left: 50%;
+  bottom: auto;
+  right: auto;
+  padding: 0;
+  width: 500px;
+  margin-left: -250px;
+  background-color: #ffffff;
+  border: 1px solid #999999;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+  background-clip: padding-box;
+}
+
+.modal.container {
+  max-width: none;
+}

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-modal-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors:
 - Vicente Reig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,37 +35,31 @@ files:
 - lib/bootstrap-modal-rails.rb
 - vendor/assets/javascripts/bootstrap-modal.js
 - vendor/assets/javascripts/bootstrap-modalmanager.js
+- vendor/assets/stylesheets/bootstrap-modal-bs3patch.css
 - vendor/assets/stylesheets/bootstrap-modal.css
 - LICENSE.txt
 - README.md
 homepage: http://github.com/vicentereig/bootstrap-modal-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !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.25
+rubygems_version: 2.1.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails gemified bootstrap-modal extension by Jordan Schroter.
 test_files: []