luca 0.8.06 → 0.8.59

data/src/components/form_view.coffee

@@ -1,4 +1,5 @@
-Luca.components.FormView = Luca.core.Container.extend
+_.component("Luca.components.FormView").extends('Luca.core.Container').with
+
   tagName: 'form'
 
   className: 'luca-ui-form-view'
@@ -93,8 +94,15 @@ Luca.components.FormView = Luca.core.Container.extend
     _( @components ).each (component)->
       component.container = container
 
+  afterComponents: ()->
+    Luca.core.Container::afterComponents?.apply(@, arguments)
+    @eachField (field)=>
+      field.getForm = ()=> @
+      field.getModel = ()=> @currentModel()
+
   render: ()->
     $( @container ).append( @$el )
+    @
 
   wrapper: ()->
     @$el.parents('.luca-ui-form-view-wrapper')
@@ -108,6 +116,9 @@ Luca.components.FormView = Luca.core.Container.extend
         toolbar = Luca.util.lazyComponent(toolbar)
         toolbar.render()
 
+  eachField: (iterator)->
+    _( @getFields() ).map( iterator )
+
   getField: (name)->
     _( @getFields('name', name) ).first()
 
@@ -147,7 +158,7 @@ Luca.components.FormView = Luca.core.Container.extend
       @trigger "after:load:#{ (if @current_model.isNew() then "new" else "existing")}", @, @current_model
 
   reset: ()->
-    @loadModel( @current_model )
+    @loadModel( @current_model ) if @current_model?
 
   clear: ()->
     @current_model = if @defaultModel? then @defaultModel() else undefined
@@ -178,9 +189,7 @@ Luca.components.FormView = Luca.core.Container.extend
 
     @syncFormWithModel() unless options.silent? is true
 
-  getValues: (options)->
-    options ||= {}
-
+  getValues: (options={})->
     options.reject_blank = true unless options.reject_blank?
     options.skip_buttons = true unless options.skip_buttons?
 
@@ -189,9 +198,16 @@ Luca.components.FormView = Luca.core.Container.extend
       key = field.input_name || field.name
 
       skip = false
+
+      # don't include the values of buttons in our values hash
       skip = true if options.skip_buttons and field.ctype is "button_field"
-      skip = true if options.reject_blank is true and _.isBlank(value)
-      skip = true if field.input_name is "id" and _.isBlank(value)
+
+      # if the value is blank and we are passed reject_blank in the options
+      # then we should not include this field in our hash.  however, if the
+      # field is setup to send blanks, then we will send this value anyway
+      if _.string.isBlank( value )
+        skip = true if options.reject_blank and !field.send_blanks
+        skip = true if field.input_name is "id"
 
       memo[ key ] = value unless skip is true
 
@@ -230,6 +246,4 @@ Luca.components.FormView = Luca.core.Container.extend
     @current_model?.set( @getValues() )
 
   setLegend: (@legend)->
-    $('fieldset legend', @el).first().html(@legend)
-
-Luca.register 'form_view', 'Luca.components.FormView'
+    $('fieldset legend', @el).first().html(@legend)

data/src/components/grid_view.coffee

@@ -1,12 +1,25 @@
-Luca.components.GridView = Luca.View.extend
+_.component('Luca.components.GridView').extend('Luca.View').with
+
   autoBindEventHandlers: true
 
   events:
-    "dblclick .luca-ui-g-row" : "double_click_handler"
-    "click .luca-ui-g-row": "click_handler"
+    "dblclick table tbody tr" : "double_click_handler"
+    "click table tbody tr": "click_handler"
 
   className: 'luca-ui-g-view'
 
+  rowClass: "luca-ui-g-row"
+
+  wrapperClass: "luca-ui-g-view-wrapper"
+
+  # add whatever additional container classes you want
+  # to be applied to the wrapper here
+  additionalWrapperClasses: []
+
+  # add additional style declarations to the wrapper if you like
+  # these will be added by jquery.css and accept the same syntax
+  wrapperStyles: {}
+
   scrollable: true
 
   emptyText: 'No Results To display.'
