Skip to content

Commit d396820

Browse files
nmccreadynmccready
committed
all specs working again
1 parent 6318ba6 commit d396820

File tree

5 files changed

+46
-50
lines changed

5 files changed

+46
-50
lines changed

‎dist/angular-google-maps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ Nicholas McCready - https://twitter.com/nmccready
11831183
var self;
11841184
if (_this.gMarker != null) {
11851185
google.maps.event.clearListeners(_this.gMarker, 'click');
1186-
_this.gMarkerManager.remove(_this.gMarker);
1186+
_this.gMarkerManager.remove(_this.gMarker, true);
11871187
delete _this.gMarker;
11881188
}
11891189
return self = void 0;

‎dist/angular-google-maps.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎spec/coffee/oo/base-object.spec.coffee

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,49 @@
11
describe "oo.BaseObject", ->
22
beforeEach ->
33
module "google-maps"
4-
inject BaseObject =>
4+
inject (BaseObject) =>
55
@subject = BaseObject
6+
PersonModule =
7+
changePersonName: (person, name)->
8+
person.name = name
9+
person
10+
killPersonsName: (person)->
11+
delete person.name
12+
person
13+
PersonAttributes =
14+
p_name: "no_name"
15+
state: "no_state"
16+
@PersonAttributes = PersonAttributes
17+
class Person extends BaseObject
18+
@include PersonModule
19+
@extend PersonAttributes
20+
constructor: (name, state)->
21+
@name = if name? then name else Person.p_name
22+
@state = if state? then state else Person.state
23+
@name = "nick"
24+
@state = "fl"
25+
@defaultUsage = new Person()
26+
@usage = new Person(@name, @state)
627

728
it "exists ~ you loaded the script!", ->
829
expect(@subject?).toEqual(true)
930

10-
11-
#describe "oo.BaseObject", ->
12-
# beforeEach ->
13-
# PersonModule =
14-
# changePersonName: (person, name)->
15-
# person.name = name
16-
# person
17-
# killPersonsName: (person)->
18-
# delete person.name
19-
# person
20-
# PersonAttributes =
21-
# p_name: "no_name"
22-
# state: "no_state"
23-
# class Person extends @subject
24-
# @include PersonModule
25-
# @extend PersonAttributes
26-
# constructor: (name, state)->
27-
# @name = if name? then name else Person.p_name
28-
# @state = if state? then state else Person.state
29-
# @name = "nick"
30-
# @state = "fl"
31-
# @defaultSubject = new Person()
32-
# @subject = new Person(@name, @state)
33-
#
34-
# describe "include specs", ->
35-
# it "defaults attributes exist", ->
36-
# expect(@defaultSubject.name?).toEqual(true)
37-
# expect(@defaultSubject.name?).toEqual(true)
38-
# it "defaults attributes are correct", ->
39-
# expect(@defaultSubject.name).toEqual(PersonAttributes.p_name)
40-
# expect(@defaultSubject.state).toEqual(PersonAttributes.state)
41-
# it "subject attributes are correct ", ->
42-
# expect(@subject.name).toEqual(@name)
43-
# expect(@subject.state).toEqual(@state)
44-
# describe "extend specs", ->
45-
# it "defaults functions exist", ->
46-
# expect(@defaultSubject.changePersonName?).toEqual(true)
47-
# expect(@defaultSubject.killPersonsName?).toEqual(true)
48-
# it "subject functions act correctly", ->
49-
# p = @defaultSubject.changePersonName(angular.copy(@defaultSubject), "john")
50-
# p2 = @defaultSubject.killPersonsName(@defaultSubject)
51-
# expect(p.name).toEqual("john")
52-
# expect(p2.name).toEqual(undefined)
31+
describe "include specs", ->
32+
it "defaults attributes exist", ->
33+
expect(@defaultUsage.name?).toEqual(true)
34+
expect(@defaultUsage.name?).toEqual(true)
35+
it "defaults attributes are correct", ->
36+
expect(@defaultUsage.name).toEqual(@PersonAttributes.p_name)
37+
expect(@defaultUsage.state).toEqual(@PersonAttributes.state)
38+
it "subject attributes are correct ", ->
39+
expect(@usage.name).toEqual(@name)
40+
expect(@usage.state).toEqual(@state)
41+
describe "extend specs", ->
42+
it "defaults functions exist", ->
43+
expect(@defaultUsage.changePersonName?).toEqual(true)
44+
expect(@defaultUsage.killPersonsName?).toEqual(true)
45+
it "subject functions act correctly", ->
46+
p = @defaultUsage.changePersonName(angular.copy(@defaultUsage), "john")
47+
p2 = @defaultUsage.killPersonsName(@defaultUsage)
48+
expect(p.name).toEqual("john")
49+
expect(p2.name).toEqual(undefined)

‎src/coffee/directives/api/managers/marker-manager.coffee

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ angular.module("google-maps").factory "MarkerManager", [ "BaseObject","Logger",
2222
index = @gMarkers.indexOf(gMarker)
2323
else
2424
tempIndex = 0
25-
_.find(@gMarkers, (marker) ->
25+
_.find @gMarkers, (marker) ->
2626
tempIndex += 1
2727
if marker == gMarker
2828
index = tempIndex
2929
return
30-
)
3130
if index?
3231
@gMarkers.splice(index, 1)
3332

‎src/coffee/directives/api/models/child/marker-child-model.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ angular.module("google-maps").factory "MarkerChildModel", [ "ModelKey", "GmapUti
119119
watchDestroy: (scope)=>
120120
scope.$on "$destroy", =>
121121
if @gMarker? #this is possible due to AsyncProcessor in that we created some Children but no gMarker yet
122-
google.maps.event.clearListeners(@gMarker, 'click')
123-
@gMarkerManager.remove(@gMarker)
122+
google.maps.event.clearListeners @gMarker, 'click'
123+
@gMarkerManager.remove @gMarker,true
124124
delete @gMarker
125125
self = undefined
126126
MarkerChildModel

0 commit comments

Comments
 (0)