Refactor DateUtils to ES6

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

src/DateUtils.js

@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
 import { _t } from './languageHandler';
 
 function getDaysArray() {
@@ -59,47 +58,45 @@ function twelveHourTime(date) {
     return `${hours}:${minutes}${ampm}`;
 }
 
-module.exports = {
+export function formatDate(date, showTwelveHour=false) {
-    formatDate: function(date, showTwelveHour=false) {
+    const now = new Date();
-        const now = new Date();
+    const days = getDaysArray();
-        const days = getDaysArray();
+    const months = getMonthsArray();
-        const months = getMonthsArray();
+    if (date.toDateString() === now.toDateString()) {
-        if (date.toDateString() === now.toDateString()) {
+        return formatTime(date, showTwelveHour);
-            return this.formatTime(date, showTwelveHour);
+    } else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
-        } else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
+        // TODO: use standard date localize function provided in counterpart
-            // TODO: use standard date localize function provided in counterpart
+        return _t('%(weekDayName)s %(time)s', {
-            return _t('%(weekDayName)s %(time)s', {
+            weekDayName: days[date.getDay()],
-                weekDayName: days[date.getDay()],
+            time: formatTime(date, showTwelveHour),
-                time: this.formatTime(date, showTwelveHour),
+        });
-            });
+    } else if (now.getFullYear() === date.getFullYear()) {
-        } else if (now.getFullYear() === date.getFullYear()) {
+        // TODO: use standard date localize function provided in counterpart
-            // TODO: use standard date localize function provided in counterpart
+        return _t('%(weekDayName)s, %(monthName)s %(day)s %(time)s', {
-            return _t('%(weekDayName)s, %(monthName)s %(day)s %(time)s', {
-                weekDayName: days[date.getDay()],
-                monthName: months[date.getMonth()],
-                day: date.getDate(),
-                time: this.formatTime(date, showTwelveHour),
-            });
-        }
-        return this.formatFullDate(date, showTwelveHour);
-    },
-
-    formatFullDate: function(date, showTwelveHour=false) {
-        const days = getDaysArray();
-        const months = getMonthsArray();
-        return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {
             weekDayName: days[date.getDay()],
             monthName: months[date.getMonth()],
             day: date.getDate(),
-            fullYear: date.getFullYear(),
+            time: formatTime(date, showTwelveHour),
-            time: this.formatTime(date, showTwelveHour),
         });
-    },
+    }
+    return formatFullDate(date, showTwelveHour);
+}
 
-    formatTime: function(date, showTwelveHour=false) {
+export function formatFullDate(date, showTwelveHour=false) {
-        if (showTwelveHour) {
+    const days = getDaysArray();
-            return twelveHourTime(date);
+    const months = getMonthsArray();
-        }
+    return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {
-        return pad(date.getHours()) + ':' + pad(date.getMinutes());
+        weekDayName: days[date.getDay()],
-    },
+        monthName: months[date.getMonth()],
-};
+        day: date.getDate(),
+        fullYear: date.getFullYear(),
+        time: formatTime(date, showTwelveHour),
+    });
+}
+
+export function formatTime(date, showTwelveHour=false) {
+    if (showTwelveHour) {
+        return twelveHourTime(date);
+    }
+    return pad(date.getHours()) + ':' + pad(date.getMinutes());
+}

src/components/views/rooms/ReadReceiptMarker.js

@@ -26,7 +26,7 @@ const Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
 import { _t } from '../../../languageHandler';
 
-import DateUtils from '../../../DateUtils';
+import {formatDate} from '../../../DateUtils';
 
 let bounce = false;
 try {
@@ -187,7 +187,7 @@ module.exports = React.createClass({
         if (this.props.timestamp) {
             title = _t(
                 "Seen by %(userName)s at %(dateTime)s",
-                {userName: this.props.member.userId, dateTime: DateUtils.formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
+                {userName: this.props.member.userId, dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
             );
         }
 

src/components/views/settings/DevicesPanelEntry.js

@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import DateUtils from '../../../DateUtils';
+import {formatDate} from '../../../DateUtils';
 
 export default class DevicesPanelEntry extends React.Component {
     constructor(props, context) {
@@ -56,7 +56,7 @@ export default class DevicesPanelEntry extends React.Component {
 
         let lastSeen = "";
         if (device.last_seen_ts) {
-            const lastSeenDate = DateUtils.formatDate(new Date(device.last_seen_ts));
+            const lastSeenDate = formatDate(new Date(device.last_seen_ts));
             lastSeen = device.last_seen_ip + " @ " +
                 lastSeenDate.toLocaleString();
         }