@@ -15,49 +28,62 @@ Luca.components.GridView = Luca.View.extend
   # or any combination of these, split up by space
   tableStyle: 'striped'
 
+  # we have to specify height to make the scrollable table portion work
+  defaultHeight: 285
+
+  # unless we specify the width ourselves
+  # the width of the grid will automatically be set to the width of the container
+  # and if it can't be determined, then it will be set to the default
+  defaultWidth: 756
+
+  # the grid should never outgrow its container
+  maxWidth: undefined
+
+  # hooks is configuration sugar
+  # the before:grid:render trigger
+  # will automatically fire the
+  # beforeGridRender function
   hooks:[
-    "before:grid:render",
-    "before:render:header",
-    "before:render:row",
-    "after:grid:render",
-    "row:double:click",
-    "row:click",
+    "before:grid:render"
+    "before:render:header"
+    "before:render:row"
+    "after:grid:render"
+    "row:double:click"
+    "row:click"
     "after:collection:load"
   ]
 
-  rowClass: "luca-ui-g-row"
-
   initialize: (@options={})->
     _.extend @, @options
     _.extend @, Luca.modules.Deferrable
 
     Luca.View::initialize.apply( @, arguments )
 
-    _.bindAll @, "double_click_handler", "click_handler"
-
     @configure_collection()
 
     @collection.bind "reset", (collection) =>
       @refresh()
       @trigger "after:collection:load", collection
 
+    # if a model changes, then we will update the row's contents
+    # by rerendering that row's cells
+    @collection.bind "change", (model)=>
+      rowEl = @getRowEl( model.id || model.get('id') || model.cid )
+      cells = @render_row(model, @indexOf(model), cellsOnly: true )
+      $( rowEl ).html( cells )
+
   beforeRender: ()->
     @trigger "before:grid:render", @
 
-    @$el.addClass 'scrollable-g-view' if @scrollable
-
     @$el.html Luca.templates["components/grid_view"]()
 
-    @table  = $('table.luca-ui-g-view', @el)
-    @header = $("thead", @table)
-    @body   = $("tbody", @table)
-    @footer = $("tfoot", @table)
+    @table      = @$ 'table.luca-ui-g-view'
+    @header     = @$ "thead"
+    @body       = @$ "tbody"
+    @footer     = @$ "tfoot"
+    @wrapper    = @$ ".#{ @wrapperClass }"
 
-    if Luca.enableBootstrap
-      @table.addClass('table')
-
-    _( @tableStyle?.split(" ") ).each (style)=>
-      @table.addClass("table-#{ style }")
+    @applyCssClasses()
 
     @setDimensions() if @scrollable
 
@@ -69,6 +95,18 @@ Luca.components.GridView = Luca.View.extend
 
     $(@container).append @$el
 
+  applyCssClasses: ()->
+    @$el.addClass 'scrollable-g-view' if @scrollable
+
+    _( @additionalWrapperClasses ).each (containerClass)=>
+      @wrapper?.addClass( containerClass )
+
+    if Luca.enableBootstrap
+      @table.addClass('table')
+
+    _( @tableStyle?.split(" ") ).each (style)=>
+      @table.addClass("table-#{ style }")
+
   toolbarContainers:(position="bottom")->
     $(".toolbar-container.#{ position }", @el)
 
@@ -78,24 +116,21 @@ Luca.components.GridView = Luca.View.extend
       toolbar.container = @toolbarContainers( toolbar.position )
       toolbar.render()
 
-  defaultWidth: 756
-  defaultHeight: 285
-
   setDimensions: (offset)->
     @height ||= @defaultHeight
 
-    $('.luca-ui-g-view-body', @el).height( @height )
-    $('tbody.scrollable', @el).height( @height - 23 )
+    @$('.luca-ui-g-view-body').height( @height )
+    @$('tbody.scrollable').height( @height - 23 )
 
     @container_width = do => $(@container).width()
 
-    @width = if @container_width > 0 then @container_width else @defaultWidth
-    @width = _([@width, (@maxWidth || @width)]).max()
+    @width ||= if @container_width > 0 then @container_width else @defaultWidth
 
-    #@width += offset if offset
+    # don't let the grid outgrow its maxWidth
+    @width = _([@width, (@maxWidth || @width)]).max()
 
-    $('.luca-ui-g-view-body', @el).width( @width )
-    $('.luca-ui-g-view-body table', @el).width( @width )
+    @$('.luca-ui-g-view-body').width @width
+    @$('.luca-ui-g-view-body table').width @width
 
     @setDefaultColumnWidths()
 
@@ -103,8 +138,8 @@ Luca.components.GridView = Luca.View.extend
     difference = newWidth - @width
     @width = newWidth
 
-    $('.luca-ui-g-view-body', @el).width( @width )
-    $('.luca-ui-g-view-body table', @el).width( @width )
+    @$('.luca-ui-g-view-body').width( @width )
+    @$('.luca-ui-g-view-body table').width( @width )
 
     if @columns.length > 0
       distribution = difference / @columns.length
@@ -131,7 +166,6 @@ Luca.components.GridView = Luca.View.extend
 
     @padLastColumn()
 
-
   lastColumn: ()->
     @columns[ @columns.length - 1 ]
 
@@ -175,7 +209,7 @@ Luca.components.GridView = Luca.View.extend
   getRowEl: (id)->
     @$ "[data-record-id=#{ id }]", 'table'
 
-  render_row: (row,row_index)->
+  render_row: (row,row_index, options={})->
     rowClass = @rowClass
 
     model_id = if row?.get and row?.attributes then row.get('id') else ''
@@ -190,11 +224,17 @@ Luca.components.GridView = Luca.View.extend
 
       "<td style='#{ style }' class='column-#{ col_index }'>#{ display }</td>"
 
+    return cells if options.cellsOnly
+
     altClass = ''
     if @alternateRowClasses
       altClass = if row_index % 2 is 0 then "even" else "odd"
 
-    @body?.append("<tr data-record-id='#{ model_id }' data-row-index='#{ row_index }' class='#{ rowClass } #{ altClass }' id='row-#{ row_index }'>#{ cells }</tr>")
+    content = "<tr data-record-id='#{ model_id }' data-row-index='#{ row_index }' class='#{ rowClass } #{ altClass }' id='row-#{ row_index }'>#{ cells }</tr>"
+
+    return content if options.contentOnly is true
+
+    @body?.append(content)
 
   cell_renderer: (row, column, columnIndex )->
     if _.isFunction column.renderer
@@ -218,6 +258,4 @@ Luca.components.GridView = Luca.View.extend
     @trigger "row:click", @, record, rowIndex
 
     $(".#{ @rowClass }", @body ).removeClass('selected-row')
-    me.addClass('selected-row')
-
-Luca.register "grid_view","Luca.components.GridView"
+    me.addClass('selected-row')

data/src/components/record_manager.coffee

@@ -1,6 +1,6 @@
 # The RecordManager is a high level component which incorporates
 # a filterable grid, and an editor form responsible for editing
-# the records in that grid. 
+# the records in that grid.
 #
 # it provides convenience methods for accesing those components.
 #
@@ -8,9 +8,8 @@
 # which work together.  inter-component communication should be handled
 # by parent containers, and not individual components, which should
 # usually not be aware of other components.
-
-# Work in progress
-Luca.components.RecordManager = Luca.containers.CardView.extend
+_.component('Luca.components.RecordManager')
+.extend('Luca.containers.CardView').with
 
   events:
     "click .record-manager-grid .edit-link" : "edit_handler"
@@ -19,12 +18,12 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
     "click .add-button" : "add_handler"
     "click .refresh-button" : "filter_handler"
     "click .back-to-search-button" : "back_to_search_handler"
-  
+
   record_manager: true
 
   initialize: (@options={})->
     Luca.containers.CardView::initialize.apply @, arguments
-    
+
     throw "Record Managers must specify a name" unless @name
 
     _.bindAll @, "add_handler", "edit_handler", "filter_handler", "reset_filter_handler"
