sass-twitter-bootstrap 0.1.0 → 2.0.1

data/lib/{sass-twitter-bootstrap.rb → sass/twitter/bootstrap.rb}

@@ -1,9 +1,9 @@
 require "sass/twitter/bootstrap/version"
+require 'sass/twitter/bootstrap/rails'
 
 module Sass
   module Twitter
     module Bootstrap
-      require 'sass/twitter/bootstrap/rails' if defined?(Rails::Engine)
     end
   end
 end

data/lib/sass/twitter/bootstrap/rails.rb

@@ -1,13 +1,9 @@
-require 'rails'
+require 'sass/twitter/bootstrap/rails/engine'
 
 module Sass
   module Twitter
     module Bootstrap
       module Rails
-        class Engine < ::Rails::Engine
-          initializer 'sass-twitter-bootstrap.setup', :group => :all do |app|
-          end
-        end
       end
     end
   end

data/lib/sass/twitter/bootstrap/rails/engine.rb

@@ -0,0 +1,12 @@
+module Sass
+  module Twitter
+    module Bootstrap
+      module Rails
+        if defined? ::Rails::Engine
+          class Engine < ::Rails::Engine
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sass/twitter/bootstrap/version.rb

@@ -1,7 +1,7 @@
 module Sass
   module Twitter
     module Bootstrap
-      VERSION = '0.1.0'
+      VERSION = '2.0.1'
     end
   end
 end

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.4
+ * bootstrap-alert.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,57 +18,61 @@
  * ========================================================== */
 
 
-!function ($) {
-
-  "use strict"; // jshint ;_;
+!function( $ ){
 
+  "use strict"
 
  /* ALERT CLASS DEFINITION
   * ====================== */
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
+    , Alert = function ( el ) {
         $(el).on('click', dismiss, this.close)
       }
 
-  Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
+  Alert.prototype = {
 
-    $parent = $(selector)
+    constructor: Alert
 
-    e && e.preventDefault()
+  , close: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
 
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
 
-    $parent.trigger(e = $.Event('close'))
+      $parent = $(selector)
+      $parent.trigger('close')
 
-    if (e.isDefaultPrevented()) return
+      e && e.preventDefault()
 
-    $parent.removeClass('in')
+      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-    function removeElement() {
       $parent
-        .trigger('closed')
-        .remove()
+        .trigger('close')
+        .removeClass('in')
+
+      function removeElement() {
+        $parent
+          .trigger('closed')
+          .remove()
+      }
+
+      $.support.transition && $parent.hasClass('fade') ?
+        $parent.on($.support.transition.end, removeElement) :
+        removeElement()
     }
 
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
-      removeElement()
   }
 
 
  /* ALERT PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.alert = function (option) {
+  $.fn.alert = function ( option ) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('alert')
@@ -87,4 +91,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}(window.jQuery);
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.4
+ * bootstrap-button.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -17,54 +17,58 @@
  * limitations under the License.
  * ============================================================ */
 
+!function( $ ){
 
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
+  "use strict"
 
  /* BUTTON PUBLIC CLASS DEFINITION
   * ============================== */
 
-  var Button = function (element, options) {
+  var Button = function ( element, options ) {
     this.$element = $(element)
     this.options = $.extend({}, $.fn.button.defaults, options)
   }
 
-  Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
+  Button.prototype = {
 
-    state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
+      constructor: Button
 
-    $el[val](data[state] || this.options[state])
+    , setState: function ( state ) {
+        var d = 'disabled'
+          , $el = this.$element
+          , data = $el.data()
+          , val = $el.is('input') ? 'val' : 'html'
 
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d)
-    }, 0)
-  }
+        state = state + 'Text'
+        data.resetText || $el.data('resetText', $el[val]())
+
+        $el[val](data[state] || this.options[state])
+
+        // push to event loop to allow forms to submit
+        setTimeout(function () {
+          state == 'loadingText' ?
+            $el.addClass(d).attr(d, d) :
+            $el.removeClass(d).removeAttr(d)
+        }, 0)
+      }
+
+    , toggle: function () {
+        var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
 
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+        $parent && $parent
+          .find('.active')
+          .removeClass('active')
 
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
+        this.$element.toggleClass('active')
+      }
 
-    this.$element.toggleClass('active')
   }
 
 
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
 
-  $.fn.button = function (option) {
+  $.fn.button = function ( option ) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('button')
@@ -93,4 +97,4 @@
     })
   })
 
-}(window.jQuery);
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.4
+ * bootstrap-carousel.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,30 +18,23 @@
  * ========================================================== */
 
 
-!function ($) {
-
-  "use strict"; // jshint ;_;
+!function( $ ){
 
+  "use strict"
 
  /* CAROUSEL CLASS DEFINITION
   * ========================= */
 
   var Carousel = function (element, options) {
     this.$element = $(element)
-    this.options = options
+    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 = {
 
-    cycle: function (e) {
-      if (!e) this.paused = false
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+    cycle: function () {
+      this.interval = setInterval($.proxy(this.next, this), this.options.interval)
       return this
     }
 
@@ -66,8 +59,7 @@
       return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
     }
 
-  , pause: function (e) {
-      if (!e) this.paused = true
+  , pause: function () {
       clearInterval(this.interval)
       this.interval = null
       return this
@@ -90,7 +82,8 @@
         , direction = type == 'next' ? 'left' : 'right'
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
-        , e = $.Event('slide')
+
+      if (!$next.length) return
 
       this.sliding = true
 
@@ -98,28 +91,24 @@
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
-      if ($next.hasClass('active')) return
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
+      if (!$.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger('slide')
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      } else {
         $next.addClass(type)
         $next[0].offsetWidth // force reflow
         $active.addClass(direction)
         $next.addClass(direction)
+        this.$element.trigger('slide')
         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)
         })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
       }
 
       isCycling && this.cycle()
@@ -133,21 +122,20 @@
  /* CAROUSEL PLUGIN DEFINITION
   * ========================== */
 
-  $.fn.carousel = function (option) {
+  $.fn.carousel = function ( option ) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , options = typeof option == 'object' && option
       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 (options.interval) data.cycle()
+      else data.cycle()
     })
   }
 
   $.fn.carousel.defaults = {
     interval: 5000
-  , pause: 'hover'
   }
 
   $.fn.carousel.Constructor = Carousel
@@ -166,4 +154,4 @@
     })
   })
 
-}(window.jQuery);
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.4
+ * bootstrap-collapse.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -17,21 +17,16 @@
  * limitations under the License.
  * ============================================================ */
 
+!function( $ ){
 
-!function ($) {
+  "use strict"
 
-  "use strict"; // jshint ;_;
-
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
-
-  var Collapse = function (element, options) {
-    this.$element = $(element)
+  var Collapse = function ( element, options ) {
+  	this.$element = $(element)
     this.options = $.extend({}, $.fn.collapse.defaults, options)
 
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
+    if (this.options["parent"]) {
+      this.$parent = $(this.options["parent"])
     }
 
     this.options.toggle && this.toggle()
@@ -47,39 +42,31 @@
     }
 
   , show: function () {
-      var dimension
-        , scroll
-        , actives
+      var dimension = this.dimension()
+        , scroll = $.camelCase(['scroll', dimension].join('-'))
+        , actives = this.$parent && this.$parent.find('.in')
         , hasData
 
-      if (this.transitioning) return
-
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
-
       if (actives && actives.length) {
         hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
         actives.collapse('hide')
         hasData || actives.data('collapse', null)
       }
 
       this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
+      this.transition('addClass', 'show', 'shown')
       this.$element[dimension](this.$element[0][scroll])
+
     }
 
   , hide: function () {
-      var dimension
-      if (this.transitioning) return
-      dimension = this.dimension()
+      var dimension = this.dimension()
       this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.transition('removeClass', 'hide', 'hidden')
       this.$element[dimension](0)
     }
 
-  , reset: function (size) {
+  , reset: function ( size ) {
       var dimension = this.dimension()
 
       this.$element
@@ -87,43 +74,35 @@
         [dimension](size || 'auto')
         [0].offsetWidth
 
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
-
-      return this
+      this.$element.addClass('collapse')
     }
 
-  , transition: function (method, startEvent, completeEvent) {
+  , transition: function ( method, startEvent, completeEvent ) {
       var that = this
         , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
+            if (startEvent == 'show') that.reset()
             that.$element.trigger(completeEvent)
           }
 
-      this.$element.trigger(startEvent)
-
-      if (startEvent.isDefaultPrevented()) return
-
-      this.transitioning = 1
-
-      this.$element[method]('in')
+      this.$element
+        .trigger(startEvent)
+        [method]('in')
 
       $.support.transition && this.$element.hasClass('collapse') ?
         this.$element.one($.support.transition.end, complete) :
         complete()
-    }
+  	}
 
   , toggle: function () {
       this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
+  	}
 
   }
 
-
- /* COLLAPSIBLE PLUGIN DEFINITION
+  /* COLLAPSIBLE PLUGIN DEFINITION
   * ============================== */
 
-  $.fn.collapse = function (option) {
+  $.fn.collapse = function ( option ) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('collapse')
@@ -154,4 +133,4 @@
     })
   })
 
-}(window.jQuery);
+}( window.jQuery );