anjlab-bootstrap-rails 0.0.8 → 0.0.9

data/README.md

@@ -66,10 +66,10 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
 //= require bootstrap-alerts
 //= require bootstrap-dropdown
 //= require bootstrap-modal
+//= require bootstrap-twipsy
 //= require bootstrap-popover
 //= require bootstrap-scrollspy
 //= require bootstrap-tabs
-//= require bootstrap-twipsy
 ```
         
 ## Thanks

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

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

@@ -60,7 +60,7 @@
     if ( options ) {
       $.extend( this.settings, options )
 
-      if ( options.show ) {
+      if ( this.settings.show ) {
         this.show()
       }
     }
@@ -81,17 +81,23 @@
 
         escape.call(this)
         backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
           that.$element
             .appendTo(document.body)
             .show()
 
-          if ($.support.transition && that.$element.hasClass('fade')) {
+          if (transition) {
             that.$element[0].offsetWidth // force reflow
           }
 
           that.$element
             .addClass('in')
-            .trigger('shown')
+
+          transition ?
+            that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
         })
 
         return this
@@ -100,6 +106,10 @@
     , hide: function (e) {
         e && e.preventDefault()
 
+        if ( !this.isShown ) {
+          return this
+        }
+
         var that = this
         this.isShown = false
 
@@ -220,7 +230,7 @@
   $.fn.modal.defaults = {
     backdrop: false
   , keyboard: false
-  , show: true
+  , show: false
   }
 
 
@@ -235,4 +245,4 @@
     })
   })
 
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );

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

@@ -21,27 +21,33 @@
 !function( $ ){
 
   function activate ( element, container ) {
-    container.find('.active').removeClass('active')
+    container.find('> .active').removeClass('active')
     element.addClass('active')
   }
 
   function tab( e ) {
     var $this = $(this)
-      , href = $this.attr('href')
       , $ul = $this.closest('ul')
-      , $controlled
+      , href = $this.attr('href')
+      , previous
 
     if (/^#\w+/.test(href)) {
       e.preventDefault()
 
-      if ($this.hasClass('active')) {
+      if ($this.parent('li').hasClass('active')) {
         return
       }
 
+      previous = $ul.find('.active a')[0]
       $href = $(href)
 
       activate($this.parent('li'), $ul)
       activate($href, $href.parent())
+
+      $this.trigger({
+        type: 'change'
+      , relatedTarget: previous
+      })
     }
   }
 
@@ -59,4 +65,4 @@
     $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
   })
 
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000 Z
+date: 2011-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70135101107960 !ruby/object:Gem::Requirement
+  requirement: &70199458906960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135101107960
+  version_requirements: *70199458906960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70135101107420 !ruby/object:Gem::Requirement
+  requirement: &70199458906440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70135101107420
+  version_requirements: *70199458906440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70135101106940 !ruby/object:Gem::Requirement
+  requirement: &70199458905940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70135101106940
+  version_requirements: *70199458905940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70135101106400 !ruby/object:Gem::Requirement
+  requirement: &70199458905460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70135101106400
+  version_requirements: *70199458905460
 description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
   projects
 email:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects