Skip to content

Commit 0f18143

Browse files
committed
prepping for 2.3.X
1 parent c46d0c2 commit 0f18143

12 files changed

+23
-23
lines changed

README.markdown

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Dependencies](https://david-dm.org/angular-ui/angular-google-maps/dev-status.svg)](https://david-dm.org/angular-ui/angular-google-maps) 
66

77
Builds:
8-
- Master (2.2.X): [![Build Status](https://travis-ci.org/angular-ui/angular-google-maps.svg?branch=master)](https://travis-ci.org/angular-ui/angular-google-maps)
8+
- Master (2.3.X): [![Build Status](https://travis-ci.org/angular-ui/angular-google-maps.svg?branch=master)](https://travis-ci.org/angular-ui/angular-google-maps)
99

1010
- 2.2.X: [![Build Status](https://travis-ci.org/angular-ui/angular-google-maps.svg?branch=2.2.X)](https://travis-ci.org/angular-ui/angular-google-maps)
1111

@@ -96,14 +96,14 @@ PR's should follow [angular git commit conventions](https://github.com/angular/a
9696

9797
### Branching Scheme
9898

99-
PRS to master are for 2.2.X only.
99+
PRS to master are for 2.3.X only.
100100

101101
If you want it rolled into a older release then target your PR to that respective branching name like 2.1.X.
102102

103-
*Note: many fixes relevant to 2.0.X can be rolled up into 2.1.X, and 2.2.X*
103+
*Note: many fixes relevant to 2.0.X can be rolled up into 2.1.X, 2.2.X and 2.3.X*
104104

105-
- master: points to the active targeted next release branch (2.2.X)
106-
- 2.2.X: latest of 2.2.X *side note: 2.2.X is basically the same as 2.1.X except the logging dependency has been added*
107-
- 2.1.X: latest of 2.1.X
105+
- master: points to the active targeted next release branch (2.3.X)
106+
- 2.2.X: latest of 2.2.X
107+
- 2.1.X: ""
108108
- 2.0.X: ""
109109
... etc

dist/angular-google-maps-street-view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2016-01-19
1+
/*! angular-google-maps 2.2.1 2016-01-21
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/

dist/angular-google-maps-street-view.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.

dist/angular-google-maps-street-view_dev_mapped.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.

dist/angular-google-maps-street-view_dev_mapped.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.

dist/angular-google-maps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2016-01-19
1+
/*! angular-google-maps 2.2.1 2016-01-21
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -4375,7 +4375,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
43754375
if (scope.settingFromDirective) {
43764376
return;
43774377
}
4378-
if (!_.isEqual(newVals, oldVals)) {
4378+
if (!(_.isEqual(newVals, oldVals) && newVals === oldVals && ((newVals != null) && (oldVals != null) ? newVals.coordinates === oldVals.coordinates : true))) {
43794379
return gObject.setOptions(_this.buildOpts(GmapUtil.getCoords(scope.center), scope.radius));
43804380
}
43814381
};

dist/angular-google-maps.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps_dev_mapped.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2016-01-19
1+
/*! angular-google-maps 2.2.1 2016-01-21
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -4375,7 +4375,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
43754375
if (scope.settingFromDirective) {
43764376
return;
43774377
}
4378-
if (!_.isEqual(newVals, oldVals)) {
4378+
if (!(_.isEqual(newVals, oldVals) && newVals === oldVals && ((newVals != null) && (oldVals != null) ? newVals.coordinates === oldVals.coordinates : true))) {
43794379
return gObject.setOptions(_this.buildOpts(GmapUtil.getCoords(scope.center), scope.radius));
43804380
}
43814381
};

dist/angular-google-maps_dev_mapped.js.map

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

dist/angular-google-maps_dev_mapped.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)