tao_form 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2ff40f7bdfcc88531bc195a44cd9519fbdc149
-  data.tar.gz: d2c855cdb833109f1a80f76a8966114371bf271c
+  metadata.gz: 3e6584a0c12c826ec4ee4b8cc98598202dc15c47
+  data.tar.gz: 7624701714269e45db9780fe29cc1f6c0ce2206c
 SHA512:
-  metadata.gz: 725bafd0dbe6eca4dfa3bab172244f552b8309321e9a0bc413dfe91664d2688e657c9d75b96b20b55ba708f5347e6270ff8017fcd785649d8195b387a43968e8
-  data.tar.gz: 48711a34c50054ec54605d791a4f0a713a7fcf4b749617928d79ec9a56546634d148951353327c5b1d35ab9b2878e581eec4a2c43c9a31e3d5c4bfa7456d9e45
+  metadata.gz: 9732e722dfbe5a0ede57594db2f74fa7dd005918390ccfb3187903905462843e8d799ccbea97340c09e1b3683d3716462577607692bc0be6d64583e41a5fbc1e
+  data.tar.gz: c589359dca7064e749673ffb859d7e7cae7dd74b1ecc6279f7d638bb1073bd3f61fd0fb7d569e0ce5f7d6e8848b1a8ef6d5f6d3b2de49c4422488dbc3869d8cc

data/config/locales/tao_form/components/date_range_picker/en.yml

@@ -0,0 +1,5 @@
+en:
+  tao_form:
+    components:
+      date_range_picker:
+        to: to

data/config/locales/tao_form/components/date_range_picker/zh-CN.yml

@@ -0,0 +1,7 @@
+zh-CN:
+  tao_form:
+    components:
+      date_range_picker:
+        to: 至
+        start_placeholder: 开始日期
+        end_placeholder: 结束日期

data/lib/assets/javascripts/tao/form/fields/checkbox.coffee

@@ -8,7 +8,8 @@ class Tao.Form.Checkbox extends Tao.Form.CheckboxBase
     @on 'keydown', '.checkbox-wrapper', (e) =>
       return unless e.which == 13 && @field.is(':enabled')
       @_toggleChecked()
-      @trigger 'tao:change'
+      @namespacedTrigger 'change'
+
       false
 
 TaoComponent.register Tao.Form.Checkbox

data/lib/assets/javascripts/tao/form/fields/index.coffee

@@ -7,3 +7,4 @@
 #= require tao/form/shared/fields/time_picker
 #= require tao/form/shared/fields/datetime_picker
 #= require tao/form/shared/fields/month_picker
+#= require tao/form/shared/fields/date_range_picker

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

@@ -5,7 +5,7 @@ class Tao.Form.MomentPicker.Element extends Tao.Form.MomentPicker.ElementBase
   _bind: ->
     super
 
-    @on 'tao:show', 'tao-moment-picker-segment-list', (e) =>
+    @on 'tao:show', '.tao-moment-picker-segment-list', (e) =>
       @_positionList()
 
   _activeChanged: ->

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

@@ -13,7 +13,7 @@ class Tao.Form.MomentPicker.Result extends Tao.Form.MomentPicker.ResultBase
 
     @on 'click', '.link-clear', (e) =>
       return if @disabled
-      @clear() && @trigger('tao:clear')
+      @clear() && @namespacedTrigger('clear')
       false
 
   _disabledChanged: ->

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

@@ -9,6 +9,6 @@ class MomentPicker.SegmentList extends MomentPicker.SegmentListBase
   @attribute 'direction', default: 'down'
 
   _activeChanged: ->
-    @trigger('tao:show') if @active
+    @namespacedTrigger('show') if @active
 
 TaoComponent.register Tao.Form.MomentPicker.SegmentList

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

@@ -8,7 +8,7 @@ class Tao.Form.Radio extends Tao.Form.RadioBase
     @on 'keydown', '.radio-wrapper', (e) =>
       return unless e.which == 13 && @field.is(':enabled')
       @_toggleChecked()
-      @trigger 'tao:change'
+      @namespacedTrigger 'change'
       false
 
 TaoComponent.register Tao.Form.Radio

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

@@ -12,7 +12,7 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
     @on 'tao:enterPress', '.select-result', (e) =>
       if @active
         if @selectOption @list.highlightedOption
-          @trigger 'tao:change', @selectedOption
+          @namespacedTrigger 'change', @selectedOption
       else
         @active = true
       null
