luca 0.9.42 → 0.9.65

data/src/components/table_view.coffee

@@ -1,3 +1,4 @@
+# Public: TableView renders collection data into an HTML table.
 _.def("Luca.components.TableView").extends("Luca.components.CollectionView").with
   additionalClassNames: "table"
   tagName: "table"
@@ -15,18 +16,21 @@ _.def("Luca.components.TableView").extends("Luca.components.CollectionView").wit
   itemRenderer: (item, model)->
     Luca.components.TableView.rowRenderer.call(@, item, model)
 
-  emptyResults: ()->
-    @$('tbody').append("<tr><td colspan=#{ @columns.length }>#{ @emptyText }</td></tr>")
-
   initialize: (@options={})->
     Luca.components.CollectionView::initialize.apply(@, arguments)
+
+    @columns = for column in @columns
+      if _.isString(column)
+        column = reader: column
+
+      if !column.header?
+        column.header = _.str.titleize(_.str.humanize(column.reader))
+
+      column
+
     @defer ()=> 
       Luca.components.TableView.renderHeader.call(@, @columns, @$('thead') )
-      # TEMP
-      # This is a result of the @additionalClassNames inheritance bug
-      @$el.removeClass('row-fluid')
-    .until("before:render")
-
+    .until("after:render")
 
 make = Backbone.View::make
 
@@ -34,20 +38,25 @@ Luca.components.TableView.renderHeader = (columns, targetElement)->
   index = 0
 
   content = for column in columns
-    "<th data-col-index='#{ index }'>#{ column.header }</th>"
+    "<th data-col-index='#{ index++ }'>#{ column.header }</th>"
 
-  $( targetElement ).append(make "tr",{}, content)
+  @$( targetElement ).append("<tr>#{ content.join('') }</tr>")
 
   index = 0
 
   for column in columns when column.width?
-    @$("th[data-col-index='#{ index }']",targetElement).css('width', column.width)
+    @$("th[data-col-index='#{ index++ }']",targetElement).css('width', column.width)
 
 
 Luca.components.TableView.rowRenderer = (item, model, index)->
+  colIndex = 0
   for columnConfig in @columns
-    Luca.components.TableView.renderColumn.call(@, columnConfig, item, model, index) 
+    Luca.components.TableView.renderColumn.call(@, columnConfig, item, model, colIndex++) 
 
 Luca.components.TableView.renderColumn = (column, item, model, index)->
   cellValue = model.read( column.reader )
-  make("td", {}, cellValue)
+
+  if _.isFunction( column.renderer )
+    cellValue = column.renderer.call @, cellValue, model, column 
+
+  make("td", {"data-col-index":index}, cellValue)

data/src/containers/card_view.coffee

@@ -1,5 +1,28 @@
-_.def("Luca.containers.CardView").extends("Luca.core.Container").with
-  componentType: 'card_view'
+component = Luca.define         "Luca.containers.CardView"
+component.extends               "Luca.core.Container"
+#
+# The CardView is a type of Container which has many sub-views
+# which are only going to be visible one at a time.  A CardView
+# allows you to @activate() its cards, navigate through them using
+# @next(), @previous(), @cycle()
+#
+# Example:
+#   cardView = new Luca.containers.CardView
+#     cards:[
+#       getter: "getCardOne"
+#       type: "my_component"
+#       name: "one"
+#     ,
+#       getter: "getCardTwo"
+#       type: "my_component"
+#       name: "two"
+#     ]
+#
+#   cardView.activeComponent().name # => "one"
+#   cardView.activate('two')
+#   cardView.activeComponent().name # => "two"
+#
+component.defaults
 
   className: 'luca-ui-card-view-wrapper'
 
@@ -18,15 +41,12 @@ _.def("Luca.containers.CardView").extends("Luca.core.Container").with
   initialize: (@options)->
     Luca.core.Container::initialize.apply @,arguments
     @setupHooks(@hooks)
+    @components ||= @pages ||= @cards 
 
   prepareComponents: ()->
     Luca.core.Container::prepareComponents?.apply(@, arguments)
-
-    _( @components ).each (component,index)=>
-      if index is @activeCard
-        $( component.container ).show()
-      else
-        $( component.container ).hide()
+    @componentElements().hide()
+    @activeComponentElement().show()
 
   activeComponentElement: ()->
     @componentElements().eq( @activeCard )
@@ -39,12 +59,25 @@ _.def("Luca.containers.CardView").extends("Luca.core.Container").with
 
     containerEl
 
