bootstrap_builder 0.2.2 → 0.2.3

data/README.md

@@ -14,58 +14,69 @@ A Rails form builder that generates [Twitter Bootstrap](http://twitter.github.co
 
 Add gem definition to your Gemfile:
     
-    gem 'bootstrap_builder'
+``` ruby
+gem 'bootstrap_builder'
+```
     
 Bundle it:
     
     bundle install
 
-Require it in your CSS manifest file:
+Require it in your CSS manifest file: ('bootstrap-responsive' is optional)
 
-    //= require bootstrap
-    //= require bootstrap-responsive  <-- only if you want to support other devices
-    
-Require it in your Javascript manifest file if you want to use Bootstrap's jQuery plugins:
+``` css
+//= require bootstrap
+//= require bootstrap-responsive
+```
 
-    //= require bootstrap
+Require it in your Javascript manifest file if you want to use Bootstrap's jQuery plugins:
 
+``` css
+//= require bootstrap
+```
 ## Usage (with haml)
 
 Use `bootstrap_form_for` when you want to render a form with Bootstrap markup.
 
 ### A sample user form
 
-    = bootstrap_form_for @user, :url => [:admin, @user] do |f|
-      = f.text_field :name
-      = f.number_field :age, nil, :in => 1...100
-      = f.email_field :email, :prepend => '@'
-      = f.phone_field :phone
-      = f.password_field :password
-      = f.password_field :password_confirmation
-      = f.select :role, User::ROLES
-      = f.time_zone_select :time_zone
-      = f.check_box :reminder, :label => 'Send Daily Reminder?'
-      = f.submit 'Save'
+``` ruby
+= bootstrap_form_for @user, :url => [:admin, @user] do |f|
+  = f.text_field :name
+  = f.number_field :age, nil, :in => 1...100
+  = f.email_field :email, :prepend => '@'
+  = f.phone_field :phone
+  = f.password_field :password
+  = f.password_field :password_confirmation
+  = f.select :role, User::ROLES
+  = f.time_zone_select :time_zone
+  = f.check_box :reminder, :label => 'Send Daily Reminder?'
+  = f.submit 'Save'
+```
 
 ### A login form
 
 Add a class to the form or any field to change the way it is rendered.
 
-    = bootstrap_form_for @session_user, :url => login_path, :class => 'form-horizontal' do |f|
-      = f.text_field :email
-      = f.password_field :password
-      = f.check_box :remember_me, :label => 'Remember me when I come back'
-      = f.submit 'Log In'
-  
+``` ruby
+= bootstrap_form_for @session_user, :url => login_path, :class => 'form-horizontal' do |f|
+  = f.text_field :email
+  = f.password_field :password
+  = f.check_box :remember_me, :label => 'Remember me when I come back'
+  = f.submit 'Log In'
+```
+
 ### A search form
 
 Hide the label by passing `:label => ''` on any field. (Useful for inline search forms)
 
 
-    = bootstrap_form_for @search, :url => [:admin, :users], :html => {:method => :get, :class => 'form-search'} do |f|
-      = f.text_field :name_equals, :label => 'Find by', :placeholder => 'Name'
-      = f.select :role_equals, User::ROLES, :label => ''
-      = f.submit 'Search', :class => 'btn-default'
+``` ruby
+= bootstrap_form_for @search, :url => [:admin, :users], :html => {:method => :get, :class => 'form-search'} do |f|
+  = f.text_field :name_equals, :label => 'Find by', :placeholder => 'Name'
+  = f.select :role_equals, User::ROLES, :label => ''
+  = f.submit 'Search', :class => 'btn-default'
+```
 
 *(Example using [MetaSearch](https://github.com/ernie/meta_search) helpers)*
 
@@ -73,48 +84,66 @@ Hide the label by passing `:label => ''` on any field. (Useful for inline search
 
 A single checkbox:
 
-    = f.check_box :send_reminder
+``` ruby
+= f.check_box :send_reminder
+```
 
 A group of checkboxes:
   
-    = f.check_box :colours, :values => [['Red', 1], ['Green', 2], ['Blue', 3]]
+``` ruby
+= f.check_box :colours, :values => [['Red', 1], ['Green', 2], ['Blue', 3]]
+```
 
 ### Radio buttons
 
 A single radio button:
 
-    = f.check_box :role, 'admin'
+``` ruby
+= f.check_box :role, 'admin'
+```
 
 A group of radio buttons:
 
-    = f.radio_button :role, [['Admin', 1], ['Manager', 2], ['Editor', 3]]
+``` ruby
+= f.radio_button :role, [['Admin', 1], ['Manager', 2], ['Editor', 3]]
+```
 
 ### More examples
 
 Override the autogenerated label by using the `:label` option on any element.
 
-    = f.text_field :name, :label => 'Full name'
+``` ruby
+= f.text_field :name, :label => 'Full name'
+```
 
 Use `:append` and `:prepend` on any field:
 
-    = f.text_field :price, :append => '.00'
-    = f.email_field :email, :prepend => '@'
-
+``` ruby
+= f.text_field :price, :append => '.00'
+= f.email_field :email, :prepend => '@'
+```
 
 Use `:help_block` to provide extra description to a fields:
 
-    = f.email_field :email, :help_block => 'Please enter your emails address'
+``` ruby
+= f.email_field :email, :help_block => 'Please enter your emails address'
+```
 
+## Extra functionality
 
-### Prevent double clicking
+### Prevent double clicking on submit buttons
 
 If you add 'bootstrap_builder' to your Javascript manifest you'll be able to add an extra `:change_to_text` option to submit buttons.
   
-    //= require bootstrap_builder
+``` css
+//= require bootstrap_builder
+```
 
 This will allow you to prevent double clicking by replacing the submit button with a string after the button is clicked:
 
-    = f.submit 'Log In', :change_to_text => 'Saving ...'
+``` ruby
+= f.submit 'Log In', :change_to_text => 'Saving ...'
+```
 
 
 ---

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/app/assets/javascripts/bootstrap.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.0.0
+ * bootstrap-transition.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.
@@ -47,10 +47,9 @@
     })()
 
   })
