tao_form 0.1.9 → 0.1.10

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/element/base.coffee

@@ -1,42 +1,51 @@
-
 class Tao.Form.MomentPicker.ElementBase extends TaoComponent
 
   @attribute 'valueFormat', 'displayFormat'
 
   @attribute 'active', 'disabled', type: 'boolean', observe: true
 
-  _connected: ->
-    @result = @findComponent 'tao-moment-picker-result', =>
-      @field = @result.field
-      @result.format = @displayFormat
-      @setMoment @field.val()
-      @trigger 'tao:ready'
-    @segmentList = @findComponent 'tao-moment-picker-segment-list'
+  @get 'value', ->
+    @field?.val()
 
+  @set 'value', (val) ->
+    @setMoment val
+
+  _connected: ->
+    [@result, @segmentList] = @findComponent(
+      '.tao-moment-picker-result',
+      '.tao-moment-picker-segment-list',
+      @_childComponentsReady.bind(@)
+    )
     @_bind()
 
   _disconnected: ->
     @off()
 
   _bind: ->
-    @on 'tao:activeClick', 'tao-moment-picker-result', (e) =>
+    @on 'tao:activeClick', '.tao-moment-picker-result', (e) =>
       return if @disabled
       @_toggleActive()
       null
 
-    @on 'tao:clear', 'tao-moment-picker-result', (e) =>
+    @on 'tao:clear', '.tao-moment-picker-result', (e) =>
       return if @disabled
       @active = false
       @setMoment null
-      @trigger 'tao:change', [@moment]
+      @namespacedTrigger 'change', [@moment]
       null
 
-    @on 'tao:select', 'tao-moment-picker-segment-list', (e, m) =>
+    @on 'tao:select', '.tao-moment-picker-segment-list', (e, m) =>
       @active = false
       @setMoment m
-      @trigger 'tao:change', [@moment]
+      @namespacedTrigger 'change', [@moment]
       null
 
+  _childComponentsReady: ->
+    @field = @result.field
+    @result.format = @displayFormat
+    @setMoment @field.val()
+    @namespacedTrigger 'ready'
+
   _toggleActive: ->
     @active = !@active
 
@@ -51,3 +60,11 @@ class Tao.Form.MomentPicker.ElementBase extends TaoComponent
       @field.val ''
       @moment = null
     @moment
+
+  disableBefore: (m) ->
+    @segmentList.segments.forEach (segment) ->
+      segment.disableBefore = m
+
+  disableAfter: (m) ->
+    @segmentList.segments.forEach (segment) ->
+      segment.disableAfter = m

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/result/base.coffee

@@ -18,12 +18,12 @@ class Tao.Form.MomentPicker.ResultBase extends TaoComponent
 
   _bind: ->
     @on 'click', 'input', =>
-      @trigger 'tao:activeClick'
+      @namespacedTrigger 'activeClick'
       false
 
     @on 'click', (e) =>
       return if @disabled
-      @trigger 'tao:activeClick'
+      @namespacedTrigger 'activeClick'
 
   clear: ->
     @moment = null

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segment_list/base.coffee

@@ -6,7 +6,7 @@ class Tao.Form.MomentPicker.SegmentListBase extends TaoComponent
   @attribute 'defaultSegment'
 
   _connected: ->
-    @segments = @jq.find('.segment').get()
+    @segments = @jq.find('.tao-moment-picker-segment').get()
     @momentData = null
 
     @_bind()
@@ -20,11 +20,11 @@ class Tao.Form.MomentPicker.SegmentListBase extends TaoComponent
       @_setActiveSegment segment
       null
 
-    @on 'tao:dataSelect', '.segment', (e, momentData) =>
+    @on 'tao:dataSelect', '.tao-moment-picker-segment', (e, momentData) =>
       @_setMomentData momentData
       @_activateNextSegment()
 
-    @on 'tao:dataRefresh', '.segment', (e, momentData) =>
+    @on 'tao:dataRefresh', '.tao-moment-picker-segment', (e, momentData) =>
       @_setMomentData momentData
 
   setMoment: (m) ->
@@ -80,9 +80,9 @@ class Tao.Form.MomentPicker.SegmentListBase extends TaoComponent
     if segment
       @_setActiveSegment segment
     else if @activeSegment
-      if ($segment = @activeSegment.jq.next('.segment')).length > 0
+      if ($segment = @activeSegment.jq.next('.tao-moment-picker-segment')).length > 0
         @_setActiveSegment $segment.get(0)
       else
-        @trigger 'tao:select', [moment @momentData]
+        @namespacedTrigger 'select', [moment @momentData]
     else
       @_setActiveSegment @segments[0]

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/base.coffee

@@ -5,6 +5,8 @@ class Tao.Form.MomentPicker.SegmentBase extends TaoComponent
 
   @attribute 'active', type: 'boolean'
 
+  @attribute 'disableBefore', 'disableAfter', type: 'moment', observe: true
+
   segmentName: ''
 
   _connected: ->

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/date_segment.coffee

@@ -21,12 +21,13 @@ class MomentPicker.DateSegment extends MomentPicker.SegmentBase
   _bind: ->
     @on 'click', '.day', (e) =>
       $day = $ e.currentTarget
+      return if $day.hasClass('disabled')
       date = moment $day.data('date'), @dateFormat
       momentData = _.clone @momentData
       momentData.year = date.year()
       momentData.month = date.month()
       momentData.date = date.date()
-      @trigger 'tao:dataSelect', [momentData]
+      @namespacedTrigger 'dataSelect', [momentData]
 
     @on 'click', '.link-prev-month, .link-next-month', (e) =>
       month = if $(e.currentTarget).is('.link-prev-month')
@@ -38,7 +39,7 @@ class MomentPicker.DateSegment extends MomentPicker.SegmentBase
       momentData.year = month.year()
       momentData.month = month.month()
       momentData.date = null
-      @trigger 'tao:dataRefresh', [momentData]
+      @namespacedTrigger 'dataRefresh', [momentData]
 
   setMomentData: (momentData) ->
     if @active && (_.isNil(momentData['year']) || _.isNil(momentData['month']))
@@ -46,7 +47,7 @@ class MomentPicker.DateSegment extends MomentPicker.SegmentBase
       momentData.year = now.year()
       momentData.month = now.month()
       momentData.date = null
-      @trigger 'tao:dataRefresh', [momentData]
+      @namespacedTrigger 'dataRefresh', [momentData]
       return false
     else if @momentData && momentData &&
         momentData['year'] == @momentData['year'] &&
@@ -82,6 +83,9 @@ class MomentPicker.DateSegment extends MomentPicker.SegmentBase
       if startDate.date() == momentData['date'] &&
           startDate.month() == momentData['month']
         $day.addClass('selected')
+      if (@disableBefore && startDate.isSameOrBefore(@disableBefore)) ||
+          (@disableAfter && startDate.isSameOrAfter(@disableAfter))
+        $day.addClass('disabled')
 
       weekdays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
       $day.addClass weekdays[startDate.day()]
@@ -94,5 +98,10 @@ class MomentPicker.DateSegment extends MomentPicker.SegmentBase
       $('<span>', class: 'weekday', text: weekdayName)
         .appendTo $head
 
+  _disableBeforeChanged: ->
+    @_renderCalendar()
+
+  _disableAfterChanged: ->
+    @_renderCalendar()
 
 TaoComponent.register MomentPicker.DateSegment

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/hour_segment.coffee

@@ -13,7 +13,7 @@ class MomentPicker.HourSegment extends MomentPicker.SegmentBase
       $hour = $ e.currentTarget
       momentData = _.clone @momentData
       momentData.hour = $hour.data 'hour'
-      @trigger 'tao:dataSelect', [momentData]
+      @namespacedTrigger 'dataSelect', [momentData]
 
   setMomentData: (momentData) ->
     super

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/minute_segment.coffee

@@ -13,7 +13,7 @@ class MomentPicker.MinuteSegment extends MomentPicker.SegmentBase
       $minute = $ e.currentTarget
       momentData = _.clone @momentData
       momentData.minute = $minute.data 'minute'
-      @trigger 'tao:dataSelect', [momentData]
+      @namespacedTrigger 'dataSelect', [momentData]
 
   setMomentData: (momentData) ->
     super

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/month_segment.coffee

@@ -14,7 +14,7 @@ class MomentPicker.MonthSegment extends MomentPicker.SegmentBase
       momentData = _.clone @momentData
       momentData.month = $month.data 'month'
       momentData.date = null
-      @trigger 'tao:dataSelect', [momentData]
+      @namespacedTrigger 'dataSelect', [momentData]
 
     @on 'click', '.link-prev-year, .link-next-year', (e) =>
       momentData = _.clone @momentData
@@ -23,7 +23,7 @@ class MomentPicker.MonthSegment extends MomentPicker.SegmentBase
       else
         momentData['year'] += 1
       momentData.date = null
-      @trigger 'tao:dataRefresh', [momentData]
+      @namespacedTrigger 'dataRefresh', [momentData]
 
   setMomentData: (momentData) ->
     super

data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/year_segment.coffee

@@ -15,7 +15,7 @@ class MomentPicker.YearSegment extends MomentPicker.SegmentBase
       momentData.year = $year.data 'year'
       momentData.month = null
       momentData.date = null