+  atFirst: ()->
+    @activeCard is 0
+
+  atLast: ()->
+    @activeCard is @components.length - 1
+
+  next: ()->
+    return if @atLast()
+    @activate( @activeCard + 1)
+
+  previous: ()->   
+    return if @atFirst()
+    @activate( @activeCard - 1)
+
   cycle: ()->
-    nextIndex = if @activeCard < @components.length - 1 then @activeCard + 1 else 0
+    nextIndex = if @atLast() then 0 else @activeCard + 1
     @activate( nextIndex )
 
-  find: (name)->
-    @findComponentByName(name,true)
+  find: (name)-> Luca(name)
 
   firstActivation: ()->
     @activeComponent().trigger "first:activation", @, @activeComponent()

data/src/containers/panel_toolbar.coffee

@@ -1,26 +1,95 @@
+panelToolbar = Luca.register        "Luca.components.PanelToolbar"
+# The Panel Toolbar is a collection of buttons and / or dropdowns
+# which are automatically created by BasicPanel classes, or can be
+# added to any other view component.
+panelToolbar.extends                "Luca.View"
+
+
+panelToolbar.defines
+  # @buttons is an array of button config objects
+  # button config accepts the following paramters:
+  #
+  # label       what should the button say
+  # eventId     what event should the button trigger
+  # dropdown    an array of arrays: [eventId, label]
+  # group       an array of button configs
+  # wrapper     a css class, in addition to btn-group
+  # icon        which icon do you want to use on this button?
+  # white       true or false: is it a white colored text?
+  # color       options are primary, info, success, warning, danger, inverse
+  buttons:[]
+
+  className: "luca-ui-toolbar btn-toolbar"
+
+  well: true
+
+  orientation: 'top'
+
+  autoBindEventHandlers: true
+
+  events:
+    "click a.btn, click .dropdown-menu li" : "clickHandler"
+
+  initialize: (@options={})->
+    @_super("initialize", @, arguments)
+
+    # if the toolbar consists of a single button group
+    # don't make the developer specify buttons = {buttons:[group:true, buttons:[...]]}
+    if @group is true and @buttons?.length >= 0
+      @buttons = [
+        group: true
+        buttons: @buttons
+      ]
+
+  # The Toolbar behaves by triggering events on the components which they
+  # belong to. Combined with Luca.View::setupHooks it is a clean way
+  # to organize actions
+  clickHandler: (e)->
+    me = my = $( e.target )
+    me = my = $( e.target ).parent() if me.is('i')
+
+    if @selectable is true
+      my.siblings().removeClass("is-selected")
+      me.addClass('is-selected')
+
+    return unless eventId = my.data('eventid')
+
+    hook = Luca.util.hook( eventId )
+
+    source = @parent || @
+    if _.isFunction( source[hook] )
+      source[ hook ].call(@, me, e)
+    else
+      source.trigger(eventId, me, e)
+
+  beforeRender:()->
+    @_super("beforeRender", @, arguments)
+
+    if @well is true
+      @$el.addClass 'well'
+
+    @$el.addClass 'btn-selectable' if @selectable is true
+    @$el.addClass "toolbar-#{ @orientation }"
+    @$el.addClass "pull-right" if @align is "right"
+    @$el.addClass "pull-left" if @align is "left"
+
+  render: ()->
+    @$el.empty()
+    @$el.append( element ) for element in prepareButtons(@buttons)
+    @
 
-# button config accepts the following paramters:
-#
-# label       what should the button say
-# eventId     what event should the button trigger
-# dropdown    an array of arrays: [eventId, label]
-# group       an array of button configs
-# wrapper     a css class, in addition to btn-group
-# icon        which icon do you want to use on this button?
-# white       true or false: is it a white colored text?
-# color       options are primary, info, success, warning, danger, inverse
 
 make = Backbone.View::make
 
 buildButton = (config, wrap=true)->
-  if config.ctype?
+  if config.ctype? or config.type?
     config.className ||= ""
     config.className += 'toolbar-component'
 
     object = Luca(config).render()
+
     if Luca.isBackboneView(object)
-      console.log "Adding toolbar component", object
-      return object.el
+      return object.$el
 
   if config.spacer
     return make "div", class: "spacer #{ config.spacer }"
@@ -29,8 +98,9 @@ buildButton = (config, wrap=true)->
     return make "div", {class: "toolbar-text"}, config.text
 
   wrapper = 'btn-group'
-  wrapper += " #{ config.wrapper }" if config.wrapper?
-  wrapper += " align-#{ config.align }" if config.align?
+  wrapper += "#{ config.wrapper }" if config.wrapper?
+  wrapper += "pull-#{ config.align } align-#{ config.align }" if config.align?
+  wrapper += 'btn-selectable' if config.selectable is true
 
   # if we're passed a group, then we need to just
   # wrap the contents of the buttons property in that group
