anjlab-bootstrap-rails 2.0.4.4 → 2.1.0.0

data/README.md

@@ -1,4 +1,4 @@
-# Twitter Bootstrap v2.0.4 for Rails 3
+# Twitter Bootstrap v2.1.0 for Rails 3
 Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
 It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
@@ -10,7 +10,7 @@ anjlab-bootstrap-rails project integrates Bootstrap CSS (with Sass flavour) and
 Include Bootstrap in Gemfile;
 
 ``` ruby
-gem 'anjlab-bootstrap-rails', '>= 2.0', :require => 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', '>= 2.1', :require => 'bootstrap-rails'
 ```
 
 or you can install from latest build;
@@ -27,13 +27,13 @@ and run bundle install.
 Add necessary stylesheet file to app/assets/stylesheets/application.css
 
 ``` css
-*= require bootstrap
-*= require responsive
+*= require twitter/bootstrap
+*= require twitter/bootstrap-responsive
 ```
 
 You can override bootstrap variables:
 
- 1. replace `*= require bootstrap` with `*= require app_bootstrap`
+ 1. replace `*= require twitter/bootstrap` with `*= require app_bootstrap`
  2. create `app_bootstrap.css.scss` :
 
 ```scss
@@ -45,8 +45,8 @@ $gridColumnWidth: 70px;
 $gridGutterWidth: 10px;
 
 // import original bootstrap
-@import "bootstrap";
-@import "responsive";
+@import "twitter/bootstrap";
+@import "twitter/bootstrap-responsive";
 ```
  NOTE: restart `pow` if you are using it.
 
@@ -56,21 +56,22 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
 
 ``` javascript
 // Include all twitter's javascripts
-//= require bootstrap
+//= require twitter/bootstrap
 
 // Or peek any of them yourself
-//= require bootstrap-transition
-//= require bootstrap-alert
-//= require bootstrap-modal
-//= require bootstrap-dropdown
-//= require bootstrap-scrollspy
-//= require bootstrap-tab
-//= require bootstrap-tooltip
-//= require bootstrap-popover
-//= require bootstrap-button
-//= require bootstrap-collapse
-//= require bootstrap-carousel
-//= require bootstrap-typeahead
+//= require twitter/bootstrap/transition
+//= require twitter/bootstrap/alert
+//= require twitter/bootstrap/modal
+//= require twitter/bootstrap/dropdown
+//= require twitter/bootstrap/scrollspy
+//= require twitter/bootstrap/tab
+//= require twitter/bootstrap/tooltip
+//= require twitter/bootstrap/popover
+//= require twitter/bootstrap/button
+//= require twitter/bootstrap/collapse
+//= require twitter/bootstrap/carousel
+//= require twitter/bootstrap/typeahead
+//= require twitter/bootstrap/affix
 ```
 
 ## Upgrade notes from 1.4

data/Rakefile

@@ -10,40 +10,53 @@ namespace :twitter do
     end
   end
 
-  desc "Update Twitter's Bootstrap Assets"
-  task :update => :pull do
 
-    Dir["vendor/twitter/img/*.*"].each do |file|
-      cp file, "vendor/assets/images/", :verbose => true
-    end
+  TW_IMGS = FileList["vendor/twitter/img/*.*"]
+  ASSETS_IMGS = TW_IMGS.pathmap("vendor/assets/images/twitter/%f")
+  ASSETS_IMGS.zip(TW_IMGS).each do |target, source|
+    file target => [source] { cp source, target, verbose: true }
+  end
 
-    Dir["vendor/assets/stylesheets/*.*"].each {|f| FileUtils.rm(f)}
-    Dir["vendor/twitter/scss/*.scss"].each do |file|
-      cp file, "vendor/assets/stylesheets/", :verbose => true
-    end
+  TW_JS     = FileList["vendor/twitter/js/*.*"]
+  ASSETS_JS = TW_JS.pathmap("vendor/assets/javascripts/twitter/bootstrap/%{bootstrap-,}f")
+  ASSETS_JS.zip(TW_JS).each do |target, source|
+    file target => [source] { cp source, target, verbose: true }
+  end
 
-    Dir["vendor/assets/javascripts/*.*"].each {|f| FileUtils.rm(f)}
-    js_files = Dir["vendor/twitter/js/*.js"].map()
-    js_files.each do |file|
-      cp file, "vendor/assets/javascripts/", :verbose => true
-    end
+  TW_SCSS = FileList["vendor/twitter/scss/*.*"]
+  ASSETS_SCSS = TW_SCSS.pathmap("vendor/frameworks/twitter/bootstrap/%f")
+  ASSETS_SCSS.zip(TW_SCSS).each do |target, source|
+    file target => [source] { cp source, target, verbose: true }
+  end
 
-    js_priorities = {}
-    js_files.each {|f| js_priorities[File.basename(f)] = 1}
+  desc "Update Twitter's Bootstrap Images"
+  task :imgs => ASSETS_IMGS
+
+  desc "Update Twitter's Bootstrap JS"
+  task :js => ASSETS_JS do
+    js = {}
+    ASSETS_JS.pathmap("%f").each do |f|
+      js[f] = 1
+    end
 
     # dependencies
-    js_priorities["bootstrap-transition.js"]  = 0
-    js_priorities["bootstrap-tooltip.js"]     = 2
-    js_priorities["bootstrap-popover.js"]     = 3
-    
-    js_list = js_priorities.to_a.sort {|a,b| a[1] <=> b[1]}.map{|p| p[0]}
+    js["transition.js"]  = 0
+    js["tooltip.js"]     = 2
+    js["popover.js"]     = 3
     
-    File.open("vendor/assets/javascripts/bootstrap.js", "w") do |f|
-      js_list.each do |js|
-        f.write "//= require #{js}\n"
-      end
-    end
+    list = js.to_a.sort {|a,b| a[1] <=> b[1]}.map{|p| p[0]}
+    File.write "vendor/assets/javascripts/twitter/bootstrap.js", list.map {|f| "//= require twitter/bootstrap/#{f}"}.join("\n")
   end
+
+  desc "Update Twitter's Bootstrap SCSS"
+  task :scss => ASSETS_SCSS do
+    File.write "vendor/frameworks/twitter/bootstrap.scss", '@import "bootstrap/bootstrap.scss";'
+    File.write "vendor/assets/stylesheets/twitter/bootstrap.scss", '@import "twitter/bootstrap/bootstrap.scss";'
+    File.write "vendor/assets/stylesheets/twitter/bootstrap-responsive.scss", '@import "twitter/bootstrap/responsive.scss";'
+  end
+
+  desc "Update Twitter's Bootstrap Assets"
+  task :assets => [:pull, :imgs, :scss, :js]
   
 end
 

data/lib/bootstrap-rails/engine.rb

@@ -1,6 +1,9 @@
 module Bootstrap
   module Rails
     class Engine < ::Rails::Engine
+      initializer 'anjlab-bootstrap-rails.setup' do |app|
+        config.sass.load_paths << File.join(config.root, 'vendor', 'frameworks')
+      end
     end
   end
 end

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "2.0.4.4"
+    VERSION = "2.1.0.0"
   end
 end

data/vendor/assets/javascripts/twitter/bootstrap.js

@@ -0,0 +1,13 @@
+//= require twitter/bootstrap/transition.js
+//= require twitter/bootstrap/dropdown.js
+//= require twitter/bootstrap/button.js
+//= require twitter/bootstrap/carousel.js
+//= require twitter/bootstrap/collapse.js
+//= require twitter/bootstrap/alert.js
+//= require twitter/bootstrap/affix.js
+//= require twitter/bootstrap/typeahead.js
+//= require twitter/bootstrap/scrollspy.js
+//= require twitter/bootstrap/tab.js
+//= require twitter/bootstrap/modal.js
+//= require twitter/bootstrap/tooltip.js
+//= require twitter/bootstrap/popover.js

data/vendor/assets/javascripts/twitter/bootstrap/affix.js

@@ -0,0 +1,104 @@
+/* ==========================================================
+ * bootstrap-affix.js v2.1.0
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);

data/vendor/assets/javascripts/{bootstrap-alert.js → twitter/bootstrap/alert.js}

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.4
+ * bootstrap-alert.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/{bootstrap-button.js → twitter/bootstrap/button.js}

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.4
+ * bootstrap-button.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/{bootstrap-carousel.js → twitter/bootstrap/carousel.js}

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.4
+ * bootstrap-carousel.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -46,7 +46,7 @@
     }
 
   , to: function (pos) {
-      var $active = this.$element.find('.active')
+      var $active = this.$element.find('.item.active')
         , children = $active.parent().children()
         , activePos = children.index($active)
         , that = this
@@ -68,6 +68,10 @@
 
   , pause: function (e) {
       if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle()
+      }
       clearInterval(this.interval)
       this.interval = null
       return this
@@ -84,13 +88,15 @@
     }
 
   , slide: function (type, next) {
-      var $active = this.$element.find('.active')
+      var $active = this.$element.find('.item.active')
         , $next = next || $active[type]()
         , isCycling = this.interval
         , direction = type == 'next' ? 'left' : 'right'
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
-        , e = $.Event('slide')
+        , e = $.Event('slide', {
+            relatedTarget: $next[0]
+          })
 
       this.sliding = true
 
@@ -138,9 +144,10 @@
       var $this = $(this)
         , data = $this.data('carousel')
         , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
       if (!data) $this.data('carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
-      else if (typeof option == 'string' || (option = options.slide)) data[option]()
+      else if (action) data[action]()
       else if (options.interval) data.cycle()
     })
   }

data/vendor/assets/javascripts/{bootstrap-collapse.js → twitter/bootstrap/collapse.js}

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.4
+ * bootstrap-collapse.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -67,7 +67,7 @@
 
       this.$element[dimension](0)
       this.transition('addClass', $.Event('show'), 'shown')
-      this.$element[dimension](this.$element[0][scroll])
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
     }
 
   , hide: function () {
@@ -144,12 +144,13 @@
   * ==================== */
 
   $(function () {
-    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
       var $this = $(this), href
         , target = $this.attr('data-target')
           || e.preventDefault()
           || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
         , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
       $(target).collapse(option)
     })
   })

data/vendor/assets/javascripts/{bootstrap-dropdown.js → twitter/bootstrap/dropdown.js}

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.4
+ * bootstrap-dropdown.js v2.1.0
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
  /* DROPDOWN CLASS DEFINITION
   * ========================= */
 
-  var toggle = '[data-toggle="dropdown"]'
+  var toggle = '[data-toggle=dropdown]'
     , Dropdown = function (element) {
         var $el = $(element).on('click.dropdown.data-api', this.toggle)
         $('html').on('click.dropdown.data-api', function () {
@@ -41,34 +41,82 @@
   , toggle: function (e) {
       var $this = $(this)
         , $parent
-        , selector
         , isActive
 
       if ($this.is('.disabled, :disabled')) return
 
-      selector = $this.attr('data-target')
+      $parent = getParent($this)
 
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        $parent.toggleClass('open')
+        $this.focus()
       }
 
-      $parent = $(selector)
-      $parent.length || ($parent = $this.parent())
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
 
       isActive = $parent.hasClass('open')
 
-      clearMenus()
+      if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
 
-      if (!isActive) $parent.toggleClass('open')
+      $items = $('[role=menu] li:not(.divider) a', $parent)
 
-      return false
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
     }
 
   }
 
   function clearMenus() {
-    $(toggle).parent().removeClass('open')
+    getParent($(toggle))
+      .removeClass('open')
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+    $parent.length || ($parent = $this.parent())
+
+    return $parent
   }
 
 
@@ -91,10 +139,12 @@
    * =================================== */
 
   $(function () {
-    $('html').on('click.dropdown.data-api', clearMenus)
+    $('html')
+      .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
     $('body')
-      .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
-      .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+      .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
+      .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+      .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
   })
 
 }(window.jQuery);