luca 0.9.65 → 0.9.76

data/src/components/controller.coffee

@@ -1,28 +1,87 @@
-_.def('Luca.components.Controller').extends('Luca.containers.CardView').with
+controller = Luca.register        "Luca.components.Controller"
+controller.extends                "Luca.containers.CardView"
 
-  additionalClassNames:['luca-ui-controller']
+controller.publicInterface
+  default: (callback)->
+    @navigate_to(@defaultPage || @defaultCard, callback)
+
+  activePage: ()-> 
+    @activeSection()
 
+  # switch the active card of this controller
+  # optionally passing an onActivation callback
+  # will fire this callback in the context of
+  # the currently active card
+  navigate_to: (section, callback)->
+    section ||= @defaultCard
+
+    # activate is a method on Luca.containers.CardView which
+    # selects a component and makes it visible, hiding any
+    # other component which may be monopolizing the view at that time.
+
+    # after activation it triggers a after:card:switch event
+    # and if it is the first time that view is being activated,
+    # it triggers a first:activation event which gets relayed to all
+    # child components in that view
+    @activate section, false, (activator, previous,current)=>
+      @state.set(active_section: current.name )
+      if _.isFunction( callback )
+        callback.apply(current)
+
+    # return the section we are navigating to
+    @find(section)
+
+controller.classMethods
+  controllerPath: ()->
+    component = @
+    
+    list = [component.name]
+    atBase = false
+
+    while component and not atBase
+      component = component.getParent?()
+      atBase = true if component?.role is "main_controller"
+      list.push( component.name ) if component? and not atBase
+
+    list.reverse()
+
+controller.defines
+  additionalClassNames: 'luca-ui-controller'
   activeAttribute: "active-section"
+  stateful: true
 
   initialize: (@options)->
-    Luca.containers.CardView::initialize.apply @, arguments
+    # let's phase out the 'card' terminology 
+    # and 'section' while we're at it.  page is the word.
+    @defaultCard ||= @defaultPage ||= @components[0]?.name || 0
+    @defaultPage ||= @defaultCard 
 
-    @defaultCard ||= @components[0]?.name
+    @defaultState ||= 
+      active_section: @defaultPage
 
-    throw "Controllers must specify a defaultCard property and/or the first component must have a name" unless @defaultCard
+    Luca.containers.CardView::initialize.apply @, arguments
+
+    throw "Controllers must specify a defaultCard property and/or the first component must have a name" unless @defaultCard?
 
-    @state = new Backbone.Model 
-      active_section: @defaultCard
+    @_().each (component)->
+      component.controllerPath = Luca.components.Controller.controllerPath
 
   each: (fn)->
-    _( @components ).each (component)=>
-      fn.apply @, [component]
+    _( @components ).each (component)=> fn.call(@,component)
 
   activeSection: ()->
-    @get("activeSection")
+    @get("active_section")
+
+  pageControllers: (deep=false)->
+    @controllers.apply(@, arguments)
 
   controllers:(deep=false)->
-    @select 'ctype', 'controller', deep
+    @select (component)->
+      type = (component.type || component.ctype) 
+      type is "controller" or type is "page_controller"
+
+  availablePages: ()->
+    @availableSections.apply(@, arguments)    
 
   availableSections: ()->
     base = {}
@@ -33,31 +92,10 @@ _.def('Luca.components.Controller').extends('Luca.containers.CardView').with
       memo
     , base 
 
+  pageNames: ()->
+    @sectionNames()
+
   sectionNames: (deep=false)->
     @pluck('name')
 
-  default: (callback)->
-    @navigate_to(@defaultCard, callback)
-
-  # switch the active card of this controller
-  # optionally passing an onActivation callback
-  # will fire this callback in the context of
-  # the currently active card
-  navigate_to: (section, callback)->
-    section ||= @defaultCard
-
-    # activate is a method on Luca.containers.CardView which
-    # selects a component and makes it visible, hiding any
-    # other component which may be monopolizing the view at that time.
-
-    # after activation it triggers a after:card:switch event
-    # and if it is the first time that view is being activated,
-    # it triggers a first:activation event which gets relayed to all
-    # child components in that view
-    @activate section, false, (activator, previous,current)=>
-      @state.set(active_section: current.name )
-      if _.isFunction( callback )
-        callback.apply(current)
 
-    # return the section we are navigating to
-    @find(section)

data/src/components/fields/button_field.coffee

@@ -1,18 +1,24 @@
-_.def('Luca.fields.ButtonField').extends('Luca.core.Field').with
+buttonField = Luca.register         "Luca.fields.ButtonField"
 
-  readOnly: true
+buttonField.extends                 "Luca.core.Field"
 
-  events:
-    "click input" : "click_handler"
-
-  hooks:[
-    "button:click"
-  ]
+buttonField.triggers                "button:click"
 
-  className: 'luca-ui-field luca-ui-button-field'
+buttonField.publicConfiguration
+  readOnly:     true
+  input_value:  undefined 
+  input_type:   "button" 
+  icon_class:   undefined
+  input_name:   undefined
+  white:        undefined
 
-  template: 'fields/button_field'
+buttonField.privateConfiguration
+  isButton: true
+  template: "fields/button_field"
+  events:
+    "click input" : "click_handler"
 
+buttonField.privateInterface
   click_handler: (e)->
     me = my = $( e.currentTarget )
     @trigger "button:click"
@@ -29,10 +35,12 @@ _.def('Luca.fields.ButtonField').extends('Luca.core.Field').with
     @input_id ||= _.uniqueId('button')
     @input_name ||= @name ||= @input_id
     @input_value ||= @label ||= @text
-    @input_type ||= "button"
     @input_class ||= @class
     @icon_class ||= ""
     @icon_class = "icon-#{ @icon_class }" if @icon_class.length and !@icon_class.match(/^icon-/)
     @icon_class += " icon-white" if @white
 
-  setValue: ()-> true
+  setValue: ()-> true
+
+buttonField.defines
+  version: 1

data/src/components/fields/checkbox_array.coffee

@@ -1,6 +1,9 @@
 make = Luca.View::make
 
-_.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
+checkboxArray = Luca.register     "Luca.fields.CheckboxArray"
+checkboxArray.extends             "Luca.core.Field"
+
+checkboxArray.defines
   version: 2
 
   template: "fields/checkbox_array"
@@ -14,7 +17,7 @@ _.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
 
   initialize: (@options={})->
     _.extend @, @options
-    _.extend @, Luca.modules.Deferrable
+    _.extend @, Luca.concerns.Deferrable
     _.bindAll @, "renderCheckboxes", "clickHandler", "checkSelected"
 
     Luca.core.Field::initialize.apply @, arguments
@@ -33,6 +36,9 @@ _.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
 
     cbArray = @
 
+    unless Luca.isBackboneCollection(@collection)
+      throw "Checkbox Array Fields must specify a @collection property"
+      
     if @collection.length > 0
       @renderCheckboxes()
     else

data/src/components/fields/checkbox_field.coffee

@@ -1,13 +1,20 @@
-_.def('Luca.fields.CheckboxField').extends('Luca.core.Field').with
+checkboxField = Luca.register         "Luca.fields.CheckboxField"
 
-  events:
-    "change input" : "change_handler"
+checkboxField.extends                 "Luca.core.Field"
 
-  className: 'luca-ui-checkbox-field luca-ui-field'
-  template: 'fields/checkbox_field'
-  hooks: ["checked","unchecked"]
+checkboxField.triggers                "checked",
+                                      "unchecked"
+
+checkboxField.publicConfiguration
   send_blanks: true
+  input_value: 1
 
+checkboxField.privateConfiguration
+  template: 'fields/checkbox_field'
+  events:
+    "change input" : "change_handler"
+
+checkboxField.privateInterface
   change_handler: (e)->
     me = my = $(e.target)
 
@@ -24,14 +31,16 @@ _.def('Luca.fields.CheckboxField').extends('Luca.core.Field').with
 
     Luca.core.Field::initialize.apply @, arguments
 
-  afterInitialize: ()->
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name
-    @input_value ||= 1
     @label ||= @name
 
+checkboxField.publicInterface
   setValue: (checked)->
     @getInputElement().attr('checked', checked)
 
   getValue:()->
-    @getInputElement().is(":checked")
+    @getInputElement().is(":checked")
+
+checkboxField.defines
+  version: 1

data/src/components/fields/file_upload_field.coffee

@@ -1,4 +1,8 @@
-_.def('Luca.fields.FileUploadField').extends('Luca.core.Field').with
+fileUpload = Luca.register              "Luca.fields.FileUploadField"
+fileUpload.extends                      "Luca.core.Field"
+
+fileUpload.defines
+  version: 1
 
   template: 'fields/file_upload_field'
 

data/src/components/fields/hidden_field.coffee

@@ -1,5 +1,7 @@
-_.def('Luca.fields.HiddenField').extends('Luca.core.Field').with
+hiddenField = Luca.register       "Luca.fields.HiddenField"
+hiddenField.extends               "Luca.core.Field"
 
+hiddenField.defines
   template: 'fields/hidden_field'
 
   afterInitialize: ()->

data/src/components/fields/label_field.coffee

@@ -1,6 +1,7 @@
-_.def("Luca.components.LabelField").extends("Luca.core.Field").with
-  className: "luca-ui-field luca-ui-label-field"
-    
+labelField = Luca.register          "Luca.components.LabelField"
+labelField.extends                  "Luca.core.Field"
+
+labelField.defines
   formatter: (value)->
     value ||= @getValue()
     _.str.titleize( value )

data/src/components/fields/select_field.coffee

@@ -1,13 +1,12 @@
-_.def('Luca.fields.SelectField').extends('Luca.core.Field').with
+selectField = Luca.register   "Luca.fields.SelectField"
 
-  events:
-    "change select" : "change_handler"
+selectField.extends           "Luca.core.Field"
 
-  hooks:[
-    "after:select"
-  ]
+selectField.triggers          "after:select"
 
-  className: 'luca-ui-select-field luca-ui-field'
+selectField.defines
+  events:
+    "change select" : "change_handler"
 
   template: "fields/select_field"
 
@@ -19,7 +18,7 @@ _.def('Luca.fields.SelectField').extends('Luca.core.Field').with
 
   initialize: (@options={})->
     _.extend @, @options
-    _.extend @, Luca.modules.Deferrable
+    _.extend @, Luca.concerns.Deferrable
     _.bindAll @, "change_handler", "populateOptions", "beforeFetch"
 
     Luca.core.Field::initialize.apply @, arguments

data/src/components/fields/text_area_field.coffee

@@ -13,14 +13,15 @@ _.def('Luca.fields.TextAreaField').extends('Luca.core.Field').with
   initialize: (@options={})->
     _.bindAll @, "keydown_handler"
 
-    Luca.core.Field::initialize.apply @, arguments
-
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name
     @label ||= @name
     @input_class ||= @class
     @input_value ||= ""
     @inputStyles ||= "height:#{ @height };width:#{ @width }"
+    @placeHolder ||= ""
+
+    Luca.core.Field::initialize.apply @, arguments
 
   setValue: (value)->
     $( @field() ).val(value)

data/src/components/fields/text_field.coffee

@@ -1,5 +1,7 @@
+textField = Luca.register     'Luca.fields.TextField'
+textField.extends             'Luca.core.Field'
 
-_.def('Luca.fields.TextField').extends('Luca.core.Field').with
+textField.defines
   events:
     "blur input" : "blur_handler"
     "focus input" : "focus_handler"
@@ -22,9 +24,6 @@ _.def('Luca.fields.TextField').extends('Luca.core.Field').with
     @label ||= @name
     @input_class ||= @class
     @input_value ||= @value || "" 
-
-    # TODO
-    # Placeholder?
     
     if @prepend
       @$el.addClass('input-prepend')
@@ -34,6 +33,8 @@ _.def('Luca.fields.TextField').extends('Luca.core.Field').with
       @$el.addClass('input-append')
       @addOn = @append
 