-      @trigger 'tao:dataSelect', [momentData]
+      @namespacedTrigger 'dataSelect', [momentData]
 
     @on 'click', '.link-prev-years, .link-next-years', (e) =>
       momentData = _.clone @momentData
@@ -25,14 +25,14 @@ class MomentPicker.YearSegment extends MomentPicker.SegmentBase
         momentData['year'] += 9
       momentData.month = null
       momentData.date = null
-      @trigger 'tao:dataRefresh', [momentData]
+      @namespacedTrigger 'dataRefresh', [momentData]
 
   setMomentData: (momentData) ->
     super
 
     if _.isNil @value()
       momentData.year = moment().year()
-      @trigger 'tao:dataRefresh', [momentData]
+      @namespacedTrigger 'dataRefresh', [momentData]
       return false
 
     @_render()

data/lib/assets/javascripts/tao/form/shared/fields/radio.coffee

@@ -9,10 +9,14 @@ class Tao.Form.RadioBase extends TaoComponent
     @_bind()
 
   _bind: ->
+    @on 'change', 'input[type=radio]', (e) =>
+      @namespacedTrigger 'change'
+      null
+
     @on 'click', '.radio-wrapper', (e) =>
       if @field.is(':enabled')
         @_toggleChecked()
-        @trigger 'tao:change'
+        @namespacedTrigger 'change'
       false
 
   _disconnected: ->

data/lib/assets/javascripts/tao/form/shared/fields/select/element/base.coffee

@@ -19,21 +19,19 @@ class Tao.Form.Select.ElementBase extends TaoComponent
 
   _connected: ->
     @field = @jq.find 'select'
-    @selectedOption = if @multiple then [] else null
+    @selectedOption ||= if @multiple then [] else null
 
     @dataProvider = new DataProvider
       remote: @remote
       field: @field
 
-    @result = @findComponent '.select-result', =>
-      @_resultReady()
-
-    @list = @findComponent '.select-list', =>
-      @_listReady()
+    [@result, @list] = @findComponent '.select-result', '.select-list', =>
+      @_childComponentsReady()
+      @namespacedTrigger 'ready'
 
     @_bind()
 
-  _resultReady: ->
+  _childComponentsReady: ->
     if @multiple
       values = @field.val()
       if values && _.isArray(values)
@@ -41,9 +39,7 @@ class Tao.Form.Select.ElementBase extends TaoComponent
     else
       @selectOption @field.val()
 
-  _listReady: ->
-    options = @dataProvider.unselectedOptions()
-    @list.setOptions options, @remote?.totalOptionSize
+    @list.setOptions @dataProvider.options, @remote?.totalOptionSize
     @list.searchable = if @remote
       @dataProvider.options.length < @remote.totalOptionSize
     else
@@ -60,24 +56,22 @@ class Tao.Form.Select.ElementBase extends TaoComponent
 
     if @multiple
       @on 'tao:unselect', '.select-result', (e, option) =>
-        _.remove @selectedOption, (opt) -> opt.value == option.value
-        @selected = false if @selectedOption.length == 0
+        @unselectOption option
         @_filterList ''
-        @trigger 'tao:change', @selectedOption
+        @namespacedTrigger 'change', @selectedOption
         null
     else
       @on 'tao:clear', '.select-result', (e) =>
         @active = false
-        @selectedOption = null
-        @selected = false
+        @clearSelected()
         @_filterList ''
-        @trigger 'tao:change', @selectedOption
+        @namespacedTrigger 'change', @selectedOption
         null
 
   _bindListEvents: ->
     @on 'tao:select', '.select-list', (e, option) =>
       @selectOption option
-      @trigger 'tao:change', @selectedOption
+      @namespacedTrigger 'change', @selectedOption
       null
 
     @on 'tao:search', '.select-list', (e, value) =>
@@ -94,13 +88,14 @@ class Tao.Form.Select.ElementBase extends TaoComponent
     @list.loading = true
     @dataProvider.filter value, (options, totalSize) =>
       @list.loading = false
-      options = @dataProvider.unselectedOptions options
       @list.setOptions options, totalSize
 
   selectOption: (option) ->
     option = @dataProvider.getOption option
     return false unless option && option != @selectedOption
     @result.selectOption option
+    @list.clearSelected() unless @multiple
+    @list.selectOption option
     if @multiple
       @selectedOption.push option
     else
@@ -113,10 +108,19 @@ class Tao.Form.Select.ElementBase extends TaoComponent
       option = @dataProvider.getOption option
       return false unless option && (option in @selectedOption)
       @result.unselectOption option
+      @list.unselectOption option
       _.remove @selectedOption, (opt) -> opt.value == option.value
       @selected = false if @selectedOption.length == 0
     else
-      @result.unselectOption()
+      @clearSelected()
+    true
+
+  clearSelected: ->
+    @result.clearSelected()
+    @list.clearSelected()
+    @selected = false
+    if @multiple
+      @selectedOption.length = 0
+    else
       @selectedOption = null
-      @selected = false
     true

data/lib/assets/javascripts/tao/form/shared/fields/select/list/base.coffee

@@ -14,6 +14,7 @@ class Tao.Form.Select.ListBase extends TaoComponent
 
   _connected: ->
     @searchField = @jq.find('.search-field')
+    @selectedOption ||= []
     @_bind()
 
   _disconnected: ->
@@ -23,13 +24,15 @@ class Tao.Form.Select.ListBase extends TaoComponent
     @on 'input', '.search-field', _.debounce (e) =>
       val = @searchField.val()
       @searching = !!val
-      @trigger 'tao:search', [val]
+      @namespacedTrigger 'search', [val]
     , 200
 
     @on 'click', '.option', (e) =>
       $option = $ e.currentTarget
+      return if $option.hasClass('selected')
+      $option.addClass 'selected'
       option = $option.data('option')
-      @trigger('tao:select', [option]) if option
+      @namespacedTrigger('select', [option]) if option
       null
 
   _hiddenSizeChanged: ->
@@ -71,9 +74,24 @@ class Tao.Form.Select.ListBase extends TaoComponent
     $option.find('.name').text(option.data.label || option.text)
     $option.find('.hint').text(option.data.hint) if option.data.hint
     $option.attr 'data-value', option.value
+    if _.findIndex(@selectedOption, (opt) -> opt.value == option.value) > -1
+      $option.addClass('selected')
     $option
 
   reset: ->
     @searchField.val ''
     @searching = false
-    @trigger 'tao:search', ['']
+    @namespacedTrigger 'search', ['']
+
+  selectOption: (option) ->
+    return false unless option && !(option in @selectedOption)
+    @selectedOption.push option
+    true
+
+  unselectOption: (option) ->
+    return false unless option && option in @selectedOption
+    _.remove @selectedOption, (opt) -> opt.value == option.value
+    true
+
+  clearSelected: ->
+    @selectedOption.length = 0

data/lib/assets/javascripts/tao/form/shared/fields/select/models/data_provider.coffee

@@ -68,11 +68,3 @@ class Tao.Form.Select.DataProvider extends TaoModule
         []
 
       callback? options, result.totalSize
-
-  unselectedOptions: (options = @options) ->
-    options.filter (option) =>
-      value = @field.val()
-      if _.isArray(value)
-        !(option.value in value)
-      else
-        option.value != value

data/lib/assets/javascripts/tao/form/shared/fields/select/multiple_result/base.coffee

@@ -9,7 +9,7 @@ class Tao.Form.Select.MultipleResultBase extends TaoComponent
 
   _connected: ->
     @field = @jq.find 'select'
-    @selectedOption = []
+    @selectedOption ||= []
     @_bind()
 
   _disconnected: ->
@@ -17,7 +17,7 @@ class Tao.Form.Select.MultipleResultBase extends TaoComponent
 
   _bind: ->
     @on 'click', 'select', =>
-      @trigger 'tao:activeClick'
+      @namespacedTrigger 'activeClick'
       false
 
     @on 'click', '.selected-item', (e) =>
@@ -25,18 +25,14 @@ class Tao.Form.Select.MultipleResultBase extends TaoComponent
       $option = $ e.currentTarget
       option = $option.data 'option'
       @unselectOption option
-      @trigger 'tao:unselect', [option]
+      @namespacedTrigger 'unselect', [option]
       false
 
   selectOption: (option) ->
     return false unless option && !(option in @selectedOption)
 
     unless @jq.find(".selected-item[data-value='#{option.value}']").length > 0
-      $item = @_generateItem(option)
-      if @selectedOption.length > 0
-        @jq.find('.selected-item:last').after $item
-      else
-        @jq.prepend $item
+      @_insertItem @_generateItem(option)
 
     @selectedOption.push option
     @_setSelectedOption option
@@ -51,6 +47,13 @@ class Tao.Form.Select.MultipleResultBase extends TaoComponent
     @selected = false if @selectedOption.length == 0
     true
 
+  clearSelected: ->
+    @jq.find('.selected-item').remove()
+    @selectedOption.length = 0
+    @field.find('option').prop 'selected', false
+    @selected = false
+    true
+
   _setSelectedOption: (option) ->
     return unless option
     $option = @field.find("option[value='#{option.value}']")
@@ -79,3 +82,9 @@ class Tao.Form.Select.MultipleResultBase extends TaoComponent
       .data 'option', option
       .find('.name').text option.text
     $item
+
+  _insertItem: ($item) ->
+    if @selectedOption.length > 0
+      @jq.find('.selected-item:last').after $item
+    else
+      @jq.prepend $item