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

issue 960, 772, 946 ChildModel, clonedModel #961

Merged
merged 6 commits into from
Dec 4, 2014
Merged

issue 960, 772, 946 ChildModel, clonedModel #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62989c0
removing evalAsync alltogether
nmccready Dec 3, 2014
a806ccb
the rest of it
nmccready Dec 3, 2014
6b8c53b
clonedModel attribute for uiGmapModel-Key to be used in ModelWatcher
nmccready Dec 4, 2014
fc5cbfc
typo
nmccready Dec 4, 2014
a088b9e
less use of getMarker() at least make maybeMarker more atomic for eac…
nmccready Dec 4, 2014
9019c74
- scope.markerModelsUpdate to force delayed updates on windows. Instead
nmccready Dec 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 68 additions & 54 deletions dist/angular-google-maps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! angular-google-maps 2.0.11 2014-12-03
/*! angular-google-maps 2.0.11 2014-12-04
* AngularJS directives for Google Maps
* git: https://github.com/angular-ui/angular-google-maps.git
*/
Expand Down Expand Up @@ -1196,11 +1196,10 @@ Nicholas McCready - https://twitter.com/nmccready
delta = now - this.lastUpdate;
if (delta <= 250 || this.inProgress) {
return true;
} else {
this.inProgress = true;
this.lastUpdate = now;
return false;
}
this.inProgress = true;
this.lastUpdate = now;
return false;
};