-  
-}( window.jQuery )
-/* ==========================================================
- * bootstrap-alert.js v2.0.0
+
+}( window.jQuery );/* ==========================================================
+ * bootstrap-alert.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -102,11 +101,14 @@
 
       $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-      $parent.removeClass('in')
+      $parent
+        .trigger('close')
+        .removeClass('in')
 
       function removeElement() {
-        $parent.remove()
-        $parent.trigger('closed')
+        $parent
+          .trigger('closed')
+          .remove()
       }
 
       $.support.transition && $parent.hasClass('fade') ?
@@ -139,9 +141,8 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
-/* ============================================================
- * bootstrap-button.js v2.0.0
+}( window.jQuery );/* ============================================================
+ * bootstrap-button.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -233,13 +234,14 @@
 
   $(function () {
     $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.target).button('toggle')
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
     })
   })
 
-}( window.jQuery )
-/* ==========================================================
- * bootstrap-carousel.js v2.0.0
+}( window.jQuery );/* ==========================================================
+ * bootstrap-carousel.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -269,6 +271,9 @@
     this.$element = $(element)
     this.options = $.extend({}, $.fn.carousel.defaults, options)
     this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
   }
 
   Carousel.prototype = {
@@ -301,6 +306,7 @@
 
   , pause: function () {
       clearInterval(this.interval)
+      this.interval = null
       return this
     }
 
@@ -328,6 +334,8 @@
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
+      if ($next.hasClass('active')) return
+
       if (!$.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger('slide')
         $active.removeClass('active')
@@ -373,6 +381,7 @@
 
   $.fn.carousel.defaults = {
     interval: 5000
+  , pause: 'hover'
   }
 
   $.fn.carousel.Constructor = Carousel
@@ -391,9 +400,8 @@
     })
   })
 
-}( window.jQuery )
-/* =============================================================
- * bootstrap-collapse.js v2.0.0
+}( window.jQuery );/* =============================================================
+ * bootstrap-collapse.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -468,7 +476,9 @@
         [dimension](size || 'auto')
         [0].offsetWidth
 
-      this.$element.addClass('collapse')
+      this.$element[size ? 'addClass' : 'removeClass']('collapse')
+
+      return this
     }
 
   , transition: function ( method, startEvent, completeEvent ) {
@@ -527,9 +537,8 @@
     })
   })
 
-}( window.jQuery )
-/* ============================================================
- * bootstrap-dropdown.js v2.0.0
+}( window.jQuery );/* ============================================================
+ * bootstrap-dropdown.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -619,9 +628,8 @@
     $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery )
-/* =========================================================
- * bootstrap-modal.js v2.0.0
+}( window.jQuery );/* =========================================================
+ * bootstrap-modal.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
@@ -648,7 +656,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))
   }
@@ -799,16 +807,17 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = typeof option == 'object' && option
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), 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
@@ -828,9 +837,8 @@
     })
   })
 
-}( window.jQuery )
-/* ===========================================================
- * bootstrap-tooltip.js v2.0.0
+}( window.jQuery );/* ===========================================================
+ * bootstrap-tooltip.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -1037,7 +1045,7 @@
       title = $e.attr('data-original-title')
         || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
 
-      title = title.toString().replace(/(^\s*|\s*$)/, "")
+      title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
 
       return title
     }
@@ -1098,9 +1106,8 @@
   , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
   }
 
-}( window.jQuery )
-/* ===========================================================
- * bootstrap-popover.js v2.0.0
+}( window.jQuery );/* ===========================================================
+ * bootstrap-popover.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.
@@ -1193,9 +1200,8 @@
   , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
-}( window.jQuery )
-/* =============================================================
- * bootstrap-scrollspy.js v2.0.0
+}( window.jQuery );/* =============================================================
+ * bootstrap-scrollspy.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -1318,9 +1324,8 @@
     })
   })
 
-}( window.jQuery )
-/* ========================================================
- * bootstrap-tab.js v2.0.0
+}( window.jQuery );/* ========================================================
+ * bootstrap-tab.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.
@@ -1448,9 +1453,8 @@
     })
   })
 
-}( window.jQuery )
-/* =============================================================
- * bootstrap-typeahead.js v2.0.0
+}( window.jQuery );/* =============================================================
+ * bootstrap-typeahead.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -1491,6 +1495,7 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
+      this.$element.change();
       return this.hide()
     }
 
@@ -1616,9 +1621,6 @@
     }
 
   , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
       switch(e.keyCode) {
         case 40: // down arrow
         case 38: // up arrow
@@ -1631,6 +1633,7 @@
           break
 
         case 27: // escape
+          if (!this.shown) return
           this.hide()
           break
 
@@ -1638,10 +1641,11 @@
           this.lookup()
       }
 
+      e.stopPropagation()
+      e.preventDefault()
   }
 
   , keypress: function (e) {
-      e.stopPropagation()
       if (!this.shown) return
 
       switch(e.keyCode) {
@@ -1661,12 +1665,12 @@
           this.next()
           break
       }
+
+      e.stopPropagation()
     }
 
   , blur: function (e) {
       var that = this
-      e.stopPropagation()
-      e.preventDefault()
       setTimeout(function () { that.hide() }, 150)
     }
 
@@ -1719,4 +1723,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );