fix tests

a72d0d6e · fat · 19de2e86 · a72d0d6e · a72d0d6e · a72d0d6e
Commit a72d0d6e authored May 16, 2013 by fat
23 changed files
--- a/docs/assets/js/alert.js
+++ b/docs/assets/js/alert.js
@@ -45,7 +45,7 @@
      $parent = $this.hasClass('alert') ? $this : $this.parent()
    }
-    $parent.trigger(e = $.Event('bs-close'))
+    $parent.trigger(e = $.Event('bs:alert:close'))
    if (e.isDefaultPrevented()) return
@@ -79,8 +79,8 @@
  $.fn.alert.Constructor = Alert
- /* ALERT NO CONFLICT
+  // ALERT NO CONFLICT
-  * ================= */
+  // =================
  $.fn.alert.noConflict = function () {
    $.fn.alert = old
@@ -89,7 +89,7 @@
  // ALERT DATA-API
-  // ============== */
+  // ==============
  $(document).on('click.bs-alert.bs-data-api', dismiss, Alert.prototype.close)

--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/docs/assets/js/carousel.js
+++ b/docs/assets/js/carousel.js
@@ -111,7 +111,7 @@
    $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-    var e = $.Event('slide', { relatedTarget: $next[0], direction: direction })
+    var e = $.Event('bs:carousel:slide', { relatedTarget: $next[0], direction: direction })
    if ($next.hasClass('active')) return
@@ -159,11 +159,11 @@
  $.fn.carousel = function (option) {
    return this.each(function () {
      var $this   = $(this)
-      var data    = $this.data('carousel')
+      var data    = $this.data('bs-carousel')
      var options = $.extend({}, Carousel.DEFAULTS, typeof option == 'object' && option)
      var action  = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (!data) $this.data('bs-carousel', (data = new Carousel(this, options)))
      if (typeof option == 'number') data.to(option)
      else if (action) data[action]()
      else if (options.interval) data.pause().cycle()
@@ -181,6 +181,7 @@
    return this
  }
  // CAROUSEL DATA-API
  // =================

--- a/docs/assets/js/collapse.js
+++ b/docs/assets/js/collapse.js
@@ -56,7 +56,7 @@
    }
    this.$element[dimension](0)
-    this.transition('addClass', $.Event('show'), 'shown')
+    this.transition('addClass', $.Event('bs:collapse:show'), 'shown')
    if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
  }
@@ -65,7 +65,7 @@
    if (this.transitioning || !this.$element.hasClass('in')) return
    var dimension = this.dimension()
    this.reset(this.$element[dimension]())
-    this.transition('removeClass', $.Event('hide'), 'hidden')
+    this.transition('removeClass', $.Event('bs:collapse:hide'), 'hidden')
    this.$element[dimension](0)
  }

--- a/docs/assets/js/dropdown.js
+++ b/docs/assets/js/dropdown.js
@@ -20,7 +20,6 @@
 !function ($) { "use strict";
  // DROPDOWN CLASS DEFINITION
  // =========================

--- a/docs/assets/js/modal.js
+++ b/docs/assets/js/modal.js
@@ -18,32 +18,33 @@
 * ========================================================= */
-!function ($) {
+!function ($) { "use strict";
-  "use strict"; // jshint ;_;
+  // MODAL CLASS DEFINITION
+  // ======================
- /* MODAL CLASS DEFINITION
-  * ====================== */
  var Modal = function (element, options) {
    this.options   = options
-    this.$element = $(element)
+    this.$element  = $(element).delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.$backdrop =
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+    this.isShown   = null
-  }
-  Modal.prototype = {
+    if (this.options.remote) this.$element.find('.modal-body').load(this.options.remote)
+  }
-      constructor: Modal
+  Modal.DEFAULTS = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
-    , toggle: function () {
+  Modal.prototype.toggle = function () {
    return this[!this.isShown ? 'show' : 'hide']()
  }
-    , show: function () {
+  Modal.prototype.show = function () {
    var that = this
-          , e = $.Event('show')
+    var e    = $.Event('bs:modal:show')
    this.$element.trigger(e)
@@ -73,18 +74,16 @@
      that.enforceFocus()
      transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+        that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('bs:modal:shown') }) :
-            that.$element.focus().trigger('shown')
+        that.$element.focus().trigger('bs:modal:shown')
    })
  }
-    , hide: function (e) {
+  Modal.prototype.show = function (e) {
-        e && e.preventDefault()
+    if (e) e.preventDefault()
-        var that = this
+    e = $.Event('bs:modal:hide')
-        e = $.Event('hide')
    this.$element.trigger(e)
@@ -105,29 +104,27 @@
      this.hideModal()
  }
-    , enforceFocus: function () {
+  Modal.prototype.enforceFocus = function () {
-        var that = this
    $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+      if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-            that.$element.focus()
+        this.$element.focus()
      }
-        })
+    }, this)
  }
-    , escape: function () {
+  Modal.prototype.escape = function () {
-        var that = this
    if (this.isShown && this.options.keyboard) {
      this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
+        e.which == 27 && this.hide()
-          })
+      }, this)
    } else if (!this.isShown) {
      this.$element.off('keyup.dismiss.modal')
    }
  }
-    , hideWithTransition: function () {
+  Modal.prototype.hideWithTransition = function () {
    var that    = this
-          , timeout = setTimeout(function () {
+    var timeout = setTimeout(function () {
      that.$element.off($.support.transition.end)
      that.hideModal()
    }, 500)
@@ -138,23 +135,23 @@
    })
  }
-    , hideModal: function () {
+  Modal.prototype.hideModal = function () {
    var that = this
    this.$element.hide()
    this.backdrop(function () {
      that.removeBackdrop()
-          that.$element.trigger('hidden')
+      that.$element.trigger('bs:modal:hidden')
    })
  }
-    , removeBackdrop: function () {
+  Modal.prototype.removeBackdrop = function () {
    this.$backdrop && this.$backdrop.remove()
    this.$backdrop = null
  }
-    , backdrop: function (callback) {
+  Modal.prototype.backdrop = function (callback) {
    var that    = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
    if (this.isShown && this.options.backdrop) {
      var doAnimate = $.support.transition && animate
@@ -189,36 +186,30 @@
      callback()
    }
  }
-  }
- /* MODAL PLUGIN DEFINITION
+  // MODAL PLUGIN DEFINITION
-  * ======================= */
+  // =======================
  var old = $.fn.modal
  $.fn.modal = function (option) {
    return this.each(function () {
      var $this   = $(this)
-        , data = $this.data('modal')
+      var data    = $this.data('bs-modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (!data) $this.data('bs-modal', (data = new Modal(this, options)))
      if (typeof option == 'string') data[option]()
      else if (options.show) data.show()
    })
  }
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
  $.fn.modal.Constructor = Modal
- /* MODAL NO CONFLICT
+  // MODAL NO CONFLICT
-  * ================= */
+  // =================
  $.fn.modal.noConflict = function () {
    $.fn.modal = old
@@ -226,14 +217,14 @@
  }
- /* MODAL DATA-API
+  // MODAL DATA-API
-  * ============== */
+  // ==============
  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
    var $this   = $(this)
-      , href = $this.attr('href')
+    var href    = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
    e.preventDefault()
@@ -245,7 +236,7 @@
    })
    var $body = $(document.body)
-      .on('shown', '.modal', function () { $body.addClass('modal-open') })
+      .on('bs:modal:shown',  '.modal', function () { $body.addClass('modal-open') })
-      .on('hidden', '.modal', function () { $body.removeClass('modal-open') })
+      .on('bs:modal:hidden', '.modal', function () { $body.removeClass('modal-open') })
 }(window.jQuery);
--- a/docs/assets/js/popover.js
+++ b/docs/assets/js/popover.js
@@ -18,30 +18,38 @@
 * =========================================================== */
-!function ($) {
+!function ($) { "use strict";
-  "use strict"; // jshint ;_;
+  // POPOVER PUBLIC CLASS DEFINITION
+  // ===============================
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
  var Popover = function (element, options) {
    this.init('popover', element, options)
  }
+  Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
-  /* NOTE: POPOVER EXTENDS tooltip.js
+  // NOTE: POPOVER EXTENDS tooltip.js
-     ========================================== */
+  // ================================
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-    constructor: Popover
+  Popover.prototype.constructor = Popover
-  , setContent: function () {
+  Popover.prototype.getDefaults = function () {
+    return Popover.DEFAULTS
+  }
+  Popover.prototype.setContent = function () {
    var $tip    = this.tip()
-        , title = this.getTitle()
+    var title   = this.getTitle()
-        , content = this.getContent()
+    var content = this.getContent()
    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
    $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
@@ -49,62 +57,49 @@
    $tip.removeClass('fade top bottom left right in')
  }
-  , hasContent: function () {
+  Popover.prototype.hasContent = function () {
    return this.getTitle() || this.getContent()
  }
-  , getContent: function () {
+  Popover.prototype.getContent = function () {
-      var content
+    var content = typeof this.options.content == 'function' ?
-        , $e = this.$element
+      this.options.content.call(this.$element[0]) :
-        , o = this.options
+      this.options.content
-      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-        || $e.attr('data-content')
-      return content
+    return content || this.$element.attr('data-content')
  }
-  , tip: function () {
+  Popover.prototype.tip = function () {
-      if (!this.$tip) {
+    if (!this.$tip) this.$tip = $(this.options.template)
-        this.$tip = $(this.options.template)
-      }
    return this.$tip
  }
-  , destroy: function () {
+  Popover.prototype.destroy = function () {
    this.hide().$element.off('.' + this.type).removeData(this.type)
  }
-  })
- /* POPOVER PLUGIN DEFINITION
+  // POPOVER PLUGIN DEFINITION
-  * ======================= */
+  // =========================
  var old = $.fn.popover
  $.fn.popover = function (option) {
    return this.each(function () {
      var $this   = $(this)
-        , data = $this.data('popover')
+      var data    = $this.data('bs-popover')
-        , options = typeof option == 'object' && option
+      var options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (!data) $this.data('bs-popover', (data = new Popover(this, options)))
      if (typeof option == 'string') data[option]()
    })
  }
  $.fn.popover.Constructor = Popover
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
- /* POPOVER NO CONFLICT
+  // POPOVER NO CONFLICT
-  * =================== */
+  // ===================
  $.fn.popover.noConflict = function () {
    $.fn.popover = old

--- a/docs/assets/js/scrollspy.js
+++ b/docs/assets/js/scrollspy.js
@@ -18,48 +18,49 @@
 * ============================================================== */
-!function ($) {
+!function ($) { "use strict";
-  "use strict"; // jshint ;_;
+  // SCROLLSPY CLASS DEFINITION
+  // ==========================
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
  function ScrollSpy(element, options) {
+    var href
    var process  = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
+    var $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$body          = $('body')
    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
    this.selector       = (this.options.target
      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
      || '') + ' .nav li > a'
-    this.$body = $('body')
+    this.offsets        = $([])
+    this.targets        = $([])
+    this.activeTarget   = null
    this.refresh()
    this.process()
  }
-  ScrollSpy.prototype = {
+  ScrollSpy.DEFAULTS = {
+    offset: 10
-      constructor: ScrollSpy
+  }
-    , refresh: function () {
-        var self = this
-          , $targets
+  ScrollSpy.prototype.refresh = function () {
    this.offsets = $([])
    this.targets = $([])
-        $targets = this.$body
+    var self     = this
+    var $targets = this.$body
      .find(this.selector)
      .map(function () {
        var $el   = $(this)
-              , href = $el.data('target') || $el.attr('href')
+        var href  = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
+        var $href = /^#\w/.test(href) && $(href)
-            return ( $href
+        return ($href
          && $href.length
-              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
      })
      .sort(function (a, b) { return a[0] - b[0] })
      .each(function () {
@@ -68,18 +69,17 @@
      })
  }
-    , process: function () {
+  ScrollSpy.prototype.process = function () {
    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
+    var maxScroll    = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
+    var offsets      = this.offsets
-          , targets = this.targets
+    var targets      = this.targets
-          , activeTarget = this.activeTarget
+    var activeTarget = this.activeTarget
-          , i
+    var i
    if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
+      return activeTarget != (i = targets.last()[0]) && this.activate(i)
-            && this.activate ( i )
    }
    for (i = offsets.length; i--;) {
@@ -90,58 +90,52 @@
    }
  }
-    , activate: function (target) {
+  ScrollSpy.prototype.activate = function (target) {
-        var active
-          , selector
    this.activeTarget = target
    $(this.selector)
      .parents('.active')
      .removeClass('active')
-        selector = this.selector
+    var selector = this.selector
      + '[data-target="' + target + '"],'
      + this.selector + '[href="' + target + '"]'
-        active = $(selector)
+    var active = $(selector)
      .parents('li')
      .addClass('active')
    if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
+      active = active
+        .closest('li.dropdown')
+        .addClass('active')
    }
    active.trigger('activate')
  }
-  }
+  // SCROLLSPY PLUGIN DEFINITION
- /* SCROLLSPY PLUGIN DEFINITION
+  // ===========================
-  * =========================== */
  var old = $.fn.scrollspy
  $.fn.scrollspy = function (option) {
    return this.each(function () {
      var $this   = $(this)
-        , data = $this.data('scrollspy')
+      var data    = $this.data('bs-scrollspy')
-        , options = typeof option == 'object' && option
+      var options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (!data) $this.data('bs-scrollspy', (data = new ScrollSpy(this, options)))
      if (typeof option == 'string') data[option]()
    })
  }
  $.fn.scrollspy.Constructor = ScrollSpy
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
- /* SCROLLSPY NO CONFLICT
+  // SCROLLSPY NO CONFLICT
-  * ===================== */
+  // =====================
  $.fn.scrollspy.noConflict = function () {
    $.fn.scrollspy = old
@@ -149,8 +143,8 @@
  }
- /* SCROLLSPY DATA-API
+  // SCROLLSPY DATA-API
-  * ================== */
+  // ==================
  $(window).on('load', function () {
    $('[data-spy="scroll"]').each(function () {

--- a/docs/assets/js/tab.js
+++ b/docs/assets/js/tab.js
@@ -18,40 +18,29 @@
 * ======================================================== */
-!function ($) {
+!function ($) { "use strict";
-  "use strict"; // jshint ;_;
+  // TAB CLASS DEFINITION
+  // ====================
- /* TAB CLASS DEFINITION
-  * ==================== */
  var Tab = function (element) {
    this.element = $(element)
  }
-  Tab.prototype = {
+  Tab.prototype.show = function () {
-    constructor: Tab
-  , show: function () {
    var $this    = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
+    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
+    var selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
    if (!selector) {
      selector = $this.attr('href')
      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
    }
-      if ( $this.parent('li').hasClass('active') ) return
+    if ($this.parent('li').hasClass('active')) return
-      previous = $ul.find('.active:last a')[0]
+    var previous = $ul.find('.active:last a')[0]
+    var e        = $.Event('bs:tab:show', {
-      e = $.Event('show', {
      relatedTarget: previous
    })
@@ -59,20 +48,20 @@
    if (e.isDefaultPrevented()) return
-      $target = $(selector)
+    var $target = $(selector)
    this.activate($this.parent('li'), $ul)
    this.activate($target, $target.parent(), function () {
      $this.trigger({
-          type: 'shown'
+        type: 'bs:tab:shown'
      , relatedTarget: previous
      })
    })
  }
-  , activate: function ( element, container, callback) {
+  Tab.prototype.activate = function (element, container, callback) {
    var $active    = container.find('> .active')
-        , transition = callback
+    var transition = callback
      && $.support.transition
      && $active.hasClass('fade')
@@ -91,7 +80,7 @@
        element.removeClass('fade')
      }
-        if ( element.parent('.dropdown-menu') ) {
+      if (element.parent('.dropdown-menu')) {
        element.closest('li.dropdown').addClass('active')
      }
@@ -104,19 +93,19 @@
    $active.removeClass('in')
  }
-  }
- /* TAB PLUGIN DEFINITION
+  // TAB PLUGIN DEFINITION
-  * ===================== */
+  // =====================
  var old = $.fn.tab
  $.fn.tab = function ( option ) {
    return this.each(function () {
      var $this = $(this)
-        , data = $this.data('tab')
+      var data  = $this.data('bs-tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (!data) $this.data('bs-tab', (data = new Tab(this)))
      if (typeof option == 'string') data[option]()
    })
  }
@@ -124,8 +113,8 @@
  $.fn.tab.Constructor = Tab
- /* TAB NO CONFLICT
+  // TAB NO CONFLICT
-  * =============== */
+  // ===============
  $.fn.tab.noConflict = function () {
    $.fn.tab = old
@@ -133,8 +122,8 @@
  }
- /* TAB DATA-API
+  // TAB DATA-API
-  * ============ */
+  // ============
  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
    e.preventDefault()

--- a/docs/assets/js/tooltip.js
+++ b/docs/assets/js/tooltip.js
--- a/docs/assets/js/transition.js
+++ b/docs/assets/js/transition.js
@@ -18,33 +18,30 @@
 * ========================================================== */
-!function ($) {
+!function ($) { "use strict";
-  "use strict";
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
-  /* CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-   * ======================================================= */
  function transitionEnd() {
-    var el = document.createElement('bootstrap');
+    var el = document.createElement('bootstrap')
    var transEndEventNames = {
      'WebkitTransition' : 'webkitTransitionEnd'
    , 'MozTransition'    : 'transitionend'
    , 'OTransition'      : 'oTransitionEnd otransitionend'
    , 'transition'       : 'transitionend'
-    };
+    }
    for (var name in transEndEventNames) {
      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] };
+        return { end: transEndEventNames[name] }
      }
    }
  }
  $(function () {
-    $.support.transition = transitionEnd();
+    $.support.transition = transitionEnd()
-  });
+  })
 }(window.jQuery);
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -56,7 +56,7 @@
    }
    this.$element[dimension](0)
-    this.transition('addClass', $.Event('bs:collapse:show'), 'shown')
+    this.transition('addClass', $.Event('bs:collapse:show'), 'bs:collapse:shown')
    if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
  }
@@ -85,7 +85,7 @@
  Collapse.prototype.transition = function (method, startEvent, completeEvent) {
    var that     = this
    var complete = function () {
-      if (startEvent.type == 'show') that.reset()
+      if (startEvent.type == 'bs:collapse:show') that.reset()
      that.transitioning = 0
      that.$element.trigger(completeEvent)
    }

--- a/js/modal.js
+++ b/js/modal.js
@@ -80,7 +80,7 @@
    })
  }
-  Modal.prototype.show = function (e) {
+  Modal.prototype.hide = function (e) {
    if (e) e.preventDefault()
    e = $.Event('bs:modal:hide')
@@ -144,12 +144,12 @@
    })
  }
-  Modal.prototype.removeBackdrop: function () {
+  Modal.prototype.removeBackdrop = function () {
    this.$backdrop && this.$backdrop.remove()
    this.$backdrop = null
  }
-  Modal.prototype.backdrop: function (callback) {
+  Modal.prototype.backdrop = function (callback) {
    var that    = this
    var animate = this.$element.hasClass('fade') ? 'fade' : ''

--- a/js/popover.js
+++ b/js/popover.js
@@ -63,7 +63,7 @@
  Popover.prototype.getContent = function () {
    var content = typeof this.options.content == 'function' ?
-      this.options.content.call($e[0]) :
+      this.options.content.call(this.$element[0]) :
      this.options.content
    return content || this.$element.attr('data-content')

--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -48,12 +48,12 @@ $(function () {
        $.support.transition = false
        stop();
        $('<div class="alert"/>')
-          .bind('bs-close', function (e) {
+          .bind('bs:alert:close', function (e) {
            e.preventDefault();
            ok(true);
            start();
          })
-          .bind('bs-closed', function () {
+          .bind('bs:alert:closed', function () {
            ok(false);
          })
          .alert('close')

--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -20,12 +20,12 @@ $(function () {
        $.support.transition = false
        stop()
        $('<div class="carousel"/>')
-          .bind('slide', function (e) {
+          .bind('bs:carousel:slide', function (e) {
            e.preventDefault();
            ok(true);
            start();
          })
-          .bind('slid', function () {
+          .bind('bs:carousel:slid', function () {
            ok(false);
          })
          .carousel('next')
@@ -35,7 +35,7 @@ $(function () {
        var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a></div>'
        $.support.transition = false
        stop()
-        $(template).on('slide', function (e) {
+        $(template).on('bs:carousel:slide', function (e) {
          e.preventDefault()
          ok(e.direction)
          ok(e.direction === 'right' || e.direction === 'left')
@@ -48,7 +48,7 @@ $(function () {
        $.support.transition = false
        stop()
        $(template)
-          .on('slide', function (e) {
+          .on('bs:carousel:slide', function (e) {
            e.preventDefault();
            ok(e.relatedTarget);
            ok($(e.relatedTarget).hasClass('item'));
@@ -63,19 +63,19 @@ $(function () {
        template.appendTo("body");
        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('carousel').options.interval == 1814);
+        ok($('#myCarousel').data('bs-carousel').options.interval == 1814);
        $('#myCarousel').remove();
        template.appendTo("body").attr("data-modal", "foobar");
        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('carousel').options.interval == 1814, "even if there is an data-modal attribute set");
+        ok($('#myCarousel').data('bs-carousel').options.interval == 1814, "even if there is an data-modal attribute set");
        $('#myCarousel').remove();
        template.appendTo("body");
        $('[data-slide]').first().click();
        $('#myCarousel').attr('data-interval', 1860);
        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('carousel').options.interval == 1814, "attributes should be read only on intitialization");
+        ok($('#myCarousel').data('bs-carousel').options.interval == 1814, "attributes should be read only on intitialization");
        $('#myCarousel').remove();
      })
 })
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -32,12 +32,12 @@ $(function () {
        $.support.transition = false
        stop()
        $('<div class="collapse"/>')
-          .bind('show', function (e) {
+          .bind('bs:collapse:show', function (e) {
            e.preventDefault();
            ok(true);
            start();
          })
-          .bind('shown', function () {
+          .bind('bs:collapse:shown', function () {
            ok(false);
          })
          .collapse('show')
@@ -47,10 +47,10 @@ $(function () {
        $.support.transition = false
        stop()
        $('<div class="collapse" style="height: 0px"/>')
-          .bind('show', function () {
+          .bind('bs:collapse:show', function () {
            ok(this.style.height == '0px')
          })
-          .bind('shown', function () {
+          .bind('bs:collapse:shown', function () {
            ok(this.style.height == 'auto')
            start()
          })
@@ -66,7 +66,7 @@ $(function () {
        var collapsible = $('<div id="test1"></div>')
          .appendTo($('#qunit-fixture'))
-          .on('show', function () {
+          .on('bs:collapse:show', function () {
            ok(!target.hasClass('collapsed'))
            start()
          })
@@ -83,7 +83,7 @@ $(function () {
        var collapsible = $('<div id="test1" class="in"></div>')
          .appendTo($('#qunit-fixture'))
-          .on('hide', function () {
+          .on('bs:collapse:hide', function () {
            ok(target.hasClass('collapsed'))
            start()
          })

--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -20,14 +20,14 @@ $(function () {
      })
      test("should expose defaults var for settings", function () {
-        ok($.fn.modal.defaults, 'default object exposed')
+        ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
      })
      test("should insert into dom when show method is called", function () {
        stop()
        $.support.transition = false
        $("<div id='modal-test'></div>")
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok($('#modal-test').length, 'modal insterted into dom')
            $(this).remove()
            start()
@@ -39,10 +39,10 @@ $(function () {
        stop()
        $.support.transition = false
        $("<div id='modal-test'></div>")
-          .bind("show", function () {
+          .bind("bs:modal:show", function () {
            ok(true, "show was called")
          })
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            $(this).remove()
            start()
          })
@@ -53,12 +53,12 @@ $(function () {
        stop()
        $.support.transition = false
        $("<div id='modal-test'></div>")
-          .bind("show", function (e) {
+          .bind("bs:modal:show", function (e) {
            e.preventDefault()
            ok(true, "show was called")
            start()
          })
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok(false, "shown was called")
          })
          .modal("show")
@@ -69,12 +69,12 @@ $(function () {
        $.support.transition = false
        $("<div id='modal-test'></div>")
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok($('#modal-test').is(":visible"), 'modal visible')
            ok($('#modal-test').length, 'modal insterted into dom')
            $(this).modal("hide")
          })
-          .bind("hidden", function() {
+          .bind("bs:modal:hidden", function() {
            ok(!$('#modal-test').is(":visible"), 'modal hidden')
            $('#modal-test').remove()
            start()
@@ -87,12 +87,12 @@ $(function () {
        $.support.transition = false
        var div = $("<div id='modal-test'></div>")
        div
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok($('#modal-test').is(":visible"), 'modal visible')
            ok($('#modal-test').length, 'modal insterted into dom')
            div.modal("toggle")
          })
-          .bind("hidden", function() {
+          .bind("bs:modal:hidden", function() {
            ok(!$('#modal-test').is(":visible"), 'modal hidden')
            div.remove()
            start()
@@ -105,12 +105,12 @@ $(function () {
        $.support.transition = false
        var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
        div
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok($('#modal-test').is(":visible"), 'modal visible')
            ok($('#modal-test').length, 'modal insterted into dom')
            div.find('.close').click()
          })
-          .bind("hidden", function() {
+          .bind("bs:modal:hidden", function() {
            ok(!$('#modal-test').is(":visible"), 'modal hidden')
            div.remove()
            start()
@@ -123,11 +123,11 @@ $(function () {
        $.support.transition = false
        var div = $("<div>", { id: 'modal-test', "data-backdrop": false })
        div
-          .bind("shown", function () {
+          .bind("bs:modal:shown", function () {
            ok($('#modal-test').is(":visible"), 'modal visible')
            div.modal("hide")
          })
-          .bind("hidden", function() {
+          .bind("bs:modal:hidden", function() {
            ok(!$('#modal-test').is(":visible"), 'modal hidden')
            div.remove()
            start()

--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -34,7 +34,7 @@ $(function () {
        var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
          .popover()
-        ok(!!popover.data('popover'), 'popover instance exists')
+        ok(!!popover.data('bs-popover'), 'popover instance exists')
      })
      test("should get title and content from options", function () {
@@ -99,7 +99,7 @@ $(function () {
      test("should destroy popover", function () {
        var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function(){})
-        ok(popover.data('popover'), 'popover has data')
+        ok(popover.data('bs-popover'), 'popover has data')
        ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
        ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
        popover.popover('show')

--- a/js/tests/unit/tab.js
+++ b/js/tests/unit/tab.js
@@ -53,12 +53,12 @@ $(function () {
        $.support.transition = false
        stop();
        $('<div class="tab"/>')
-          .bind('show', function (e) {
+          .bind('bs:tab:show', function (e) {
            e.preventDefault();
            ok(true);
            start();
          })
-          .bind('shown', function () {
+          .bind('bs:tab:shown', function () {
            ok(false);
          })
          .tab('show')
@@ -78,7 +78,7 @@ $(function () {
        $(dropHTML).find('ul>li:first a').tab('show').end()
          .find('ul>li:last a').on('show', function(event){
            equals(event.relatedTarget.hash, "#1-1")
-          }).on('shown', function(event){
+          }).on('bs:tab:shown', function(event){
            equals(event.relatedTarget.hash, "#1-1")
          }).tab('show')
      })

--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -19,7 +19,7 @@ $(function () {
      })
      test("should expose default settings", function () {
-        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
+        ok(!!$.fn.tooltip.Constructor.DEFAULTS, 'defaults is defined')
      })
      test("should empty title attribute", function () {
@@ -69,7 +69,7 @@ $(function () {
      test("should fire show event", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("show", function() {
+          .bind("bs:tooltip:show", function() {
            ok(true, "show was called")
            start()
          })
@@ -79,7 +79,7 @@ $(function () {
      test("should fire shown event", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("shown", function() {
+          .bind("bs:tooltip:shown", function() {
            ok(true, "shown was called")
            start()
          })
@@ -89,12 +89,12 @@ $(function () {
      test("should not fire shown event when default prevented", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("show", function(e) {
+          .bind("bs:tooltip:show", function(e) {
            e.preventDefault()
            ok(true, "show was called")
            start()
          })
-          .bind("shown", function() {
+          .bind("bs:tooltip:shown", function() {
            ok(false, "shown was called")
          })
          .tooltip('show')
@@ -103,10 +103,10 @@ $(function () {
      test("should fire hide event", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("shown", function() {
+          .bind("bs:tooltip:shown", function() {
            $(this).tooltip('hide')
          })
-          .bind("hide", function() {
+          .bind("bs:tooltip:hide", function() {
            ok(true, "hide was called")
            start()
          })
@@ -116,10 +116,10 @@ $(function () {
      test("should fire hidden event", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("shown", function() {
+          .bind("bs:tooltip:shown", function() {
            $(this).tooltip('hide')
          })
-          .bind("hidden", function() {
+          .bind("bs:tooltip:hidden", function() {
            ok(true, "hidden was called")
            start()
          })
@@ -129,15 +129,15 @@ $(function () {
      test("should not fire hidden event when default prevented", function () {
        stop()
        var tooltip = $('<div title="tooltip title"></div>')
-          .bind("shown", function() {
+          .bind("bs:tooltip:shown", function() {
            $(this).tooltip('hide')
          })
-          .bind("hide", function(e) {
+          .bind("bs:tooltip:hide", function(e) {
            e.preventDefault()
            ok(true, "hide was called")
            start()
          })
-          .bind("hidden", function() {
+          .bind("bs:tooltip:hidden", function() {
            ok(false, "hidden was called")
          })
          .tooltip('show')
@@ -214,13 +214,13 @@ $(function () {
      test("should destroy tooltip", function () {
        var tooltip = $('<div/>').tooltip().on('click.foo', function(){})
-        ok(tooltip.data('tooltip'), 'tooltip has data')
+        ok(tooltip.data('bs-tooltip'), 'tooltip has data')
        ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event')
        ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event')
        tooltip.tooltip('show')
        tooltip.tooltip('destroy')
        ok(!tooltip.hasClass('in'), 'tooltip is hidden')
-        ok(!$._data(tooltip[0], 'tooltip'), 'tooltip does not have data')
+        ok(!$._data(tooltip[0], 'bs-tooltip'), 'tooltip does not have data')
        ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip still has click.foo')
        ok(!$._data(tooltip[0], 'events').mouseover && !$._data(tooltip[0], 'events').mouseout, 'tooltip does not have any events')
      })

--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -48,10 +48,10 @@
  }
  Tooltip.prototype.init = function (type, element, options) {
-    this.type     = type
-    this.options  = this.getOptions(options)
    this.enabled  = true
+    this.type     = type
    this.$element = $(element)
+    this.options  = this.getOptions(options)
    var triggers = this.options.trigger.split(' ')
@@ -99,7 +99,7 @@
      if (defaults[key] != value) options[key] = value
    }, this)
-    var self = $(e.currentTarget)[this.type](options).data(this.type)
+    var self = $(e.currentTarget)[this.type](options).data('bs-' + this.type)
    if (!self.options.delay || !self.options.delay.show) return self.show()
@@ -112,7 +112,7 @@
  }
  Tooltip.prototype.leave = function (e) {
-    var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+    var self = $(e.currentTarget)[this.type](this._options).data('bs-' + this.type)
    if (this.timeout) clearTimeout(this.timeout)
    if (!self.options.delay || !self.options.delay.hide) return self.hide()
@@ -168,10 +168,12 @@
      }
      this.applyPlacement(tp, placement)
-      this.$element.trigger('shown')
+      this.$element.trigger('bs:' + this.type + ':shown')
+    }
  }
  Tooltip.prototype.applyPlacement = function(offset, placement) {
+    var replace
    var $tip   = this.tip()
    var width  = $tip[0].offsetWidth
    var height = $tip[0].offsetHeight
@@ -185,7 +187,7 @@
    var actualHeight = $tip[0].offsetHeight
    if (placement == 'top' && actualHeight != height) {
-      var replace = true
+      replace = true
      offset.top  = offset.top + height - actualHeight
    }
@@ -210,7 +212,7 @@
    if (replace) $tip.offset(offset)
  }
-  Tooltip.prototype.replaceArrow = function(delta, dimension, position){
+  Tooltip.prototype.replaceArrow = function(delta, dimension, position) {
    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
  }
@@ -248,7 +250,7 @@
      removeWithAnimation() :
      $tip.detach()
-    this.$element.trigger('hidden')
+    this.$element.trigger('bs:' + this.type + ':hidden')
    return this
  }
@@ -312,12 +314,12 @@
  }
  Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+    var self = e ? $(e.currentTarget)[this.type](this._options).data('bs-' + this.type) : this
    self.tip().hasClass('in') ? self.hide() : self.show()
  }
  Tooltip.prototype.destroy = function () {
-    this.hide().$element.off('.' + this.type).removeData(this.type)
+    this.hide().$element.off('.' + this.type).removeData('bs-' + this.type)
  }
@@ -326,7 +328,7 @@
  var old = $.fn.tooltip
-  $.fn.tooltip = function ( option ) {
+  $.fn.tooltip = function (option) {
    return this.each(function () {
      var $this   = $(this)
      var data    = $this.data('bs-tooltip')