@@ -32,7 +31,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
     _.extend @components[0][0], @filterConfig if @filterConfig
     _.extend @components[0][1], @gridConfig if @gridConfig
     _.extend @components[1][0], @editorConfig if @editorConfig
-  
+
     @bind "after:card:switch", () =>
       @trigger("activation:search", @) if @activeCard is 0
       @trigger("activation:editor", @) if @activeCard is 1
@@ -47,7 +46,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
     ]
   ,
     ctype: 'form_view'
-  ]   
+  ]
 
   getSearch: (activate=false, reset=true)->
     @activate(0) if activate is true
@@ -74,7 +73,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
   beforeRender: ()->
     @$el.addClass("#{ @resource }-manager")
     Luca.containers.CardView::beforeRender?.apply @, arguments
-    
+
     @$el.addClass("#{ @resource } record-manager")
     @$el.data('resource', @resource)
 
@@ -87,18 +86,18 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
   # components are responsible for component communication.
   #
   # child components should not be aware of other components
-  # in the layout.  Their parents should be responsible for 
+  # in the layout.  Their parents should be responsible for
   # controlling how they interact.  listening to events on one,
   # changing state, inducing effects in the others
   afterRender: ()->
-    Luca.containers.CardView::afterRender?.apply @, arguments 
+    Luca.containers.CardView::afterRender?.apply @, arguments
 
     manager = @
     grid = @getGrid()
     filter = @getFilter()
     editor = @getEditor()
     collection = @getCollection()
-   
+
     # when a row is double clicked on the grid
     # then we edit that row
     grid.bind "row:double:click", (grid,model,index)->
@@ -111,7 +110,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
 
     editor.bind "after:submit", ()=>
       $('.form-view-body', @el).spin(false)
-    
+
     editor.bind "after:submit:fatal_error", ()=>
       $('.form-view-flash-container', @el ).append "<li class='error'>There was an internal server error saving this record.  Please contact developers@benchprep.com to report this error.</li>"
       $('.form-view-body', @el).spin(false)
@@ -119,10 +118,10 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
     editor.bind "after:submit:error", (form, model, response)=>
       _( response.errors ).each (error)=>
         $('.form-view-flash-container', @el ).append "<li class='error'>#{ error }</li>"
-    
+
     editor.bind "after:submit:success", (form, model, response)=>
       $('.form-view-flash-container', @el).append "<li class='success'>Successfully Saved Record</li>"
-      
+
       model.set( response.result )
       form.loadModel( model )
 
@@ -132,13 +131,13 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
         $('.form-view-flash-container li.success', @el).fadeOut(1000)
         $('.form-view-flash-container', @el).html('')
       , 4000
-    
+
     filter.eachComponent (component)=>
       try
         component.bind "on:change", @filter_handler
       catch e
         undefined
-  
+
   firstActivation: ()->
     @getGrid().trigger "first:activation", @, @getGrid()
     @getFilter().trigger "first:activation", @, @getGrid()
@@ -149,16 +148,16 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
     grid = @getGrid()
     filter = @getFilter()
     editor = @getEditor()
-    
+
     # refresh the select fields in the filter
     filter.clear()
 
     grid.applyFilter()
-  
+
   manageRecord: (record_id)->
     model = @getCollection().get(record_id)
     return @loadModel(model) if model
-    
+
     console.log "Could Not Find Model, building and fetching"
 
     model = @buildModel()
@@ -186,7 +185,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
   createModel: ()->
     @loadModel(@buildModel())
 
-  ##### DOM Event Handlers 
+  ##### DOM Event Handlers
   reset_filter_handler: (e)->
     @getFilter().clear()
     @getGrid().applyFilter( @getFilter().getValues() )
@@ -197,7 +196,7 @@ Luca.components.RecordManager = Luca.containers.CardView.extend
   edit_handler: (e)->
     me = my = $( e.currentTarget )
     record_id = my.parents('tr').data('record-id')
-  
+
     if record_id
       model = @getGrid().collection.get( record_id )
 

data/src/components/template.coffee

