anjlab-bootstrap-rails 2.0.0.4 → 2.0.0.5

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "2.0.0.4"
+    VERSION = "2.0.0.5"
   end
 end

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

@@ -26,7 +26,7 @@
   * ====================== */
 
   var Modal = function ( content, options ) {
-    this.options = $.extend({}, $.fn.modal.defaults, options)
+    this.options = options
     this.$element = $(content)
       .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
   }
@@ -177,16 +177,17 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = typeof option == 'object' && option
+        , options = $.extend({}, $.fn.modal.defaults, typeof option == 'object' && option)
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
-      else data.show()
+      else if (options.show) data.show()
     })
   }
 
   $.fn.modal.defaults = {
       backdrop: true
     , keyboard: true
+    , show: true
   }
 
   $.fn.modal.Constructor = Modal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.4
+  version: 2.0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70093540083320 !ruby/object:Gem::Requirement
+  requirement: &70108043104640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093540083320
+  version_requirements: *70108043104640
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70093540082900 !ruby/object:Gem::Requirement
+  requirement: &70108043103440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093540082900
+  version_requirements: *70108043103440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70093540082360 !ruby/object:Gem::Requirement
+  requirement: &70108043101660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70093540082360
+  version_requirements: *70108043101660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70093540081840 !ruby/object:Gem::Requirement
+  requirement: &70108043100120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70093540081840
+  version_requirements: *70108043100120
 description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
   projects
 email: