Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

fix(leafletData unresolveMap): argument name renamed scopeId to mapId #260

Merged
merged 3 commits into from
Jun 7, 2016
Merged

fix(leafletData unresolveMap): argument name renamed scopeId to mapId #260

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3bf1b9
fix(leafletData unresolveMap): argument naming renamed scopeId to mapId
nmccready Jun 7, 2016
8e80c78
karma working locally again
nmccready Jun 7, 2016
5132ee1
locking down bower devDeps
nmccready Jun 7, 2016
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
2 changes: 1 addition & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"eqeqeq": true,
"immed": true,
"indent": 4,
"latedef": true,
"latedef": false,
"newcap": true,
"noarg": true,
"regexp": true,
Expand Down
16 changes: 8 additions & 8 deletions dist/ui-leaflet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ui-leaflet 1.0.0 2015-11-03
* ui-leaflet 1.0.0 2016-06-07
* ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
* git: https://github.com/angular-ui/ui-leaflet
*/
Expand Down Expand Up @@ -456,8 +456,8 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
_private[itemName] = {};
});

this.unresolveMap = function (scopeId) {
var id = leafletHelpers.obtainEffectiveMapId(_private.map, scopeId);
this.unresolveMap = function (mapId) {
var id = leafletHelpers.obtainEffectiveMapId(_private.map, mapId);
_privateItems.forEach(function (itemName) {
_private[itemName][id] = undefined;
});
Expand All @@ -466,14 +466,14 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
//int repetitive stuff (get and sets)
_privateItems.forEach(function (itemName) {
var name = upperFirst(itemName);
self['set' + name] = function (lObject, scopeId) {
var defer = getUnresolvedDefer(_private[itemName], scopeId);
self['set' + name] = function (lObject, mapId) {
var defer = getUnresolvedDefer(_private[itemName], mapId);
defer.resolve(lObject);
setResolvedDefer(_private[itemName], scopeId);
setResolvedDefer(_private[itemName], mapId);
};

self['get' + name] = function (scopeId) {
var defer = getDefer(_private[itemName], scopeId);
self['get' + name] = function (mapId) {
var defer = getDefer(_private[itemName], mapId);
return defer.promise;
};
});
Expand Down
2 changes: 1 addition & 1 deletion dist/ui-leaflet.min.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion dist/ui-leaflet.min.no-header.js
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions dist/ui-leaflet_dev_mapped.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion dist/ui-leaflet_dev_mapped.js.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/services/leafletData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ angular.module('ui-leaflet').service('leafletData', function (leafletLogger, $q,
_private[itemName] = {};
});

this.unresolveMap = function (scopeId) {
var id = leafletHelpers.obtainEffectiveMapId(_private.map, scopeId);
this.unresolveMap = function (mapId) {
var id = leafletHelpers.obtainEffectiveMapId(_private.map, mapId);
Copy link
Contributor Author

@nmccready nmccready Jun 7, 2016

Choose a reason for hiding this comment

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

Main fix is here.

_privateItems.forEach(function (itemName) {
_private[itemName][id] = undefined;
});
Expand All @@ -37,14 +37,14 @@ angular.module('ui-leaflet').service('leafletData', function (leafletLogger, $q,
//int repetitive stuff (get and sets)
_privateItems.forEach(function (itemName) {
var name = upperFirst(itemName);
self['set' + name] = function (lObject, scopeId) {
var defer = getUnresolvedDefer(_private[itemName], scopeId);
self['set' + name] = function (lObject, mapId) {
var defer = getUnresolvedDefer(_private[itemName], mapId);
defer.resolve(lObject);
setResolvedDefer(_private[itemName], scopeId);
setResolvedDefer(_private[itemName], mapId);
};

self['get' + name] = function (scopeId) {
var defer = getDefer(_private[itemName], scopeId);
self['get' + name] = function (mapId) {
var defer = getDefer(_private[itemName], mapId);
return defer.promise;
};
});
Expand Down