@@ -1,4 +1,7 @@
-Luca.components.Template = Luca.View.extend
+_.component('Luca.components.Template').extends('Luca.View').with
+
+  templateContainer: "Luca.templates"
+
   initialize: (@options={})->
     Luca.View::initialize.apply @, arguments
     throw "Templates must specify which template / markup to use" unless @template or @markup
@@ -6,14 +9,9 @@ Luca.components.Template = Luca.View.extend
     if _.isString(@templateContainer)
       @templateContainer = eval("(window || global).#{ @templateContainer }")
 
-  templateContainer: "Luca.templates"
-
   beforeRender: ()->
-    @templateContainer = JST if _.isUndefined( @templateContainer) 
+    @templateContainer = JST if _.isUndefined( @templateContainer)
     @$el.html(@markup || @templateContainer[ @template ](@options) )
 
   render: ()->
-    $(@container).append( @$el )
-
-
-Luca.register "template", "Luca.components.Template"
+    $(@container).append( @$el )

data/src/containers/card_view.coffee

@@ -1,4 +1,4 @@
-Luca.containers.CardView = Luca.core.Container.extend
+_.component("Luca.containers.CardView").extends("Luca.core.Container").with
   componentType: 'card_view'
 
   className: 'luca-ui-card-view-wrapper'
@@ -88,6 +88,4 @@ Luca.containers.CardView = Luca.core.Container.extend
 
 
     if _.isFunction(callback)
-      callback.apply @, [@,previous,current]
-
-Luca.register 'card_view', "Luca.containers.CardView"
+      callback.apply @, [@,previous,current]

data/src/containers/column_view.coffee

@@ -1,4 +1,4 @@
-Luca.containers.ColumnView = Luca.core.Container.extend
+_.component('Luca.containers.ColumnView').extends('Luca.core.Container').with
   componentType: 'column_view'
 
   className: 'luca-ui-column-view'
@@ -8,34 +8,34 @@ Luca.containers.ColumnView = Luca.core.Container.extend
   initialize: (@options={})->
     Luca.core.Container::initialize.apply @, arguments
     @setColumnWidths()
-  
+
   componentClass: 'luca-ui-column'
 
   containerTemplate: "containers/basic"
 
   appendContainers: true
 
-  autoColumnWidths: ()-> 
+  autoColumnWidths: ()->
     widths = []
 
-    _( @components.length ).times ()=> 
+    _( @components.length ).times ()=>
       widths.push( parseInt( 100 / @components.length ) )
 
     widths
 
   setColumnWidths: ()->
-    @columnWidths = if @layout? 
-      _( @layout.split('/') ).map((v)-> parseInt(v) ) 
-    else 
+    @columnWidths = if @layout?
+      _( @layout.split('/') ).map((v)-> parseInt(v) )
+    else
       @autoColumnWidths()
 
     @columnWidths = _( @columnWidths ).map (val)-> "#{ val }%"
-  
+
   beforeComponents: ()->
     @debug "column_view before components"
     _( @components ).each (component)->
       component.ctype ||= "panel_view"
-  
+
   beforeLayout: ()->
     @debug "column_view before layout"
 
@@ -43,6 +43,4 @@ Luca.containers.ColumnView = Luca.core.Container.extend
       @components[index].float = "left"
       @components[index].width = width
 
-    Luca.core.Container::beforeLayout?.apply @, arguments
-
-Luca.register 'column_view', "Luca.containers.ColumnView"
+    Luca.core.Container::beforeLayout?.apply @, arguments

data/src/containers/modal_view.coffee

@@ -1,4 +1,4 @@
-Luca.containers.ModalView = Luca.core.Container.extend 
+_.component('Luca.containers.ModalView').extends('Luca.core.Container').with
   componentType: 'modal_view'
 
   className: 'luca-ui-modal-view'
@@ -22,18 +22,18 @@ Luca.containers.ModalView = Luca.core.Container.extend
     opacity: 80
     onOpen: (modal)->
       @onOpen.apply @