@@ -57,6 +127,7 @@ buildButton = (config, wrap=true)->
       title: config.title || config.description
 
     buttonAttributes["class"] += " btn-#{ config.color }" if config.color?
+    buttonAttributes["class"] += " is-selected" if config.selected?
 
     if config.dropdown
       label = "#{ label } <span class='caret'></span>"
@@ -82,70 +153,5 @@ buildButton = (config, wrap=true)->
       # for buttons which are already part f a group
       buttonEl
 
-prepareButtons = (buttons, wrap=true)->
-  _( buttons ).map (button)->
-    buildButton(button, wrap)
-
-
-#### Panel Toolbar Component
-#
-# The Panel Toolbar is a collection of buttons and / or dropdowns
-# which are automatically created by BasicPanel classes, or can be
-# added to any other view component.
-_.def("Luca.containers.PanelToolbar").extends("Luca.View").with
-
-  className: "luca-ui-toolbar btn-toolbar"
-
-  # @buttons is an array of button config objects
-
-
-  buttons:[]
-
-  well: true
-
-  orientation: 'top'
-
-  autoBindEventHandlers: true
-
-  events:
-    "click a.btn, click .dropdown-menu li" : "clickHandler"
-
-  #autoBindEventHandlers: true
-
-  # The Toolbar behaves by triggering events on the components which they
-  # belong to. Combined with Luca.View::setupHooks it is a clean way
-  # to organize actions
-  clickHandler: (e)->
-    me = my = $( e.target )
-
-    if me.is('i')
-      me = my = $( e.target ).parent()
-
-    eventId = my.data('eventid')
-
-    return unless eventId?
-
-    hook = Luca.util.hook( eventId )
-
-    source = @parent || @
-    if _.isFunction( source[hook] )
-      source[ hook ].call(@, me, e)
-    else
-      source.trigger(eventId, me, e)
-
-  beforeRender:()->
-    @_super("beforeRender", @, arguments)
-
-    if @well is true
-      @$el.addClass 'well'
-
-    @$el.addClass "toolbar-#{ @orientation }"
-
-    @applyStyles( @styles ) if @styles?
-
-  render: ()->
-    @$el.empty()
-
-    elements = prepareButtons(@buttons)
-    _( elements ).each (element)=>
-      @$el.append( element )
+prepareButtons = (buttons=[], wrap=true)->
+  buildButton(button, wrap) for  button in buttons

data/src/containers/tab_view.coffee

@@ -42,17 +42,17 @@ _.def('Luca.containers.TabView').extends('Luca.containers.CardView').with
 
   afterRender: ()->
     Luca.containers.CardView::afterRender?.apply @, arguments
-    @registerEvent("click ##{ @cid }-tabs-selector li a", "select")
+    tabContainerId = @tabContainer().attr("id")
+    @registerEvent("click ##{ tabContainerId } li a", "select")
 
     if Luca.enableBootstrap and (@tab_position is "left" or @tab_position is "right")
       @tabContainerWrapper().addClass("span2")
       @tabContentWrapper().addClass("span9")
 
-
   createTabSelectors: ()->
     tabView = @
     @each (component,index)->
-      icon = "<i class='icon-#{ component.tabIcon }" if component.tabIcon
+      icon = "<i class='icon-#{ component.tabIcon }'></i>" if component.tabIcon
       link = "<a href='#'>#{ icon || ''} #{ component.title }</a>"
       selector = tabView.make("li",{class:"tab-selector","data-target":index}, link)
       tabView.tabContainer().append(selector)

data/src/core/collection.coffee

@@ -1,8 +1,14 @@
-source = 'Backbone.Collection'
-source = 'Backbone.QueryCollection' if Backbone.QueryCollection?
+collection = Luca.define            'Luca.Collection'
 
-_.def("Luca.Collection").extends( source ).with
-  include: ['Luca.Events']
+if Backbone.QueryCollection?
+  collection.extends                'Backbone.QueryCollection'
+else
+  collection.extends                'Backbone.Collection'
+
+collection.includes                 'Luca.Events'
+
+collection.defines    
+  model: Luca.Model
   # cachedMethods refers to a list of methods on the collection
   # whose value gets cached once it is ran.  the collection then
   # binds to change, add, remove, and reset events and then expires
@@ -325,6 +331,7 @@ _.def("Luca.Collection").extends( source ).with
           collection.bind "change:#{dependency}", ()->
             collection.clearMethodCache(method: method)
 
+
   # make sure the querying interface from backbone.query is present
   # in the case backbone-query isn't loaded.  without it, it will
   # just return the models