Merge pull request #5 from AO16/moment-namespace

Moment namespace
rjhilgefort · Dec 4, 2015 · 7d7693c · 7d7693c
2 parents d090bcf + 87ddf10
commit 7d7693c
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/dist/lodash-extras.js b/dist/lodash-extras.js
diff --git a/dist/lodash-extras.min.js b/dist/lodash-extras.min.js
diff --git a/src/index.js b/src/index.js
@@ -3,7 +3,7 @@ _.mixin(lodashExtras);
 
 // Only mixin moment-extras if available
 import lodashMoment from './lodash-moment';
-if (_.isPresent(window.moment)) _.mixin(lodashMoment);
+if (_.isPresent(window.moment)) _.moment = lodashMoment;
 
 // Only mixin ember-extras if available
 import lodashEmber from './lodash-ember';

diff --git a/src/lodash-moment.js b/src/lodash-moment.js
@@ -1,3 +1,9 @@
+/**
+ * This utility assumes `Ember` exists globally
+ */
+import lodashUtils from './_core/lodash-utils';
+
+
 /**
  * Collection of all the utils in here. Add to this as you go.
  */
@@ -37,4 +43,15 @@ export var ensureMoment = (value, valueDefault) => {
 lodashMoment.ensureMoment = ensureMoment;
 
 
+/**
+ * Generate deep `is` methods and override standard methods to handle both
+ *
+ * @method is{Condition}
+ * @param {Object} value: Base value to look through
+ * @param {String} propString: Property string to apply to `get`
+ * @return {Boolean}
+ */
+lodashUtils.buildIsMethods(lodashMoment, lodashMoment);
+
+
 export default lodashMoment;