ModelKey.prototype.cleanOnResolve = function(promise) {
Expand Down Expand Up @@ -1366,7 +1365,7 @@ Nicholas McCready - https://twitter.com/nmccready
return adds.push(m);
} else {
child = childObjects.get(m[idKey]);
if (!comparison(m, child.model)) {
if (!comparison(m, child.clonedModel)) {
return updates.push({
model: m,
child: child
Expand Down Expand Up @@ -2413,6 +2412,7 @@ Nicholas McCready - https://twitter.com/nmccready
this.defaults = defaults;
this.model = model;
this.clean = __bind(this.clean, this);
this.clonedModel = _.clone(this.model, true);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cthrax since you just looked at his code recently. Remember the _.clone stuff being passed in? Well it is ideal to have clones for comparison. However it sucks when we pass the models back to the Controllers (through behaviors and functions). IE if we don't pass reference back to the Controller the user can't make changes in the model to be reflected back to the directive. This is why #772 broke and how this keeps #946 happy.

this.isDragging = false;
this.internalEvents = {
dragend: (function(_this) {
Expand Down Expand Up @@ -2754,6 +2754,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 = _.clone(this.model, true);
this.deferred = uiGmapPromise.defer();
_.each(this.keys, (function(_this) {
return function(v, k) {
Expand Down Expand Up @@ -2828,7 +2829,8 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

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

MarkerChildModel.prototype.renderGMarker = function(doDraw, validCb) {
Expand Down Expand Up @@ -3149,6 +3151,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
WindowChildModel.include(EventsHelper);

function WindowChildModel(model, scope, opts, isIconVisibleOnClick, mapCtrl, markerScope, element, needToManualDestroy, markerIsVisibleAfterWindowClose) {
var maybeMarker;
this.model = model;
this.scope = scope;
this.opts = opts;
Expand All @@ -3170,6 +3173,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
this.watchElement = __bind(this.watchElement, this);
this.watchAndDoShow = __bind(this.watchAndDoShow, this);
this.doShow = __bind(this.doShow, this);
this.clonedModel = _.clone(this.model, true);
this.getGmarker = function() {
var _ref, _ref1;
if (((_ref = this.markerScope) != null ? _ref['getGMarker'] : void 0) != null) {
Expand All @@ -3178,8 +3182,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};
this.listeners = [];
this.createGWin();
if (this.getGmarker() != null) {
this.getGmarker().setClickable(true);
maybeMarker = this.getGmarker();
if (maybeMarker != null) {
maybeMarker.setClickable(true);
}
this.watchElement();
this.watchOptions();
Expand Down Expand Up @@ -3229,10 +3234,11 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

WindowChildModel.prototype.createGWin = function(isOpen) {
var defaults, _opts, _ref, _ref1;
var defaults, maybeMarker, _opts, _ref, _ref1;
if (isOpen == null) {
isOpen = false;
}
maybeMarker = this.getGmarker();
if (this.gWin == null) {
defaults = {};
if (this.opts != null) {
Expand All @@ -3245,7 +3251,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
this.html = _.isObject(this.element) ? this.element.html() : this.element;
}
_opts = this.scope.options ? this.scope.options : defaults;
this.opts = this.createWindowOptions(this.getGmarker(), this.markerScope || this.scope, this.html, _opts);
this.opts = this.createWindowOptions(maybeMarker, this.markerScope || this.scope, this.html, _opts);
}
if ((this.opts != null) && !this.gWin) {
if (this.opts.boxClass && (window.InfoBox && typeof window.InfoBox === 'function')) {
Expand All @@ -3257,12 +3263,12 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
this.doShow();
return this.listeners.push(google.maps.event.addListener(this.gWin, 'closeclick', (function(_this) {
return function() {
if (_this.getGmarker()) {
_this.getGmarker().setAnimation(_this.oldMarkerAnimation);
if (maybeMarker) {
maybeMarker.setAnimation(_this.oldMarkerAnimation);
if (_this.markerIsVisibleAfterWindowClose) {
_.delay(function() {
_this.getGmarker().setVisible(false);
return _this.getGmarker().setVisible(_this.markerIsVisibleAfterWindowClose);
maybeMarker.setVisible(false);
return maybeMarker.setVisible(_this.markerIsVisibleAfterWindowClose);
}, 250);
}
}
Expand Down Expand Up @@ -3320,29 +3326,29 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

WindowChildModel.prototype.handleClick = function(forceClick) {
var click, marker;
var click, maybeMarker;
if (this.gWin == null) {
return;
}
marker = this.getGmarker();
maybeMarker = this.getGmarker();
click = (function(_this) {
return function() {
if (_this.gWin == null) {
_this.createGWin();
}
_this.showWindow();
if (marker != null) {
_this.initialMarkerVisibility = marker.getVisible();
_this.oldMarkerAnimation = marker.getAnimation();
return marker.setVisible(_this.isIconVisibleOnClick);
if (maybeMarker != null) {
_this.initialMarkerVisibility = maybeMarker.getVisible();
_this.oldMarkerAnimation = maybeMarker.getAnimation();
return maybeMarker.setVisible(_this.isIconVisibleOnClick);
}
};
})(this);
if (forceClick) {
click();
}
if (marker) {
return this.listeners = this.listeners.concat(this.setEvents(marker, {
if (maybeMarker) {
return this.listeners = this.listeners.concat(this.setEvents(maybeMarker, {
events: {
click: click
}
Expand All @@ -3355,30 +3361,24 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
if (this.gWin != null) {
show = (function(_this) {
return function() {
return _this.scope.$evalAsync(function() {
var isOpen, maybeAnchor, maybeMarker, pos;
if (!_this.gWin.isOpen()) {
maybeMarker = _this.getGmarker();
if ((_this.gWin != null) && (_this.gWin.getPosition != null)) {
pos = _this.gWin.getPosition();
}
if (maybeMarker) {
pos = maybeMarker.getPosition();
}
maybeAnchor = _this.getGmarker();
if (!pos) {
return;
}
_this.gWin.open(_this.mapCtrl, maybeAnchor);
isOpen = _this.gWin.isOpen();
_this.scope.$evalAsync(function() {
return ChromeFixes.maybeRepaint(_this.gWin.content);
});
if (_this.model.show !== isOpen) {
return _this.model.show = isOpen;
}
var isOpen, maybeMarker, pos;
if (!_this.gWin.isOpen()) {
maybeMarker = _this.getGmarker();
if ((_this.gWin != null) && (_this.gWin.getPosition != null)) {
pos = _this.gWin.getPosition();
}
});
if (maybeMarker) {
pos = maybeMarker.getPosition();
}
if (!pos) {
return;
}
_this.gWin.open(_this.mapCtrl, maybeMarker);
isOpen = _this.gWin.isOpen();
if (_this.model.show !== isOpen) {
return _this.model.show = isOpen;
}
}
};
})(this);
if (this.scope.templateUrl) {
Expand Down Expand Up @@ -3417,8 +3417,10 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

WindowChildModel.prototype.getLatestPosition = function(overridePos) {
if ((this.gWin != null) && (this.getGmarker() != null) && !overridePos) {
return this.gWin.setPosition(this.getGmarker().getPosition());
var maybeMarker;
maybeMarker = this.getGmarker();
if ((this.gWin != null) && (maybeMarker != null) && !overridePos) {
return this.gWin.setPosition(maybeMarker.getPosition());
} else {
if (overridePos) {
return this.gWin.setPosition(overridePos);
Expand Down Expand Up @@ -3919,6 +3921,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
MarkersParentModel.__super__.constructor.call(this, scope, element, attrs, map);
self = this;
this.scope.markerModels = new PropMap();
this.scope.markerModelsUpdate = {
updateCtr: 0
};
this.$log.info(this);
this.doRebuildAll = this.scope.doRebuildAll != null ? this.scope.doRebuildAll : false;
this.setIdKey(scope);
Expand Down Expand Up @@ -4028,8 +4033,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
_this.modelsRendered = true;
_this.gMarkerManager.draw();
if (scope.fit) {
return _this.gMarkerManager.fit();
_this.gMarkerManager.fit();
}
return _this.scope.markerModelsUpdate.updateCtr += 1;
});
return promise;
};
Expand Down Expand Up @@ -4084,9 +4090,10 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
_this.gMarkerManager.draw();
scope.markerModels = _this.scope.markerModels;
if (scope.fit) {
return _this.gMarkerManager.fit();
_this.gMarkerManager.fit();
}
}
return _this.scope.markerModelsUpdate.updateCtr += 1;
});
}));
};
Expand Down Expand Up @@ -4118,7 +4125,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
_.each(IMarker.scopeKeys, function(v, k) {
return keys[k] = scope[k];
});
child = new MarkerChildModel(childScope, _.clone(model, true), keys, this.map, this.DEFAULTS, this.doClick, this.gMarkerManager, doDrawSelf = false);
child = new MarkerChildModel(childScope, model, keys, this.map, this.DEFAULTS, this.doClick, this.gMarkerManager, doDrawSelf = false);
this.scope.markerModels.put(model[this.idKey], child);
return child;
};
Expand All @@ -4137,6 +4144,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
_this.gMarkerManager.clear();
}
_this.scope.markerModels = new PropMap();
_this.scope.markerModelsUpdate.updateCtr += 1;
return uiGmapPromise.resolve().then(function() {
return _this.isClearing = false;
});
Expand Down Expand Up @@ -5093,12 +5101,14 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};

WindowsParentModel.prototype.watchModels = function(scope) {
return scope.$watch('models', (function(_this) {
var itemToWatch;
itemToWatch = this.markersScope != null ? 'markerModelsUpdate' : 'models';
return scope.$watch(itemToWatch, (function(_this) {
return function(newValue, oldValue) {
var doScratch;
if (!_.isEqual(newValue, oldValue) || _this.firstWatchModels) {
_this.firstWatchModels = false;
if (_this.doRebuildAll || _this.doINeedToWipe(newValue)) {
if (_this.doRebuildAll || _this.doINeedToWipe(scope.models)) {
return _this.rebuildAll(scope, true, true);
} else {
doScratch = _this.windows.length === 0;
Expand Down Expand Up @@ -5189,7 +5199,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
}
modelsNotDefined = angular.isUndefined(this.linked.scope.models);
if (modelsNotDefined && (this.markersScope === void 0 || (((_ref = this.markersScope) != null ? _ref.markerModels : void 0) === void 0 || ((_ref1 = this.markersScope) != null ? _ref1.models : void 0) === void 0))) {
this.$log.error('No models to create windows from! Need direct models or models derrived from markers!');
this.$log.error('No models to create windows from! Need direct models or models derived from markers!');
return;
}
if (this.gMap != null) {
Expand Down Expand Up @@ -5246,6 +5256,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
return _async.each(scope.models, function(model) {
var gMarker, _ref;
gMarker = hasGMarker ? (_ref = _this.getItem(scope, modelsPropToIterate, model[_this.idKey])) != null ? _ref.gMarker : void 0 : void 0;
if (!gMarker && _this.markersScope) {
$log.error('Unable to get gMarker from markersScope!');
}
return _this.createWindow(model, gMarker, _this.gMap);
});
};
Expand Down Expand Up @@ -5299,6 +5312,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
};
})(this));
} else {
$log.debug('pieceMealWindows: rebuildAll');
return this.rebuildAll(this.scope, true, true);
}
};
Expand Down
10 changes: 10 additions & 0 deletions dist/angular-google-maps.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading