jombo 0.0.1.beta10 → 0.0.1.beta11

data/lib/jombo/version.rb

@@ -1,3 +1,3 @@
 module Jombo
-  VERSION = "0.0.1.beta10"
+  VERSION = "0.0.1.beta11"
 end

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

@@ -27,7 +27,7 @@
 
   var dismiss = '[data-dismiss="alert"]'
     , Alert = function ( el ) {
-        $(el).delegate(dismiss, 'click', this.close)
+        $(el).on('click', dismiss, this.close)
       }
 
   Alert.prototype = {
@@ -35,18 +35,26 @@
     constructor: Alert
 
   , close: function ( e ) {
-      var $element = $(this)
+      var $this = $(this)
+        , selector = $this.attr('data-target') || $this.attr('href')
+        , $parent = $(selector)
+
+      $parent.trigger('close')
 
-      $element = $element.hasClass('alert-message') ? $element : $element.parent()
       e && e.preventDefault()
-      $element.removeClass('in')
+
+      $parent.length || ($parent = $this.hasClass('alert-message') ? $this : $this.parent())
+
+      $parent.removeClass('in')
 
       function removeElement() {
-        $element.remove()
+        $parent.remove()
+
+        $parent.trigger('closed')
       }
 
-      $.support.transition && $element.hasClass('fade') ?
-        $element.bind($.support.transition.end, removeElement) :
+      $.support.transition && $parent.hasClass('fade') ?
+        $parent.on($.support.transition.end, removeElement) :
         removeElement()
     }
 
@@ -65,14 +73,14 @@
     })
   }
 
-  $.fn.alert.Alert = Alert
+  $.fn.alert.Constructor = Alert
 
 
  /* ALERT DATA-API
   * ============== */
 
   $(function () {
-    $('body').delegate(dismiss, 'click.alert.data-api', Alert.prototype.close)
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery || window.ender )
+}( window.jQuery )

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

@@ -24,16 +24,16 @@
  /* BUTTON PUBLIC CLASS DEFINITION
   * ============================== */
 
-  var Button = function (element, options) {
+  var Button = function ( element, options ) {
     this.$element = $(element)
-    this.settings = $.extend({}, $.fn.button.defaults, options)
+    this.options = $.extend({}, $.fn.button.defaults, options)
   }
 
   Button.prototype = {
 
       constructor: Button
 
-    , setState: function (state) {
+    , setState: function ( state ) {
         var d = 'disabled'
           , $el = this.$element
           , data = $el.data()
@@ -42,7 +42,7 @@
         state = state + 'Text'
         data.resetText || $el.data('resetText', $el[val]())
 
-        $el[val](data[state] || this.settings[state])
+        $el[val](data[state] || this.options[state])
 
         // push to event loop to allow forms to submit
         setTimeout(function () {
@@ -83,16 +83,16 @@
     loadingText: 'loading...'
   }
 
-  $.fn.button.Button = Button
+  $.fn.button.Constructor = Button
 
 
  /* BUTTON DATA-API
   * =============== */
 
   $(function () {
-    $('body').delegate('[data-toggle^=button]', 'click.button.data-api', function (e) {
+    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
       $(e.srcElement).button('toggle')
     })
   })
 
-}( window.jQuery || window.ender )
+}( window.jQuery )

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

@@ -25,8 +25,8 @@
  /* CAROUSEL CLASS DEFINITION
   * ========================= */
 
-  var Carousel = function ( el ) {
-    $(el).delegate(dismiss, 'click', this.close)
+  var Carousel = function () {
+
   }
 
   Carousel.prototype = {
@@ -40,20 +40,12 @@
   $.fn.carousel = function ( option ) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
+        , data = $this.data('carousel')
+      if (!data) $this.data('carousel', (data = new Carousel(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }
 
-  $.fn.carousel.Carousel = Carousel
-
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  // $(function () {
-  //   $('body').delegate(dismiss, 'click.alert.data-api', Alert.prototype.close)
-  // })
+  $.fn.carousel.Constructor = Carousel
 
-}( window.jQuery || window.ender )
+}( window.jQuery )

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

@@ -17,19 +17,19 @@
  * limitations under the License.
  * ============================================================ */
 
-(function( $ ){
+!function( $ ){
 
   "use strict"
 
   var Collapse = function ( element, options ) {
   	this.$element = $(element)
-    this.settings = $.extend({}, $.fn.collapse.defaults, options)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
 
-    if (this.settings["parent"]) {
-      this.$parent = $(this.settings["parent"])
+    if (this.options["parent"]) {
+      this.$parent = $(this.options["parent"])
     }
 
-    this.settings.toggle && this.toggle()
+    this.options.toggle && this.toggle()
   }
 
   Collapse.prototype = {
@@ -116,20 +116,20 @@
     toggle: true
   }
 
-  $.fn.collapse.Collapse = Collapse
+  $.fn.collapse.Constructor = Collapse
 
 
  /* COLLAPSIBLE DATA-API
   * ==================== */
 
   $(function () {
-    $('body').delegate('[data-toggle=collapse]', 'click.collapse.data-api', function ( e ) {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
       var $this = $(this)
         , target = $this.attr('data-target') || $this.attr('href')
         , option = $(target).data('collapse') ? 'toggle' : $this.data()
-        e.preventDefault()
+      e.preventDefault()
       $(target).collapse(option)
     })
   })
 
-})( window.jQuery || window.ender )
+}( window.jQuery )

data/vendor/assets/javascripts/bootstrap/bootstrap-dropdown.js

@@ -35,11 +35,15 @@
     constructor: Dropdown
 
   , toggle: function ( e ) {
-      var li = $(this).parent('li')
-        , isActive = li.hasClass('open')
+      var $this = $(this)
+        , selector = $this.attr('data-target') || $this.attr('href')
+        , $parent = $(selector)
+
+      $parent.length || ($parent = $this.parent())
 
       clearMenus()
-      !isActive && li.toggleClass('open')
+
+      !$parent.hasClass('open') && $parent.toggleClass('open')
 
       return false
     }
@@ -47,7 +51,7 @@
   }
 
   function clearMenus() {
-    $(toggle).parent('li').removeClass('open')
+    $(toggle).parent().removeClass('open')
   }
 
 
@@ -63,13 +67,15 @@
     })
   }
 
+  $.fn.dropdown.Constructor = Dropdown
+
 
   /* APPLY TO STANDARD DROPDOWN ELEMENTS
    * =================================== */
 
   $(function () {
-    $('html').bind('click.dropdown.data-api', clearMenus)
-    $('body').delegate(toggle, 'click.dropdown.data-api', Dropdown.prototype.toggle)
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery || window.ender )
+}( window.jQuery )

data/vendor/assets/javascripts/bootstrap/bootstrap-modal.js

@@ -26,10 +26,9 @@
   * ====================== */
 
   var Modal = function ( content, options ) {
-    this.settings = $.extend({}, $.fn.modal.defaults, options)
+    this.options = $.extend({}, $.fn.modal.defaults, options)
     this.$element = $(content)
       .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.settings.show && this.show()
   }
 
   Modal.prototype = {
@@ -97,7 +96,7 @@
   function hideWithTransition() {
     var that = this
       , timeout = setTimeout(function () {
-          that.$element.unbind($.support.transition.end)
+          that.$element.off($.support.transition.end)
           hideModal.call(that)
         }, 500)
 
@@ -107,7 +106,7 @@
     })
   }
 
-  function hideModal (that) {
+  function hideModal( that ) {
     this.$element
       .hide()
       .trigger('hidden')
@@ -115,17 +114,17 @@
     backdrop.call(this)
   }
 
-  function backdrop ( callback ) {
+  function backdrop( callback ) {
     var that = this
       , animate = this.$element.hasClass('fade') ? 'fade' : ''
 
-    if (this.isShown && this.settings.backdrop) {
+    if (this.isShown && this.options.backdrop) {
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(document.body)
 
-      if (this.settings.backdrop != 'static') {
+      if (this.options.backdrop != 'static') {
         this.$backdrop.click($.proxy(this.hide, this))
       }
 
@@ -156,12 +155,12 @@
 
   function escape() {
     var that = this
-    if (this.isShown && this.settings.keyboard) {
-      $(document).bind('keyup.dismiss.modal', function ( e ) {
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
         e.which == 27 && that.hide()
       })
     } else if (!this.isShown) {
-      $(document).unbind('keyup.dismiss.modal')
+      $(document).off('keyup.dismiss.modal')
     }
   }
 
@@ -176,29 +175,30 @@
         , options = typeof option == 'object' && option
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
+      else data.show()
     })
   }
 
   $.fn.modal.defaults = {
       backdrop: true
     , keyboard: true
-    , show: true
   }
 
-  $.fn.modal.Modal = Modal
+  $.fn.modal.Constructor = Modal
 
 
  /* MODAL DATA-API
   * ============== */
 
-  $(document).ready(function () {
-    $('body').delegate('[data-toggle="modal"]', 'click.modal.data-api', function ( e ) {
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
       var $this = $(this)
-        , target = $this.attr('data-target') || $this.attr('href')
-        , option = $(target).data('modal') ? 'toggle' : $this.data()
+        , $target = $($this.attr('data-target') || $this.attr('href'))
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
       e.preventDefault()
-      $(target).modal(option)
+      $target.modal(option)
     })
   })
 
-}( window.jQuery || window.ender )
+}( window.jQuery )

data/vendor/assets/javascripts/bootstrap/bootstrap-popover.js

@@ -23,16 +23,13 @@
  "use strict"
 
   var Popover = function ( element, options ) {
-    this.$element = $(element)
-    this.options = options
-    this.enabled = true
-    this.fixTitle()
+    this.init('popover', element, options)
   }
 
   /* NOTE: POPOVER EXTENDS BOOTSTRAP-TWIPSY.js
      ========================================= */
 
-  Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, {
+  Popover.prototype = $.extend({}, $.fn.twipsy.Constructor.prototype, {
 
     constructor: Popover
 
@@ -53,22 +50,20 @@
 
   , getContent: function () {
       var content
-       , $e = this.$element
-       , o = this.options
+        , $e = this.$element
+        , o = this.options
 
-      if (typeof this.options.content == 'string') {
-        content = $e.attr(this.options.content)
-      } else if (typeof this.options.content == 'function') {
-        content = this.options.content.call(this.$element[0])
-      }
+      content = $e.attr('data-content')
+        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+
+      content = content.toString().replace(/(^\s*|\s*$)/, "")
 
       return content
     }
 
   , tip: function() {
       if (!this.$tip) {
-        this.$tip = $('<div class="popover" />')
-          .html(this.options.template)
+        this.$tip = $(this.options.template)
       }
       return this.$tip
     }
@@ -79,18 +74,22 @@
  /* POPOVER PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.popover = function (options) {
-    if (typeof options == 'object') options = $.extend({}, $.fn.popover.defaults, options)
-    $.fn.twipsy.initWith.call(this, options, Popover, 'popover')
-    return this
+  $.fn.popover = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
   }
 
+  $.fn.popover.Constructor = Popover
+
   $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
     placement: 'right'
-  , content: 'data-content'
-  , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
   })
 
-  $.fn.twipsy.rejectAttrOptions.push( 'content' )
-
-}( window.jQuery || window.ender )
+}( window.jQuery )

data/vendor/assets/javascripts/bootstrap/bootstrap-scrollspy.js

@@ -27,11 +27,11 @@
   function ScrollSpy( element ) {
     var process = $.proxy(this.process, this)
 
-    this.$scrollElement = $(element).bind('scroll.scroll.data-api', process)
+    this.$scrollElement = $(element).on('scroll.scroll.data-api', process)
     this.selector = (this.$scrollElement.attr('data-target')
       || this.$scrollElement.attr('href')
       || '') + ' .nav li > a'
-    this.$body = $('body').delegate(this.selector, 'click.scroll.data-api', process)
+    this.$body = $('body').on('click.scroll.data-api', this.selector, process)
 
     this.refresh()
     this.process()
@@ -103,7 +103,7 @@
     })
   }
 
-  $.fn.scrollspy.ScrollSpy = ScrollSpy
+  $.fn.scrollspy.Constructor = ScrollSpy
 
 
  /* SCROLLSPY DATA-API
@@ -111,4 +111,4 @@
 
   $(function () { $('[data-spy="scroll"]').scrollspy() })
 
-}( window.jQuery || window.ender )
+}( window.jQuery )