Skip to content

Commit e3e93c2

Browse files
committed
Release v0.8.7
1 parent 47dd694 commit e3e93c2

File tree

7 files changed

+57
-16
lines changed

7 files changed

+57
-16
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
<a name"0.8.7"></a>
2+
### 0.8.7 (2015-08-26)
3+
4+
5+
#### Bug Fixes
6+
7+
* **code:** Deleted uneeded file ([5be6c453](https://github.com/tombatossals/angular-leaflet-directive/commit/5be6c453))
8+
* **controls:** Solved a problem with loading custom controls, as reported by @adgoncal here: ([a1843f20](https://github.com/tombatossals/angular-leaflet-directive/commit/a1843f20))
9+
* **dependencies:**
10+
* remove dependency font-awesome ([f735e856](https://github.com/tombatossals/angular-leaflet-directive/commit/f735e856))
11+
* utfgrid now specifies main file ([79c6a252](https://github.com/tombatossals/angular-leaflet-directive/commit/79c6a252))
12+
* **paths:** Better log description with a path inside overlay error ([a02c3046](https://github.com/tombatossals/angular-leaflet-directive/commit/a02c3046))
13+
14+
15+
#### Features
16+
17+
* **examples:**
18+
* Added new example of loading custom controls ([979a7333](https://github.com/tombatossals/angular-leaflet-directive/commit/979a7333))
19+
* Compiled the examples with the new GeoGJSON Shape Layer added by @stev-0 here: h ([1f5e86a2](https://github.com/tombatossals/angular-leaflet-directive/commit/1f5e86a2))
20+
21+
122
<a name"0.8.6"></a>
223
### 0.8.6 (2015-07-28)
324

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "angular-leaflet-directive",
33
"author": "https://github.com/tombatossals/angular-leaflet-directive/graphs/contributors",
44
"description": "angular-leaflet-directive - An AngularJS directive to easily interact with Leaflet maps",
5-
"version": "0.8.6",
5+
"version": "0.8.7",
66
"homepage": "http://tombatossals.github.io/angular-leaflet-directive/",
77
"keywords": [
88
"angularjs",

dist/angular-leaflet-directive.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-leaflet-directive 0.8.6 2015-08-26
2+
* angular-leaflet-directive 0.8.7 2015-08-26
33
* angular-leaflet-directive - An AngularJS directive to easily interact with Leaflet maps
44
* git: https://github.com/tombatossals/angular-leaflet-directive
55
*/
@@ -3228,6 +3228,7 @@ angular.module("leaflet-directive").directive('controls', ["$log", "leafletHelpe
32283228
var isValidControlType = leafletControlHelpers.isValidControlType;
32293229
var leafletScope = controller.getLeafletScope();
32303230
var isDefined = leafletHelpers.isDefined;
3231+
var isArray = leafletHelpers.isArray;
32313232
var leafletControls = {};
32323233
var errorHeader = leafletHelpers.errorHeader + ' [Controls] ';
32333234

@@ -3257,12 +3258,21 @@ angular.module("leaflet-directive").directive('controls', ["$log", "leafletHelpe
32573258

32583259
if (controlType !== 'custom') {
32593260
control = createControl(controlType, newControls[newName]);
3261+
map.addControl(control);
3262+
leafletControls[newName] = control;
32603263
} else {
3261-
control = newControls[newName];
3264+
var customControlValue = newControls[newName];
3265+
if (isArray(customControlValue)) {
3266+
for (var i in customControlValue) {
3267+
var customControl = customControlValue[i];
3268+
map.addControl(customControl);
3269+
leafletControls[newName] = !isDefined(leafletControls[newName]) ? [customControl] : leafletControls[newName].concat([customControl]);
3270+
}
3271+
} else {
3272+
map.addControl(customControlValue);
3273+
leafletControls[newName] = customControlValue;
3274+
}
32623275
}
3263-
map.addControl(control);
3264-
3265-
leafletControls[newName] = control;
32663276
}
32673277

32683278
});

dist/angular-leaflet-directive.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-leaflet-directive_dev_mapped.js

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

dist/angular-leaflet-directive_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.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "https://github.com/tombatossals/angular-leaflet-directive/graphs/contributors",
33
"name": "angular-leaflet-directive",
44
"description": "angular-leaflet-directive - An AngularJS directive to easily interact with Leaflet maps",
5-
"version": "0.8.6",
5+
"version": "0.8.7",
66
"homepage": "http://tombatossals.github.io/angular-leaflet-directive/",
77
"repository": {
88
"type": "git",

0 commit comments

Comments
 (0)