+    @placeHolder ||= ""
+
     Luca.core.Field::initialize.apply @, arguments
 
   keyup_handler: (e)->

data/src/components/fields/type_ahead_field.coffee

@@ -1,6 +1,8 @@
-_.def('Luca.fields.TypeAheadField').extends('Luca.fields.TextField').with
-  className: 'luca-ui-field'
+typeAheadField = Luca.register      "Luca.fields.TypeAheadField"
+typeAheadField.extends              "Luca.fields.TextField" 
 
+
+typeAheadField.defines
   getSource: ()->
     Luca.util.read(@source) || []
 

data/src/components/form_button_toolbar.coffee

@@ -1,5 +1,7 @@
-_.def('Luca.components.FormButtonToolbar').extends('Luca.components.Toolbar').with
+toolbar = Luca.register         "Luca.components.FormButtonToolbar"
+toolbar.extends                 "Luca.components.Toolbar"
 
+toolbar.defines
   className: 'luca-ui-form-toolbar form-actions'
 
   position: 'bottom'
@@ -8,6 +10,7 @@ _.def('Luca.components.FormButtonToolbar').extends('Luca.components.Toolbar').wi
 
   render: ()->
     $(@container).append(@el)
+    @
 
   initialize: (@options={})->
     Luca.components.Toolbar.prototype.initialize.apply @, arguments

data/src/components/form_view.coffee

@@ -1,25 +1,28 @@
-_.def("Luca.components.FormView").extends('Luca.core.Container').with
-
+#_.def("Luca.components.FormView").extends('Luca.core.Container').with
+
+formView = Luca.register        "Luca.components.FormView"
+formView.extends                "Luca.core.Container"
+
+formView.triggers               "before:submit",
+                                "before:reset",
+                                "before:load",
+                                "before:load:new",
+                                "before:load:existing",
+                                "after:submit",
+                                "after:reset",
+                                "after:load",
+                                "after:load:new",
+                                "after:load:existing",
+                                "after:submit:success",
+                                "after:submit:fatal_error",
+                                "after:submit:error"
+
+
+formView.defines
   tagName: 'form'
 
   className: 'luca-ui-form-view'
 
-  hooks:[
-    "before:submit"
-    "before:reset"
-    "before:load"
-    "before:load:new"
-    "before:load:existing"
-    "after:submit"
-    "after:reset"
-    "after:load"
-    "after:load:new"
-    "after:load:existing"
-    "after:submit:success"
-    "after:submit:fatal_error"
-    "after:submit:error"
-  ]
-
   events:
     "click .submit-button" : "submitHandler"
     "click .reset-button" : "resetHandler"
@@ -30,17 +33,16 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
   bodyClassName: "form-view-body"
 
-  version: "0.9.33333333"
+  version: 1 
 
   initialize: (@options={})->
-    @loadMask = Luca.enableBootstrap unless @loadMask?
+    @loadMask = Luca.config.enableBoostrap unless @loadMask?
 
     Luca.core.Container::initialize.apply @, arguments
 
     @components ||= @fields
 
-    _.bindAll @, "submitHandler", "resetHandler", "renderToolbars", "applyLoadMask"
-
+    _.bindAll @, "submitHandler", "resetHandler", "renderToolbars"
     @state ||= new Backbone.Model
 
     @setupHooks( @hooks )
@@ -55,7 +57,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
     Luca.components.FormView.defaultFormViewToolbar
 
   applyStyleClasses: ()->
-    if Luca.enableBootstrap
+    if Luca.config.enableBoostrap
       @applyBootstrapStyleClasses()
 
     @$el.addClass( "label-align-#{ @labelAlign }") if @labelAlign
@@ -181,7 +183,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
       if options.debug
         console.log "#{ key } Options", options, "Value", value, "Value Is Blank?", valueIsBlank, "Allow Blanks?", allowBlankValues
 
-      if options.skip_buttons and field.ctype is "button_field"
+      if options.skip_buttons and field.isButton
         skip = true
       else
         if valueIsBlank and allowBlankValues is false