@@ -37,7 +37,7 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
     @on 'tao:show', '.select-list', (e) =>
       @_positionList()
 
-    @on 'tao:searchEscapePress', '.select-list', (e) =>
+    @on 'tao:cancel', '.select-list', (e) =>
       @active = false
       null
 
@@ -73,7 +73,7 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
       @list.setMaxHeight offsetToWindowTop - 20
       @list.direction = 'up'
     else
-      @list.setMaxHeight(offsetToWindowBottom - 20) if offsetToWindowBottom < listHeight
+      @list.setMaxHeight offsetToWindowBottom - 20
       @list.direction = 'down'
 
 TaoComponent.register Tao.Form.Select.Element

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

@@ -16,10 +16,10 @@ class Tao.Form.Select.List extends Tao.Form.Select.ListBase
 
     @on 'keydown', '.search-field', (e) =>
       if e.which == 13
-        @trigger('tao:select', [@highlightedOption]) if @highlightedOption
+        @namespacedTrigger('select', [@highlightedOption]) if @highlightedOption
         false
       else if e.which == 27
-        @trigger 'tao:searchEscapePress'
+        @namespacedTrigger 'cancel'
         false
       else if e.which == 38
         @highlightPrevOption()
@@ -28,9 +28,14 @@ class Tao.Form.Select.List extends Tao.Form.Select.ListBase
         @highlightNextOption()
         false
 
+    @on 'mouseenter', '.option', (e) =>
+      $option = $ e.currentTarget
+      @highlightOption $option
+      null
+
   _activeChanged: ->
     if @active
-      @trigger 'tao:show'
+      @namespacedTrigger 'show'
       @searchField.focus() if @searchable
       @_refreshScrollPosition()
     else

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

@@ -14,19 +14,19 @@ class Tao.Form.Select.MultipleResult extends Tao.Form.Select.MultipleResultBase
 
     @on 'click', '.link-add', (e) =>
       return if @disabled
-      @trigger 'tao:activeClick'
+      @namespacedTrigger 'activeClick'
       false
 
     @on 'keydown', '.link-add', (e) =>
       return if @disabled
       if e.which == 13
-        @trigger 'tao:enterPress'
+        @namespacedTrigger 'enterPress'
         false
       else if e.which == 38
-        @trigger 'tao:arrowPress', ['up']
+        @namespacedTrigger 'arrowPress', ['up']
         false
       else if e.which == 40
-        @trigger 'tao:arrowPress', ['down']
+        @namespacedTrigger 'arrowPress', ['down']
         false
 
   _disabledChanged: ->

data/lib/assets/javascripts/tao/form/fields/select/result.coffee

@@ -13,21 +13,21 @@ class Tao.Form.Select.Result extends Tao.Form.Select.ResultBase
 
     @on 'click', (e) =>
       return if @disabled
-      @trigger 'tao:activeClick'
+      @namespacedTrigger 'activeClick'
 
     @on 'keydown', (e) =>
       return if @disabled
       if e.which == 13
-        @trigger 'tao:enterPress'
+        @namespacedTrigger 'enterPress'
         false
       else if e.which == 8 || e.which == 46
-        @clear() && @trigger('tao:clear')
+        @clearSelected() && @namespacedTrigger('clear')
         false
       else if e.which == 38
-        @trigger 'tao:arrowPress', ['up']
+        @namespacedTrigger 'arrowPress', ['up']
         false
       else if e.which == 40
-        @trigger 'tao:arrowPress', ['down']
+        @namespacedTrigger 'arrowPress', ['down']
         false
 
   _disabledChanged: ->

data/lib/assets/javascripts/tao/form/fields/switch.coffee

@@ -8,7 +8,7 @@ class Tao.Form.Switch extends Tao.Form.SwitchBase
     @on 'keydown', '.switch-wrapper', (e) =>
       return unless e.which == 13 && @field.is(':enabled')
       @_toggleChecked()
-      @trigger 'tao:change'
+      @namespacedTrigger 'change'
       false
 
 TaoComponent.register Tao.Form.Switch

data/lib/assets/javascripts/tao/form/index.coffee

@@ -3,15 +3,9 @@
 #= require tao/ui
 #= require tao/ui/icons/form
 #= require_self
+#= require tao/form/shared/init
 #= require ./element
 #= require ./fields
 
 Tao.Form =
   Mixins: {}
-
-Tao.Application.initializer 'moment', (app) ->
-  if moment? && app.locale
-    moment.locale(app.locale.toLowerCase())
-
-  if moment?.tz? && app.timeZone
-    moment.tz.setDefault(app.timeZone)

data/lib/assets/javascripts/tao/form/mobile/fields/index.coffee

@@ -7,3 +7,4 @@
 #= require tao/form/shared/fields/time_picker
 #= require tao/form/shared/fields/datetime_picker
 #= require tao/form/shared/fields/month_picker
+#= require tao/form/shared/fields/date_range_picker

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

@@ -22,11 +22,11 @@ class Tao.Form.MomentPicker.Element extends Tao.Form.MomentPicker.ElementBase
       @setMoment moment(@segmentList.momentData)
       null
 
-    @on 'tao:clear', 'tao-moment-picker-segment-list', (e) =>
+    @on 'tao:clear', '.tao-moment-picker-segment-list', (e) =>
       return if @disabled
       @active = false
       @setMoment null
-      @trigger 'tao:change', [@moment]
+      @namespacedTrigger 'change', [@moment]
       null
 
   _activeChanged: ->

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

@@ -10,7 +10,7 @@ class MomentPicker.SegmentList extends MomentPicker.SegmentListBase
     super
 
     @on 'click', '.link-clear', (e) =>
-      @trigger 'tao:clear'
+      @namespacedTrigger 'clear'
       null
 
   refreshHeight: ->

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

@@ -21,12 +21,12 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
       @active = false
       null
 
-    @on 'click', '.header .button-ok', (e) =>
+    @on 'click', '.button-ok', (e) =>
       @active = false
       null
 
     @on 'tao:change', =>
-      @list.refreshHeight() if @active
+      @_refreshListHeight() if @active
       @_refreshSelectedText()
 
   _bindListEvents: ->
@@ -39,7 +39,7 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
         @active = false
       null
 
-  _resultReady: ->
+  _childComponentsReady: ->
     super
     @_refreshSelectedText()
 
@@ -55,10 +55,19 @@ class Tao.Form.Select.Element extends Tao.Form.Select.ElementBase
 
     @jq.find('.select-result-delegate .selected-text').text text
 
+  _refreshListHeight: ->
+    $listWrapper = @list.jq.find('.list-wrapper')
+    winHeight = $(window).height()
+    offsetTop = $listWrapper[0].getBoundingClientRect().top
+    buttonsHeight = @slideBox.jq.find('.slide-box-content > .buttons').outerHeight()
+
+    $listWrapper.css
+      height: winHeight - offsetTop - buttonsHeight
+
   _activeChanged: ->
     @slideBox.active = @active
     if @active
-      @list.refreshHeight()
+      @_refreshListHeight()
     else
       @list.reset()
 

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

@@ -2,12 +2,4 @@
 
 class Tao.Form.Select.List extends Tao.Form.Select.ListBase
 
-  refreshHeight: ->
-    $listWrapper = @jq.find('.list-wrapper')
-    winHeight = $(window).height()
-    offsetTop = $listWrapper[0].getBoundingClientRect().top
-
-    $listWrapper.css
-      height: winHeight - offsetTop
-
 TaoComponent.register Tao.Form.Select.List

data/lib/assets/javascripts/tao/form/mobile/index.coffee

@@ -3,6 +3,7 @@
 #= require tao/ui/mobile
 #= require tao/ui/icons/form
 #= require_self
+#= require tao/form/shared/init
 #= require ./element
 #= require ./fields
 

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

@@ -11,11 +11,11 @@ class Tao.Form.ElementBase extends TaoComponent
   _bind: ->
     @on 'ajax:beforeSend', '> form', (e) =>
       @_clearErrors()
-      @trigger 'tao:beforeSubmit'
+      @namespacedTrigger 'beforeSubmit'
 
     @on 'ajax:success', '> form', (e) =>
       @_showSuccessMessage()
-      @trigger 'tao:success'
+      @namespacedTrigger 'success'
 
   _disconnected: ->
     @off()
@@ -47,3 +47,7 @@ class Tao.Form.ElementBase extends TaoComponent
     clearTimeout @_successTimer
     @jq.find('.success-message').remove()
     @jq.find('button[data-disable-with]:hidden, input[data-disable-with]:hidden').show()
+
+  submit: ->
+    @jq.find('> form').submit()
+    @

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

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

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

@@ -0,0 +1,75 @@
+class Tao.Form.DateRangePicker extends TaoComponent
+
+  @tag 'tao-date-range-picker'
+
+  @attribute 'dateValueFormat', default: 'YYYY-MM-DD'
+
+  @attribute 'dateDisplayFormat', default: 'YYYY-MM-DD'
+
+  @get 'value', ->
+    @field?.val()
+
+  @set 'value', (val) ->
+    @field.val val
+    @_initMoment()
+
+  _connected: ->
+    @field = @jq.find '> input'
+    @startDatePicker = @findComponent '.start-date-picker'
+    @endDatePicker = @findComponent '.end-date-picker'
+    @_bind()
+
+  _disconnected: ->
+    @off()
+
+  _bind: ->
+    @on 'tao-date-picker:change', '.tao-moment-picker', (e, m) =>
+      datePicker = e.currentTarget
+      if datePicker == @startDatePicker
+        @endDatePicker.disableBefore datePicker.moment
+      else
+        @startDatePicker.disableAfter datePicker.moment
+      @_syncMoment()
+      @namespacedTrigger('change', [@value]) if @value
+
+    startDatePickerDeferred = $.Deferred()
+    endDatePickerDeferred = $.Deferred()
+
+    @on 'tao-date-picker:ready', '.start-date-picker', ->
+      startDatePickerDeferred.resolve()
+
+    @on 'tao-date-picker:ready', '.end-date-picker', ->
+      endDatePickerDeferred.resolve()
+
+    $.when(startDatePickerDeferred, endDatePickerDeferred).done =>
+      @_initMoment()
+      @namespacedTrigger 'ready'
+
+  _initMoment: ->
+    dates = @field.val().split(',')
+
+    if dates.length > 0
+      @startDate = moment _.trim(dates[0]), @dateValueFormat
+      @endDate = moment _.trim(dates[1]), @dateValueFormat
+      @startDatePicker.setMoment @startDate.clone()
+      @endDatePicker.setMoment @endDate.clone()
+    else
+      @startDatePicker.setMoment ''
+      @endDatePicker.setMoment ''
+      @startDate = null
+      @endDate = null
+
+  _syncMoment: ->
+    if @startDatePicker.moment && @endDatePicker.moment
+      startDateValue = @startDatePicker.moment.format(@dateValueFormat)
+      endDateValue = @endDatePicker.moment.format(@dateValueFormat)
+
+      @field.val "#{startDateValue},#{endDateValue}"
+      @startDate = @startDatePicker.moment.clone()
+      @endDate = @endDatePicker.moment.clone()
+    else
+      @field.val ''
+      @startDate = null
+      @endDate = null
+
+TaoComponent.register Tao.Form.DateRangePicker

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

@@ -13,6 +13,13 @@ class Tao.Form.DatetimePicker extends TaoComponent
 
   @attribute 'timeDisplayFormat', default: 'HH:mm'
 
+  @get 'value', ->
+    @field.val()
+
+  @set 'value', (val) ->
+    @field.val val
+    @_initMoment()
+
   _connected: ->
     @field = @jq.find '> input'
     @datePicker = @findComponent 'tao-date-picker'
@@ -23,21 +30,22 @@ class Tao.Form.DatetimePicker extends TaoComponent
     @off()
 
   _bind: ->
-    @on 'tao:change', '.moment-picker', (e, m) =>
+    @on 'tao-date-picker:change tao-time-picker:change', '.tao-moment-picker', (e, m) =>
       @_syncMoment()
-      @trigger 'tao:change', [@moment]
+      @namespacedTrigger 'change', [@moment]
 
     datePickerDeferred = $.Deferred()
     timePickerDeferred = $.Deferred()
 
-    @on 'tao:ready', 'tao-date-picker', ->
+    @on 'tao-date-picker:ready', 'tao-date-picker', ->
       datePickerDeferred.resolve()
 
-    @on 'tao:ready', 'tao-time-picker', ->
+    @on 'tao-time-picker:ready', 'tao-time-picker', ->
       timePickerDeferred.resolve()
 
-    $.when datePickerDeferred, timePickerDeferred
-      .done => @_initMoment()
+    $.when(datePickerDeferred, timePickerDeferred).done =>
+      @_initMoment()
+      @namespacedTrigger 'ready'
 
   _initMoment: ->
     m = moment @field.val(), @valueFormat
@@ -47,6 +55,8 @@ class Tao.Form.DatetimePicker extends TaoComponent
       @timePicker.setMoment m.format(@timeValueFormat)
       @moment = m
     else
+      @datePicker.setMoment ''
+      @timePicker.setMoment ''
       @moment = null
 
   _syncMoment: ->