Merge pull request #39 from walkerburgin/master

Fix webpack caching issue with moment & moment-range
onefinestay · May 22, 2015 · 313b14d · 313b14d
2 parents 190fa25 + af30ef6
commit 313b14d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/dist/calendar/CalendarMonth.js b/dist/calendar/CalendarMonth.js
@@ -14,9 +14,9 @@ var _reactAddons = require('react/addons');
 
 var _reactAddons2 = _interopRequireDefault(_reactAddons);
 
-var _moment = require('moment');
+var _momentRange = require('moment-range');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _momentRange2 = _interopRequireDefault(_momentRange);
 
 var _calendar = require('calendar');
 
@@ -42,7 +42,7 @@ var _utilsPureRenderMixin = require('../utils/PureRenderMixin');
 
 var _utilsPureRenderMixin2 = _interopRequireDefault(_utilsPureRenderMixin);
 
-var lang = (0, _moment2['default'])().localeData();
+var lang = (0, _momentRange2['default'])().localeData();
 
 var WEEKDAYS = _immutable2['default'].List(lang._weekdays).zip(_immutable2['default'].List(lang._weekdaysShort));
 var MONTHS = _immutable2['default'].List(lang._months);
@@ -77,14 +77,14 @@ var CalendarMonth = _reactAddons2['default'].createClass({
 
     var props = _objectWithoutProperties(_props, ['dateComponent', 'value', 'highlightedDate', 'highlightedRange', 'hideSelection', 'enabledRange']);
 
-    var d = (0, _moment2['default'])(date);
+    var d = (0, _momentRange2['default'])(date);
 
     var isInSelectedRange = undefined;
     var isSelectedDate = undefined;
     var isSelectedRangeStart = undefined;
     var isSelectedRangeEnd = undefined;
 
-    if (!hideSelection && value && _moment2['default'].isMoment(value) && value.isSame(d)) {
+    if (!hideSelection && value && _momentRange2['default'].isMoment(value) && value.isSame(d)) {
       isSelectedDate = true;
     } else if (!hideSelection && value && (0, _utilsIsMomentRange2['default'])(value) && value.contains(d)) {
       isInSelectedRange = true;
@@ -196,11 +196,11 @@ var CalendarMonth = _reactAddons2['default'].createClass({
     var disabled = false;
     var year = firstOfMonth.year();
 
-    if ((0, _moment2['default'])({ years: year, months: i + 1, date: 1 }).unix() < enabledRange.start.unix()) {
+    if ((0, _momentRange2['default'])({ years: year, months: i + 1, date: 1 }).unix() < enabledRange.start.unix()) {
       disabled = true;
     }
 
-    if ((0, _moment2['default'])({ years: year, months: i, date: 1 }).unix() > enabledRange.end.unix()) {
+    if ((0, _momentRange2['default'])({ years: year, months: i, date: 1 }).unix() > enabledRange.end.unix()) {
       disabled = true;
     }
 

diff --git a/src/calendar/CalendarMonth.jsx b/src/calendar/CalendarMonth.jsx
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react/addons';
-import moment from 'moment';
+import moment from 'moment-range';
 import calendar from 'calendar';
 import Immutable from 'immutable';