Remove coffeescript date utils and use es6

react-toolbox · Sep 5, 2015 · e3d899c · e3d899c
1 parent d1ad367
commit e3d899c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 125 deletions.
diff --git a/components/calendar/day.cjsx b/components/calendar/day.cjsx
@@ -1,5 +1,5 @@
 css = require './style'
-dateUtils = require '../date_utils'
+dateTime  = require '../util/date-time'
 
 module.exports = React.createClass
   displayName: 'Day',
@@ -11,7 +11,7 @@ module.exports = React.createClass
     viewDate     : React.PropTypes.object
 
   _dayStyle: ->
-    marginLeft: "#{dateUtils.firstWeekDay(@props.viewDate) * 100/7}%"
+    marginLeft: "#{dateTime.getFirstWeekDay(@props.viewDate) * 100/7}%"
 
   _isSelected: () ->
     isSameYear  = @props.viewDate.getFullYear() == @props.selectedDate.getFullYear()

diff --git a/components/calendar/index.cjsx b/components/calendar/index.cjsx
@@ -1,6 +1,6 @@
 CTG       = React.addons.CSSTransitionGroup
 css       = require './style'
-dateUtils = require '../date_utils'
+dateTime  = require '../util/date-time'
 FontIcon  = require '../font_icon'
 Month     = require './month'
 
@@ -31,10 +31,10 @@ module.exports = React.createClass
   # -- Events
   onDayClick: (event) ->
     @setState
-      selectedDate: dateUtils.setDay(@state.viewDate, parseInt(event.target.textContent))
+      selectedDate: dateTime.setDay(@state.viewDate, parseInt(event.target.textContent))
 
   onYearClick: (event) ->
-    newDate = dateUtils.setYear(@state.viewDate, parseInt(event.target.textContent))
+    newDate = dateTime.setYear(@state.selectedDate, parseInt(event.target.textContent))
     @setState
       selectedDate: newDate
       viewDate: newDate
@@ -53,12 +53,12 @@ module.exports = React.createClass
   incrementViewMonth: ->
     @setState
       direction: 'right'
-      viewDate:  dateUtils.addMonths(@state.viewDate, 1)
+      viewDate:  dateTime.addMonths(@state.viewDate, 1)
 
   decrementViewMonth: ->
     @setState
       direction: 'left'
-      viewDate: dateUtils.addMonths(@state.viewDate, -1)
+      viewDate: dateTime.addMonths(@state.viewDate, -1)
 
   # -- Render
   renderYear: (year) ->

diff --git a/components/calendar/month.cjsx b/components/calendar/month.cjsx
@@ -1,6 +1,6 @@
 css  = require './style'
 Day  = require './day'
-util = require '../date_utils'
+dateTime = require '../util/date-time'
 
 module.exports = React.createClass
   displayName: 'Month',
@@ -13,13 +13,13 @@ module.exports = React.createClass
   render: ->
     <div>
       <span className={css.title}>
-        { util.monthInWords(@props.viewDate)} {@props.viewDate.getFullYear() }
+        { dateTime.getFullMonth(@props.viewDate)} {@props.viewDate.getFullYear() }
       </span>
       <div className={css.week}>
-        { <span key={"dw#{i}"}>{ util.weekDayInWords(i).charAt(0) }</span> for i in [0..6] }
+        { <span key={"dw#{i}"}>{ dateTime.getFullDayOfWeek(i).charAt(0) }</span> for i in [0..6] }
       </div>
       <div className={css.days}>
-        { for i in [1..util.daysInMonth(@props.viewDate)]
+        { for i in [1..dateTime.getDaysInMonth(@props.viewDate)]
             <Day key={"d#{i}"}
               day={i}
               onClick={@props.onDayClick}

diff --git a/components/date_picker/dialog.cjsx b/components/date_picker/dialog.cjsx
@@ -1,7 +1,7 @@
+Calendar  = require '../calendar'
 css       = require './style'
-dateUtils = require '../date_utils'
+dateTime  = require '../util/date-time'
 Dialog    = require '../dialog'
-Calendar  = require '../calendar'
 
 module.exports = React.createClass
   displayName: 'CalendarDialog'
@@ -25,7 +25,7 @@ module.exports = React.createClass
   # -- Events
   onCalendarChange: (calendar) ->
     @setState
-      date: dateUtils.cloneDatetime(calendar.getValue())
+      date: dateTime.clone(calendar.getValue())
       display: 'months'
 
   onDateCancel: (ref, method) ->
@@ -50,9 +50,9 @@ module.exports = React.createClass
     className = "display-#{@state.display}"
     <Dialog ref="dialog" type={css.dialog} className={className} actions={@state.actions}>
       <header className={css.header}>
-        <span className={css.headerWeekday}>{dateUtils.weekDayInWords(@state.date.getDay())}</span>
+        <span className={css.headerWeekday}>{dateTime.getFullDayOfWeek(@state.date.getDay())}</span>
         <div onClick={@displayMonths}>
-          <span className={css.headerMonth}>{dateUtils.monthInShortWords(@state.date)}</span>
+          <span className={css.headerMonth}>{dateTime.getShortMonth(@state.date)}</span>
           <span className={css.headerDay}>{@state.date.getDate()}</span>
         </div>
         <span className={css.headerYear} onClick={@displayYears}>

diff --git a/components/date_picker/index.cjsx b/components/date_picker/index.cjsx
@@ -1,7 +1,7 @@
+CalendarDialog = require './dialog'
 css            = require './style'
-dateUtils      = require '../date_utils'
+dateTime       = require '../util/date-time'
 Input          = require '../input'
-CalendarDialog = require './dialog'
 
 module.exports = React.createClass
   displayName  : 'DatePicker'
@@ -27,7 +27,7 @@ module.exports = React.createClass
   # -- Private methods
   formatDate: (date) ->
     day = date.getDate()
-    month = dateUtils.monthInWords(date)
+    month = dateTime.getFullMonth(date)
     year = date.getFullYear()
     "#{day} #{month} #{year}"
 

diff --git a/components/date_utils.coffee b/components/date_utils.coffee
diff --git a/components/util/date-time.js b/components/util/date-time.js
@@ -57,9 +57,8 @@ module.exports = {
     }
   },
 
-  getFullDayOfWeek (d) {
-    let dow = d.getDay();
-    switch (dow) {
+  getFullDayOfWeek (day) {
+    switch (day) {
       default: return 'Unknown';
       case 0: return 'Sunday';
       case 1: return 'Monday';