fix(lodash)lodash 4.X resolved, 3.X should work as well

Author: nmccready

dist/angular-google-maps.js

@@ -359,6 +359,12 @@ Nicholas McCready - https://twitter.com/nmccready
       }, {
         missingName: 'some',
         swapName: 'any'
+      }, {
+        missingName: 'first',
+        swapName: 'head'
+      }, {
+        missingName: 'head',
+        swapName: 'first'
       }
     ].forEach(function(toMonkeyPatch) {
       return fixLodash(toMonkeyPatch);
@@ -577,7 +583,10 @@ Nicholas McCready - https://twitter.com/nmccready
   });
 
 }).call(this);
-;(function() {
+;
+/*global _:true,angular:true, */
+
+(function() {
   angular.module('uiGmapgoogle-maps.directives.api.utils').service('uiGmap_sync', [
     function() {
       return {
@@ -597,7 +606,7 @@ Nicholas McCready - https://twitter.com/nmccready
     }
   ]).service('uiGmap_async', [
     '$timeout', 'uiGmapPromise', 'uiGmapLogger', '$q', 'uiGmapDataStructures', 'uiGmapGmapUtil', function($timeout, uiGmapPromise, $log, $q, uiGmapDataStructures, uiGmapGmapUtil) {
-      var ExposedPromise, PromiseQueueManager, SniffedPromise, _getArrayAndKeys, _getIterateeValue, _ignoreFields, defaultChunkSize, doChunk, doSkippPromise, each, errorObject, isInProgress, kickPromise, logTryCatch, managePromiseQueue, map, maybeCancelPromises, promiseStatus, promiseTypes, tryCatch;
+      var ExposedPromise, PromiseQueueManager, SniffedPromise, _getIterateeValue, _ignoreFields, defaultChunkSize, doChunk, doSkippPromise, each, errorObject, getArrayAndKeys, isInProgress, kickPromise, logTryCatch, managePromiseQueue, map, maybeCancelPromises, promiseStatus, promiseTypes, tryCatch;
       promiseTypes = uiGmapPromise.promiseTypes;
       isInProgress = uiGmapPromise.isInProgress;
       promiseStatus = uiGmapPromise.promiseStatus;
@@ -748,7 +757,7 @@ Nicholas McCready - https://twitter.com/nmccready
         return collection[valOrKey];
       };
       _ignoreFields = ['length', 'forEach', 'map'];
-      _getArrayAndKeys = function(collection, keys, bailOutCb, cb) {
+      getArrayAndKeys = function(collection, keys, bailOutCb, cb) {
         var array, propName, val;
         if (angular.isArray(collection)) {
           array = collection;
@@ -760,15 +769,15 @@ Nicholas McCready - https://twitter.com/nmccready
             for (propName in collection) {
               val = collection[propName];
               if (collection.hasOwnProperty(propName) && !_.includes(_ignoreFields, propName)) {
-                array.push(val);
+                array.push(propName);
               }
             }
           }
         }
         if (cb == null) {
           cb = bailOutCb;
         }
-        if (angular.isArray(array) && (array === void 0 || (array != null ? array.length : void 0) <= 0)) {
+        if (angular.isArray(array) && !(array != null ? array.length : void 0)) {
           if (cb !== bailOutCb) {
             return bailOutCb();
           }
@@ -787,7 +796,7 @@ Nicholas McCready - https://twitter.com/nmccready
         Optional Asynchronous Chunking via promises.
        */
       doChunk = function(collection, chunkSizeOrDontChunk, pauseMilli, chunkCb, pauseCb, overallD, index, _keys) {
-        return _getArrayAndKeys(collection, _keys, function(array, keys) {
+        return getArrayAndKeys(collection, _keys, function(array, keys) {
           var cnt, i, keepGoing, val;
           if (chunkSizeOrDontChunk && chunkSizeOrDontChunk < array.length) {
             cnt = chunkSizeOrDontChunk;
@@ -838,7 +847,7 @@ Nicholas McCready - https://twitter.com/nmccready
           overallD.reject(error);
           return ret;
         }
-        return _getArrayAndKeys(collection, _keys, function() {
+        return getArrayAndKeys(collection, _keys, function() {
           overallD.resolve();
           return ret;
         }, function(array, keys) {
@@ -849,7 +858,7 @@ Nicholas McCready - https://twitter.com/nmccready
       map = function(collection, iterator, chunkSizeOrDontChunk, pauseCb, index, pauseMilli, _keys) {
         var results;
         results = [];
-        return _getArrayAndKeys(collection, _keys, function() {
+        return getArrayAndKeys(collection, _keys, function() {
           return uiGmapPromise.resolve(results);
         }, function(array, keys) {
           return each(collection, function(o) {
@@ -865,6 +874,7 @@ Nicholas McCready - https://twitter.com/nmccready
         managePromiseQueue: managePromiseQueue,
         promiseLock: managePromiseQueue,
         defaultChunkSize: defaultChunkSize,
+        getArrayAndKeys: getArrayAndKeys,
         chunkSizeFrom: function(fromSize, ret) {
           if (ret == null) {
             ret = void 0;
@@ -1485,11 +1495,8 @@ Nicholas McCready - https://twitter.com/nmccready
             throw 'No scope set!';
           }
           if (hasCoords) {
-            console.log('hasCoords');
             coord1 = this.scopeOrModelVal('coords', scope, model1);
             coord2 = this.scopeOrModelVal('coords', scope, model2);
-            console.log("coord1:" + JSON.stringify(coord1));
-            console.log("coord2:" + JSON.stringify(coord2));
             isEqual = GmapUtil.equalCoords(coord1, coord2);
             if (!isEqual) {
               return isEqual;
@@ -4898,7 +4905,10 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
   ]);
 
 }).call(this);
-;(function() {
+;
+/*global _:true,angular:true, */
+
+(function() {
   var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
@@ -4929,10 +4939,8 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
           this.createChildScopes = bind(this.createChildScopes, this);
           this.validateScope = bind(this.validateScope, this);
           this.onWatch = bind(this.onWatch, this);
-          var self;
           MarkersParentModel.__super__.constructor.call(this, scope, element, attrs, map);
           this["interface"] = IMarker;
-          self = this;
           _setPlurals(new PropMap(), this);
           this.scope.pluralsUpdate = {
             updateCtr: 0
@@ -5034,13 +5042,11 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
             angular.extend(typeEvents, this.origTypeEvents);
           }
           internalHandles = {};
-          _.each(events, (function(_this) {
-            return function(eventName) {
-              return internalHandles[eventName] = function(group) {
-                return self.maybeExecMappedEvent(group, eventName);
-              };
+          _.each(events, function(eventName) {
+            return internalHandles[eventName] = function(group) {
+              return self.maybeExecMappedEvent(group, eventName);
             };
-          })(this));
+          });
           return angular.extend(typeEvents, internalHandles);
         };
 
@@ -5164,7 +5170,10 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
         };
 
         MarkersParentModel.prototype.newChildMarker = function(model, scope) {
-          var child, childScope, doDrawSelf, keys;
+          var child, childScope, keys;
+          if (!model) {
+            throw 'model undefined';
+          }
           if (model[this.idKey] == null) {
             this.$log.error("Marker model has no id to assign a child to. This is required for performance. Please assign id, or redirect id to a different key.");
             return;
@@ -5176,7 +5185,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
           IMarker.scopeKeys.forEach(function(k) {
             return keys[k] = scope[k];
           });
-          child = new MarkerChildModel(childScope, model, keys, this.map, this.DEFAULTS, this.doClick, this.gManager, doDrawSelf = false);
+          child = new MarkerChildModel(childScope, model, keys, this.map, this.DEFAULTS, this.doClick, this.gManager, false);
           this.scope.plurals.put(model[this.idKey], child);
           return child;
         };

dist/angular-google-maps.min.js

@@ -464,7 +464,7 @@ <h2>angular-google-maps: <span ng-cloak>{{version}}</span>, google-maps: <span n
 </div>
 <script src="../website_libs/dev_deps.js"></script>
 
-<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.0/lodash.js" type="text/javascript"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.1/lodash.js" type="text/javascript"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.16/angular.min.js"></script>
 <script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script><script src="../dist/angular-google-maps.js"></script>
 <script src="./assets/scripts/mocks/heat-layer.js"></script>

example/example.html

@@ -4,6 +4,7 @@ beforeEach ->
 
   angular.module('uiGmapgoogle-maps')
   .config ($provide) ->
+    $provide.value('$log', console)
     $provide.decorator '$timeout', ($delegate, $browser) ->
       $delegate.hasPendingTasks = ->
         $browser.deferredFns.length > 0

spec/coffee/bootstrap/bootstrap.coffee

@@ -1,3 +1,4 @@
+###global _:true, angular:true, google:true ###
 capitalize = (s) ->
   return s[0].toUpperCase() + s.slice(1)
 
@@ -8,11 +9,11 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
       @map
     setMap: (m) =>
       @map = m
-    setOptions: (o)=>
+    setOptions: (o) =>
       @opts = o
 
   class DraggableObject extends MapObject
-    setDraggable: (bool)=>
+    setDraggable: (bool) =>
       @draggable = bool
     getDraggable: =>
       @draggable
@@ -82,7 +83,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
         if window?.google?.maps?.event?
           window.google.maps.event.fireAllListeners 'creation', @
 
-      setOptions: (o)=>
+      setOptions: (o) =>
         super(o)
         if o?.position?
           @position = o.position
@@ -124,7 +125,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
 
       constructor: (opts) ->
         super()
-        @props= ['draggable', 'editable', 'map','visible', 'radius', 'center']
+        @props = ['draggable', 'editable', 'map','visible', 'radius', 'center']
         @setOptions opts
 
         #getters
@@ -144,7 +145,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
         if window?.google?.maps?.event?
           window.google.maps.event.fireAllListeners 'creation', @
 
-      setOptions: (o)=>
+      setOptions: (o) =>
         super(o)
         _.extend @, o
 
@@ -215,8 +216,8 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
         @content
       draw: =>
         @drawn = true
-      onRemove: =>
-      onAdd: =>
+      onRemove: ->
+      onAdd: ->
 
   getPolyline = ->
     class Polyline extends DraggableObject
@@ -233,9 +234,9 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
         @editable
       getPath: =>
         @path
-      setEditable: (bool)=>
+      setEditable: (bool) =>
         @editable = bool
-      setPath: (array)=>
+      setPath: (array) =>
         @path = array
 
   getMVCArray = ->
@@ -291,7 +292,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
       window.google.maps = {}
 
       # To make debugging easier, mock everything with exceptions
-      unmocked = (api) => () => throw new String('Unmocked API ' + api)
+      unmocked = (api) -> () -> throw new String('Unmocked API ' + api)
       window.google.maps.Marker = unmocked('Marker')
       window.google.maps.event =
         clearListeners: unmocked('event.clearListeners')
@@ -353,14 +354,14 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
 
     mockOverlayView: (OverlayView = class OverlayView
       setMap: () ->) ->
-      window.google.maps.OverlayView = OverlayView
+        window.google.maps.OverlayView = OverlayView
 
     mockEvent: (event = {}) ->
       listeners = []
       #mocking google maps event listener
       if not event.addListener
         event.addListener = (thing, eventName, callBack) ->
-          found = _.find listeners, (obj)->
+          found = _.find listeners, (obj) ->
             obj.obj == thing
           unless found?
             toPush = {}
@@ -390,7 +391,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
 
       unless event.fireListener
         event.fireListener = (thing, eventName) ->
-          found = _.find listeners, (obj)->
+          found = _.find listeners, (obj) ->
             obj.obj == thing
           if found? and found?.events[eventName]?
             found.events[eventName].forEach (cb) -> cb(found.obj)
@@ -407,7 +408,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
 
       unless event.fireAllListeners
         event.fireAllListeners = (eventName, state) ->
-          listeners.forEach (obj)->
+          listeners.forEach (obj) ->
             if obj.events[eventName]?
               obj.events[eventName].forEach (cb) -> cb(state)
 
@@ -423,7 +424,7 @@ angular.module('uiGmapgoogle-maps.mocks', ['uiGmapgoogle-maps'])
     mockMVCArray: (impl = getMVCArray()) ->
       window.google.maps.MVCArray = impl
 
-    mockCircle: (Circle = getCircle())->
+    mockCircle: (Circle = getCircle()) ->
       window.google.maps.Circle = Circle
 
     mockPoint: (Point = (x, y) -> return {x: x, y: y}) ->

spec/coffee/bootstrap/google-api-mock.coffee

@@ -1,3 +1,4 @@
+###global _:true,expect:true,###
 describe "_async", ->
 
   beforeEach ->
@@ -10,6 +11,36 @@ describe "_async", ->
   afterEach ->
     @subject = null
 
+  describe 'getArrayAndKeys', ->
+    describe 'handles array', ->
+      it 'normal', (done) ->
+        testColl = [1,2,3]
+        @subject.getArrayAndKeys testColl, null, null, (array, keys) ->
+          expect(testColl).toEqual array
+          expect(keys).toBeFalsy()
+          done()
+
+    describe 'handles object', ->
+      it 'normal', (done) ->
+        testColl =
+          'one':1
+          'two':2
+          'three':3
+        @subject.getArrayAndKeys testColl, null, (-> throw "bail"), (array, keys) ->
+          expect(['one','two','three']).toEqual array
+          expect(keys).toBeFalsy()
+          done()
+
+      it 'came w keys', (done) ->
+        testColl =
+          '1':1
+          '2':2
+          '3':3
+        @subject.getArrayAndKeys testColl, ['a','b','c'], (-> throw "bail"), (array, keys) ->
+          expect(['a','b','c']).toEqual array
+          expect(['a','b','c']).toEqual keys
+          done()
+
   describe "arrays", ->
 
     it "handle zero elements", (done) ->

spec/coffee/directives/api/utils/_async.spec.coffee

@@ -64,7 +64,6 @@ angular.module('uiGmapgoogle-maps.directives.api.models.child')
         @createMarker @model
         $log.info @
 
-
       destroy: (removeFromManager = true) =>
         @removeFromManager = removeFromManager
         @scope.$destroy()