-      @onModalOpen.apply modal, [modal, @] 
-    onClose: (modal)-> 
+      @onModalOpen.apply modal, [modal, @]
+    onClose: (modal)->
       @onClose.apply @
       @onModalClose.apply modal, [modal, @]
-  
+
   modalOptions: {}
 
   initialize: (@options={})->
     Luca.core.Container::initialize.apply @,arguments
     @setupHooks(@hooks)
 
-    _( @defaultModalOptions ).each (value,setting) => @modalOptions[ setting ] ||= value 
+    _( @defaultModalOptions ).each (value,setting) => @modalOptions[ setting ] ||= value
 
     @modalOptions.onOpen = _.bind( @modalOptions.onOpen, @)
     @modalOptions.onClose = _.bind( @modalOptions.onClose, @)
@@ -66,7 +66,7 @@ Luca.containers.ModalView = Luca.core.Container.extend
       object.container =  @el
       object
 
-  afterInitialize: ()-> 
+  afterInitialize: ()->
     @$el.hide()
     @render() if @renderOnInitialize
 
@@ -80,6 +80,4 @@ Luca.containers.ModalView = Luca.core.Container.extend
     @$el.modal( @modalOptions )
 
   hide: ()->
-    @trigger "before:hide", @
-
-Luca.register "modal_view","Luca.containers.ModalView"
+    @trigger "before:hide", @

data/src/containers/panel_view.coffee

@@ -1,13 +1,13 @@
-Luca.containers.PanelView = Luca.core.Container.extend
+_.component('Luca.containers.PanelView').extends('Luca.core.Container').with
   className: 'luca-ui-panel'
 
   initialize: (@options={})->
     Luca.core.Container::initialize.apply @, arguments
-  
+
   afterLayout: ()->
     if @template
       contents = ( Luca.templates || JST )[ @template ]( @ )
-      @$el.html(contents) 
+      @$el.html(contents)
 
   render: ()->
     $(@container).append @$el
@@ -19,5 +19,5 @@ Luca.containers.PanelView = Luca.core.Container.extend
         @$el.css(property,value)
 
 
-    
+
 

data/src/containers/split_view.coffee

@@ -1,12 +1,10 @@
-Luca.containers.SplitView = Luca.core.Container.extend 
+_.component('Luca.containers.SplitView').extends('Luca.core.Container').with
   layout: '100'
 
   componentType: 'split_view'
 
   containerTemplate: 'containers/basic'
 
-  className: 'luca-ui-split-view' 
-  
-  componentClass: 'luca-ui-panel'
+  className: 'luca-ui-split-view'
 
-Luca.register 'split_view', "Luca.containers.SplitView"
+  componentClass: 'luca-ui-panel'

data/src/containers/tab_view.coffee

@@ -1,4 +1,5 @@
-Luca.containers.TabView = Luca.containers.CardView.extend
+_.component('Luca.containers.TabView').extends('Luca.containers.CardView').with
+
   events:
     "click ul.nav-tabs li" : "select"
 
@@ -23,7 +24,7 @@ Luca.containers.TabView = Luca.containers.CardView.extend
     @bind "after:card:switch", @highlightSelectedTab
 
   activeTabSelector: ()->
-    @tabSelectors().eq( @activeCard )
+    @tabSelectors().eq( @activeCard || @activeTab || @activeItem )
 
   prepareLayout: ()->
     @card_containers = _( @cards ).map (card, index)=>

data/src/containers/viewport.coffee

@@ -1,4 +1,5 @@
-Luca.containers.Viewport = Luca.containers.CardView.extend
+_.component('Luca.containers.Viewport').extend('Luca.containers.CardView').with
+
   activeItem: 0
 
   className: 'luca-ui-viewport'
@@ -7,10 +8,8 @@ Luca.containers.Viewport = Luca.containers.CardView.extend
 
   initialize: (@options={})->
     Luca.core.Container::initialize.apply(@, arguments)
-
     $('html,body').addClass('luca-ui-fullscreen') if @fullscreen
 
   render: ()->
-    console.log "Rendering Viewport"
     @$el.addClass('luca-ui-viewport')