vitalif
/
react-toolbox
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

Migrate time picker to use es6 helpers

old
Javi Velasco 2015-09-05 20:29:06 +02:00
parent fea1ef2258
commit d1ad367afe
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/clock/hand.cjsx
View File

@ -1,5 +1,5 @@
css = require './style'
prefixer = require "../prefixer"
prefixer = require '../util/prefixer'
module.exports = React.createClass
displayName : 'Hand'
@ -87,7 +87,7 @@ module.exports = React.createClass
# -- Render
render: ->
style = prefixer.transform("rotate(#{@state.angle}deg)")
style = prefixer(transform: "rotate(#{@state.angle}deg")
style.height = @props.length - @state.knobWidth/2
<div className={css.hand + ' ' + @props.className} style={style}>

16
components/clock/index.cjsx
View File

@ -1,7 +1,7 @@
css = require './style'
dateUtils = require '../date_utils'
Hours = require './hours'
Minutes = require './minutes'
css = require './style'
date = require '../util/date-time'
Hours = require './hours'
Minutes = require './minutes'
module.exports = React.createClass
displayName : 'Clock'
@ -41,10 +41,10 @@ module.exports = React.createClass
# -- Events handlers
onHourChange: (hours) ->
@setState time: dateUtils.setHours(@state.time, @_adaptHourToFormat(hours))
@setState time: date.setHours(@state.time, @_adaptHourToFormat(hours))
onMinuteChange: (minutes) ->
@setState time: dateUtils.setMinutes(@state.time, minutes)
@setState time: date.setMinutes(@state.time, minutes)
# -- Helper methods
_getRadius: ->
@ -52,7 +52,7 @@ module.exports = React.createClass
_adaptHourToFormat: (hour) ->
if @props.format == 'ampm'
if dateUtils.timeMode(@state.time) == 'pm'
if date.getTimeMode(@state.time) == 'pm'
if hour < 12 then hour + 12 else hour
else
if hour == 12 then 0 else hour
@ -73,7 +73,7 @@ module.exports = React.createClass
# -- Public methods
toggleTimeMode: ->
@setState time: dateUtils.toggleTimeMode(@state.time)
@setState time: date.toggleTimeMode(@state.time)
# -- Render
render: ->

13
components/time_picker/dialog.cjsx
View File

@ -1,9 +1,8 @@
css = require './style'
dateUtils = require '../date_utils'
Button = require '../button'
Clock = require '../clock'
Dialog = require '../dialog'
css = require './style'
date = require '../util/date-time'
Button = require '../button'
Clock = require '../clock'
Dialog = require '../dialog'
module.exports = React.createClass
displayName : 'TimePickerDialog'
@ -61,7 +60,7 @@ module.exports = React.createClass
render: ->
className = " "
className += " display-#{@state.display}"
className += " format-#{dateUtils.timeMode(@state.time)}"
className += " format-#{date.getTimeMode(@state.time)}"
<Dialog ref="dialog" type={css.dialog} className={className} actions={@state.actions}>
<header className={css.header}>

2
components/util/date-time.js
View File

@ -142,7 +142,7 @@ module.exports = {
setMinutes (d, minutes) {
let newDate = this.clone(d);
newDate.setHours(minutes);
newDate.setMinutes(minutes);
return newDate;
},