anjlab-bootstrap-rails 3.0.0.0.alpha1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9265a9e3fe0eac302c72f403581f93c520a42259
-  data.tar.gz: f9e4aff07f5712bea6ef93af04b10f7da5310735
+  metadata.gz: 93eb1f78519c959376535845631eda96564eccd0
+  data.tar.gz: 5633ec827387a80e54b8abb0e9974a9c65732495
 SHA512:
-  metadata.gz: e4393cde669a38a6bd7dce45df5f824efc56d07b16284caef64cba32fae8da24940c75e79ddb54a3c32baa1e3c296ea0fc64513f34aa0970a83231b2a54592aa
-  data.tar.gz: d20dff37eaa47248b7b2fdc69984b2d92d84b6cd6bd6b40bb4ba6a64bd163156958c499337c47c36592d0c4ad921a453703320a181a1bbe223b0906df531e002
+  metadata.gz: bb4349be7d58d73e33be08fde9e2598b8d7f2864d2f920cf162a7284b9c2a962b9e48c4b9d5a31febe10115cb5b16e298f8ac5199c6e3d1b87df7643f33f76c3
+  data.tar.gz: ab5385af14c3d07ce73e84696fca7efa99ceb1c8c9f265aa8dd22192f38e78ae0dfba3ac147b712cf9f69479af5e2366ea7f2b63f09cfccfb0e4375d5afefd28

data/README.md

@@ -1,26 +1,22 @@
-# Twitter Bootstrap v2.3.1.0 for Rails 3/4
+# Twitter Bootstrap v3.0.0.alpha1 for Rails 3/4
 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.
 
-Note: if you are looking for bootstrapped date and time pickers please take a look at [anjlab-widgets](https://github.com/anjlab/anjlab-widgets) gem.
+For glyphicons use [bootstrap-glyphicons gem](https://github.com/anjlab/bootstrap-glyphicons)
 
+Note: if you are looking for bootstrapped date and time pickers please take a look at [anjlab-widgets](https://github.com/anjlab/anjlab-widgets) gem.
 
 anjlab-bootstrap-rails project integrates Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects
 
 <a href="http://spellhub.com/projects/project/69"><img src="http://spellhub.com/projects/status/69" height="18"></a>
 
 ## Rails > 3.1
-Include Bootstrap in Gemfile;
-
-``` ruby
-gem 'anjlab-bootstrap-rails', '>= 2.3', :require => 'bootstrap-rails'
-```
-
-or you can install from latest build;
+You can install from latest build just for testing right now;
 
 ``` ruby
 gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails',
-                              :git => 'git://github.com/anjlab/bootstrap-rails.git'
+                              :github => 'anjlab/bootstrap-rails',
+                              :branch => '3.0.0'
 ```
 
 and run bundle install.
@@ -35,20 +31,17 @@ Add necessary stylesheet file to app/assets/stylesheets/application.css
 
 You can override bootstrap variables:
 
- 1. replace `*= require twitter/bootstrap` with `*= require app_bootstrap`
- 2. create `app_bootstrap.css.scss` :
+1. rename application.css to application.css.scss
+2. override vars above `@import "twitter/bootstrap";`
 
 ```scss
-// change colors
-$linkColor: red;
 
-// change grid
-$gridColumnWidth: 70px;
-$gridGutterWidth: 10px;
+// change colors
+$link-color: red;
 
 // import original bootstrap
 @import "twitter/bootstrap";
-@import "twitter/bootstrap-responsive";
+
 ```
  NOTE: restart `pow` if you are using it.
 
@@ -76,16 +69,10 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
 //= require twitter/bootstrap/affix
 ```
 
-## Upgrade notes from 1.4
-
- - [Twitter Bootstrap Upgrade](http://twitter.github.com/bootstrap/upgrading.html)
- - rm -rf tmp/cache
+## Extending
 
-## For Developers
+- [Example of grid shortcuts and medium column classes](https://gist.github.com/yury/5662144)
 
- - Fork this repo if you want fix rails integration bug
- - Fork [Sass repo](https://github.com/yury/bootstrap) if you want fix SASS bug
-        
 ## Thanks
 Thanks Twitter for Bootstrap
 http://twitter.github.com/bootstrap
@@ -94,7 +81,7 @@ Inspired by Seyhun Akyürek and his [twitter-bootstrap-rails gem](https://github
 
 
 ## License
-Copyright (c) 2012 AnjLab
+Copyright (c) 2013 AnjLab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

data/Rakefile

@@ -11,70 +11,46 @@ namespace :twitter do
     end
   end
 
-  BS_FONTS     = FileList["bootstrap/fonts/*.*"]
-  ASSETS_FONTS = BS_FONTS.pathmap("vendor/assets/fonts/twitter/%f")
-  ASSETS_FONTS.zip(BS_FONTS).each do |target, source|
-    file target => [source] { cp source, target, verbose: true }
-  end
-
   BS_JS     = FileList["bootstrap/js/*.*"]
-  ASSETS_JS = BS_JS.pathmap("vendor/assets/javascripts/twitter/bootstrap/%f")
+  ASSETS_JS = BS_JS.pathmap("app/assets/javascripts/twitter/bootstrap/%f")
   ASSETS_JS.zip(BS_JS).each do |target, source|
     file target => [source] { cp source, target, verbose: true }
   end
 
   BS_SCSS = FileList["bootstrap/scss/*.*"]
-  ASSETS_SCSS = BS_SCSS.pathmap("vendor/assets/stylesheets/twitter/bootstrap/_%f")
+  ASSETS_SCSS = BS_SCSS.pathmap("app/assets/stylesheets/twitter/bootstrap/_%f")
   ASSETS_SCSS.zip(BS_SCSS).each do |target, source|
     target.gsub!(/__/, '_')
     file target => [source] { cp source, target, verbose: true }
   end
 
-  desc "Update Twitter's Bootstrap Fonts"
-  task :fonts => ASSETS_FONTS
-
   desc "Update Twitter's Bootstrap JS"
   task :js => ASSETS_JS do
     js = {}
     ASSETS_JS.pathmap("%f").each { |f| js[f] = 1 }
 
     # dependencies
-    js["transition.js"]  = 0
-    js["tooltip.js"]     = 2
-    js["popover.js"]     = 3
+    order = %w{transition.js alert.js button.js carousel.js collapse.js dropdown.js modal.js tooltip.js popover.js scrollspy.js tab.js affix.js}
+    order.each_with_index {|o, i| js[o] = i }
 
     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")
+    File.write "app/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/assets/stylesheets/twitter/bootstrap.scss", '@import "twitter/bootstrap/bootstrap";'
-  end
-
-  desc "Update Twitter's icons"
-  task :icons do
-    vars_path = 'vendor/assets/stylesheets/twitter/bootstrap/_variables.scss'
-    variables = File.read vars_path
-    variables.sub!(/^\$glyphicons-font-path:\s+".*"\s!default;/, "$glyphicons-font-path:          \"twitter\" !default;")
-    File.write(vars_path, variables)
-
-    glyphicons_path  = 'vendor/assets/stylesheets/twitter/bootstrap/_glyphicons.scss'
-    glyphicons = File.read glyphicons_path
-    glyphicons.gsub!(/url\('\#{\$glyphicons-font-path\}\//, "font-url('\#{$glyphicons-font-path}/")
-    File.write(glyphicons_path, glyphicons)
+    File.write "app/assets/stylesheets/twitter/bootstrap.scss", '@import "twitter/bootstrap/bootstrap";'
   end
 
-  desc "Clean vendored files"
+  desc "Clean gem assets files"
   task :clean do
-    FileUtils.rm_rf 'vendor/assets'
-    FileUtils.mkpath 'vendor/assets/fonts/twitter'
-    FileUtils.mkpath 'vendor/assets/javascripts/twitter/bootstrap'
-    FileUtils.mkpath 'vendor/assets/stylesheets/twitter/bootstrap'
+    FileUtils.rm_rf 'app/assets'
+    FileUtils.mkpath 'app/assets/javascripts/twitter/bootstrap'
+    FileUtils.mkpath 'app/assets/stylesheets/twitter/bootstrap'
   end
 
   desc "Update Twitter's Bootstrap Assets"
-  task :assets => [:pull, :clean, :fonts, :scss, :js, :icons]
+  task :assets => [:pull, :clean, :scss, :js]
 
 end
 

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

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

data/{vendor → app}/assets/javascripts/twitter/bootstrap/affix.js

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: affix.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#affix
+ * http://twbs.github.com/bootstrap/javascript.html#affix
  * ========================================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -36,6 +36,8 @@
     this.checkPosition()
   }
 
+  Affix.RESET = 'affix affix-top affix-bottom'
+
   Affix.DEFAULTS = {
     offset: 0
   }
@@ -53,7 +55,6 @@
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-    var reset        = 'affix affix-top affix-bottom'
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top()
@@ -64,11 +65,16 @@
                 offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
 
     if (this.affixed === affix) return
+    if (this.unpin) this.$element.css('top', '')
 
     this.affixed = affix
     this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
 
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
+
+    if (affix == 'bottom') {
+      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
+    }
   }
 
 

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

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: alert.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * http://twbs.github.com/bootstrap/javascript.html#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -56,7 +56,9 @@
     }
 
     $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
+      $parent
+        .one($.support.transition.end, removeElement)
+        .emulateTransitionEnd(150) :
       removeElement()
   }
 

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

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: button.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * http://twbs.github.com/bootstrap/javascript.html#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -53,10 +53,11 @@
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
 
-    if ($parent) {
-      $parent.find('.active').removeClass('active')
+    if ($parent.length) {
+      var $input = this.$element.find('input').prop('checked', !this.$element.hasClass('active'))
+      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
     }
 
     this.$element.toggleClass('active')
@@ -100,6 +101,7 @@
     var $btn = $(e.target)
     if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
     $btn.button('toggle')
+    e.preventDefault()
   })
 
 }(window.jQuery);

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

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: carousel.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * http://twbs.github.com/bootstrap/javascript.html#carousel
  * ========================================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -130,12 +130,14 @@
       $next[0].offsetWidth // force reflow
       $active.addClass(direction)
       $next.addClass(direction)
-      this.$element.one($.support.transition.end, function () {
-        $next.removeClass([type, direction].join(' ')).addClass('active')
-        $active.removeClass(['active', direction].join(' '))
-        that.sliding = false
-        setTimeout(function () { that.$element.trigger('slid') }, 0)
-      })
+      $active
+        .one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+        .emulateTransitionEnd(600)
     } else {
       this.$element.trigger(e)
       if (e.isDefaultPrevented()) return
@@ -160,7 +162,7 @@
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, typeof option == 'object' && option)
+      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
       var action  = typeof option == 'string' ? option : options.slide
 
       if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
@@ -185,19 +187,27 @@
   // CAROUSEL DATA-API
   // =================
 
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
+  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this   = $(this), href
     var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
     var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex
+    var slideIndex = $this.attr('data-slide-to')
+    if (slideIndex) options.interval = false
 
     $target.carousel(options)
 
     if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs-carousel').pause().to(slideIndex).cycle()
+      $target.data('bs.carousel').to(slideIndex)
     }
 
     e.preventDefault()
   })
 
+  $(window).on('load', function () {
+    $('[data-ride="carousel"]').each(function () {
+      var $carousel = $(this)
+      $carousel.carousel($carousel.data())
+    })
+  })
+
 }(window.jQuery);

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

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: collapse.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * http://twbs.github.com/bootstrap/javascript.html#collapse
  * ========================================================================
  * Copyright 2012 Twitter, Inc.
  *
@@ -44,63 +44,81 @@
   Collapse.prototype.show = function () {
     if (this.transitioning || this.$element.hasClass('in')) return
 
-    var dimension = this.dimension()
-    var scroll    = $.camelCase(['scroll', dimension].join('-'))
+    var startEvent = $.Event('show.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
     var actives   = this.$parent && this.$parent.find('> .accordion-group > .in')
 
     if (actives && actives.length) {
-      var hasData = actives.data('collapse')
+      var hasData = actives.data('bs.collapse')
       if (hasData && hasData.transitioning) return
       actives.collapse('hide')
-      hasData || actives.data('collapse', null)
+      hasData || actives.data('bs.collapse', null)
+    }
+
+    var dimension = this.dimension()
+
+    this.$element
+      .removeClass('collapse')
+      .addClass('collapsing')
+      [dimension](0)
+
+    this.transitioning = 1
+
+    var complete = function () {
+      this.$element
+        .removeClass('collapsing')
+        .addClass('in')
+        [dimension]('auto')
+      this.transitioning = 0
+      this.$element.trigger('shown.bs.collapse')
     }
 
-    this.$element[dimension](0)
-    this.transition('addClass', $.Event('show.bs.collapse'), 'shown.bs.collapse')
+    if (!$.support.transition) return complete.call(this)
 
-    if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
+    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
+
+    this.$element
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
+      [dimension](this.$element[0][scrollSize])
   }
 
   Collapse.prototype.hide = function () {
     if (this.transitioning || !this.$element.hasClass('in')) return
-    var dimension = this.dimension()
-    this.reset(this.$element[dimension]())
-    this.transition('removeClass', $.Event('hide.bs.collapse'), 'hidden')
-    this.$element[dimension](0)
-  }
 
-  Collapse.prototype.reset = function (size) {
+    var startEvent = $.Event('hide.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
     var dimension = this.dimension()
 
     this.$element
-      .removeClass('collapse')
-      [dimension](size || 'auto')
-      [0].offsetWidth
+      [dimension](this.$element[dimension]())
+      [0].offsetHeight
 
-    this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+    this.$element
+      .addClass('collapsing')
+      .removeClass('collapse')
+      .removeClass('in')
 
-    return this
-  }
+    this.transitioning = 1
 
-  Collapse.prototype.transition = function (method, startEvent, completeEvent) {
-    var that     = this
     var complete = function () {
-      if (startEvent.type == 'show') that.reset()
-      that.transitioning = 0
-      that.$element.trigger(completeEvent)
+      this.transitioning = 0
+      this.$element
+        .trigger('hidden.bs.collapse')
+        .removeClass('collapsing')
+        .addClass('collapse')
     }
 
-    this.$element.trigger(startEvent)
-
-    if (startEvent.isDefaultPrevented()) return
-
-    this.transitioning = 1
-
-    this.$element[method]('in')
+    if (!$.support.transition) return complete.call(this)
 
-    $.support.transition && this.$element.hasClass('collapse') ?
-      this.$element.one($.support.transition.end, complete) :
-      complete()
+    this.$element
+      [dimension](0)
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
   }
 
   Collapse.prototype.toggle = function () {
@@ -116,10 +134,10 @@
   $.fn.collapse = function (option) {
     return this.each(function () {
       var $this   = $(this)
-      var data    = $this.data('collapse')
+      var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
@@ -139,15 +157,23 @@
   // COLLAPSE DATA-API
   // =================
 
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this  = $(this), href
-    var target = $this.attr('data-target')
+  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this   = $(this), href
+    var target  = $this.attr('data-target')
         || e.preventDefault()
         || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-    var option = $(target).data('collapse') ? 'toggle' : $this.data()
+    var $target = $(target)
+    var data    = $target.data('bs.collapse')
+    var option  = data ? 'toggle' : $this.data()
+    var parent  = $this.attr('data-parent')
+    var $parent = parent && $(parent)
+
+    if (!data || !data.transitioning) {
+      if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed')
+      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    }
 
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
+    $target.collapse(option)
   })
 
 }(window.jQuery);