Skip to content
This repository has been archived by the owner on Nov 30, 2018. It is now read-only.

Commit

Permalink
feat(RichMarker): Build all post merge of feature RichMarker which
Browse files Browse the repository at this point in the history
marker and the markers directive now support.
  • Loading branch information
nmccready committed Jun 14, 2015
1 parent 149e07e commit 323e41f
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 80 deletions.
2 changes: 1 addition & 1 deletion dist/angular-google-maps-street-view.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! angular-google-maps 2.1.3 2015-06-12
/*! angular-google-maps 2.1.3 2015-06-14
* AngularJS directives for Google Maps
* git: https://github.com/angular-ui/angular-google-maps.git
*/
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-google-maps-street-view.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/angular-google-maps-street-view_dev_mapped.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/angular-google-maps-street-view_dev_mapped.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions dist/angular-google-maps.dot

This file was deleted.

18 changes: 7 additions & 11 deletions dist/angular-google-maps.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! angular-google-maps 2.1.3 2015-06-12
/*! angular-google-maps 2.1.3 2015-06-14
* AngularJS directives for Google Maps
* git: https://github.com/angular-ui/angular-google-maps.git
*/
Expand Down Expand Up @@ -3058,7 +3058,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
this.updateModel = bind(this.updateModel, this);
this.handleModelChanges = bind(this.handleModelChanges, this);
this.destroy = bind(this.destroy, this);
this.clonedModel = _.extend({}, this.model);
this.clonedModel = _.clone(this.model, true);
this.deferred = uiGmapPromise.defer();
_.each(this.keys, (function(_this) {
return function(v, k) {
Expand Down Expand Up @@ -3137,7 +3137,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

MarkerChildModel.prototype.updateModel = function(model) {
this.clonedModel = _.extend({}, model);
this.clonedModel = _.clone(model, true);
return this.setMyScope('all', model, this.model);
};

Expand Down Expand Up @@ -3276,14 +3276,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
}
return this.renderGMarker(doDraw, (function(_this) {
return function() {
var _options, coords, newValue, oldValue;
_options = _this.getProp('options', scope, _this.model);
var coords, newValue, oldValue;
oldValue = _this.gObject.getIcon();
if (_options.content) {
newValue = _options.content;
} else {
newValue = _this.getProp('icon', scope, _this.model);
}
newValue = _this.getProp('icon', scope, _this.model);
if (oldValue === newValue) {
return;
}
Expand Down Expand Up @@ -3323,6 +3318,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
} else if (_this.opts.content) {
_this.gObject = new RichMarker(_this.opts);
_this.gObject.getIcon = _this.gObject.getContent;
_this.gObject.setIcon = _this.gObject.setContent;
} else {
_this.gObject = new google.maps.Marker(_this.opts);
}
Expand Down Expand Up @@ -3773,7 +3769,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

WindowChildModel.prototype.updateModel = function(model) {
this.clonedModel = _.extend({}, model);
this.clonedModel = _.clone(model, true);
return _.extend(this.model, this.clonedModel);
};

Expand Down
14 changes: 7 additions & 7 deletions dist/angular-google-maps.min.js

Large diffs are not rendered by default.

Binary file removed dist/angular-google-maps.png
Binary file not shown.
18 changes: 7 additions & 11 deletions dist/angular-google-maps_dev_mapped.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions dist/angular-google-maps_dev_mapped.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/angular-google-maps_dev_mapped.min.js

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions dist/angular-google-maps_dev_mapped.min.js.map

Large diffs are not rendered by default.

0 comments on commit 323e41f

Please sign in to comment.