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

Commit 31e6f28

Browse files
committed
test(ui-leaflet): run all test specs
Closes #122 Merge branch 'master' into leaflet-1.X
2 parents df00a5f + c79a3ac commit 31e6f28

File tree

67 files changed

+2584
-2369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2584
-2369
lines changed

.jshintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
"unused": true,
1616
"trailing": true,
1717
"smarttabs": true,
18+
"latedef": {
19+
"nofunc": true
20+
},
1821
"globals": {
1922
"angular": false,
2023
"L": false,

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ env:
99
- secure: "QW7a9wCfc4u+MGnPyLzE+HHRhAhTf0a1mqixoUB2MVNL/hZ7+nXAOL/oz3LxodPpwH3NEl4RyqteGS15XpJvZKuKXiyHWbrfSLHz7DD1LYuIzc7UOgyBTXF0C97DP5ae7zui+qvDOe67ud+qBerroP9jdcx+mSVQgMIAfF1uWY4="
1010
- secure: "gflE27IYzgjICndyY7800KdoNKem0oMWKtIjXQuSTJFuWJvBVWkUajT8maNbv1+c46r6iFptd27m5Arzl9hqAh2deHqLxwRGqietcY737q7oRJzKRfA4MGycF8fKHEh8U5KupXTC7UXuESLWGA+bpWA6KNJ5CImAw2MWJXmsX9c="
1111

12+
before_install:
13+
  - npm install -g npm
14+
1215
before_script:
1316
  - npm install -g grunt-cli
1417
  - npm install -g bower

Gruntfile.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,11 @@ module.exports = (grunt) => {
77
grunt.registerTask('karma', 'karma runner', function() {
88
return karmaRunner('../../test/karma.conf.js', grunt)(this.async());
99
});
10+
grunt.registerTask("force", function(set) {
11+
if (set === "on") {
12+
grunt.option("force", true);
13+
} else if (set === "off") {
14+
grunt.option("force", false);
15+
}
16+
});
1017
};

README.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,28 @@
66

77
While we are grateful for all the original work at [tombatossals/angular-leaflet-directive](https://github.com/tombatossals/angular-leaflet-directive). We need to be able to operate as an organization to respond to issues, pull-requests and other various items quicker. We need to be able to add other developers as admins easier via group permissions via github orgs. Lastly this project needs to be more credible via being a group / org.
88

9+
## Master Branch State
10+
11+
Please note the master branch is currently in a "in-progress state" and is not suitable for use at this point. We are trying
12+
break up the library to be more unix / plugin like. This will reduce the burden of constant changes to the core repo (this repo)
13+
for each and every unforseeable plugin that leaflet has. Therefore, the new usage plugins will require developers (angular-ui or not)
14+
to create specific angular directives, services, factories, and etc to extend the main ui-leaflet directive. Where ui-leaflet
15+
would be the main dependency.
16+
17+
Examples:
18+
19+
- [ui-leaflet-draw](https://github.com/angular-ui/ui-leaflet-draw) leaflet draw implemented as a directive
20+
- [ui-leaflet-layers](https://github.com/elesdoar/ui-leaflet-layers) Most layer directive logic outsourced to support all random layer plugins.
21+
22+
How to extend:
23+
Create new directives, factories, and services specific to plugins. Use the decorator pattern to extend existing services, factories and directives. Specifically see [ui-leaflet-draw](https://github.com/angular-ui/ui-leaflet-draw) as it decorates ui-leaflet.
24+
25+
More about decorators:
26+
27+
- [Ben Nadel Decorating (Monkey Patching)](http://www.bennadel.com/blog/2775-monkey-patching-the-q-service-using-provide-decorator-in-angularjs.htm)
28+
- [Ben Nadel - Using Module.decorator() In AngularJS 1.4 (new way)](http://www.bennadel.com/blog/2870-using-module-decorator-in-angularjs-1-4.htm)
29+
- [Jesus Rodriguez - Experiment: Decorating Directives](http://angular-tips.com/blog/2013/09/experiment-decorating-directives/)
30+
931
## Goal
1032

1133
[AngularJS](http://angularjs.org/) directive for the [Leaflet](http://www.leafletjs.com/) Javascript
@@ -28,7 +50,7 @@ See https://angular-ui.github.com/ui-leaflet
2850

2951
## How to use it
3052

31-
Include [angular-simple-logger](https://github.com/nmccready/angular-simple-logger) before Angular-Leaflet js files. Logger gets installed as a requirement of Angular-Leaflet with `bower install` or `npm install`. Note if your using the browser to load it without CommonJS (browserify, webpack) please use angular-simple-logger.js (not index.js) .
53+
Include [angular-simple-logger](https://github.com/nmccready/angular-simple-logger) before Angular-Leaflet js files. Logger gets installed as a requirement of Angular-Leaflet with `bower install` or `npm install`. Note that if you're using the browser to load it without CommonJS (browserify, webpack) please use angular-simple-logger.js (not index.js).
3254

3355
Include the `ui-leaflet` dependency on your Angular module:
3456
```

bower.json

Lines changed: 73 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,75 @@
11
{
2-
"name": "ui-leaflet",
3-
"author": "https://github.com/angular-ui/ui-leaflet/graphs/contributors",
4-
"description": "ui-leaflet - An AngularJS directive to easily interact with Leaflet maps",
5-
"version": "1.0.0",
6-
"homepage": "http://angular-ui.github.io/ui-leaflet/",
7-
"keywords": [
8-
"angularjs",
9-
"javascript",
10-
"directive",
11-
"leaflet",
12-
"angular-ui"
13-
],
14-
"main": [
15-
"dist/ui-leaflet.js"
16-
],
17-
"resolutions": {
18-
"leaflet": "1.0.x"
19-
},
20-
"dependencies": {
21-
"angular": "1.x",
22-
"angular-simple-logger": "~0.1.4",
23-
"leaflet": "1.0.x"
24-
},
25-
"devDependencies": {
26-
"jquery": "*",
27-
"semantic-ui": "*",
28-
"bootstrap": "*",
29-
"prism": "*",
30-
"angular-route": "1.x",
31-
"angular-animate": "1.x",
32-
"angular-mocks": "1.x",
33-
"leaflet.markercluster": "Leaflet/Leaflet.markercluster#leaflet-master",
34-
"leaflet.draw": "*",
35-
"Leaflet.label": "*",
36-
"leaflet-tilelayer-geojson": "*",
37-
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
38-
"Leaflet.awesome-markers": "*",
39-
"leaflet-providers": "~1.1.5",
40-
"leaflet.vector-markers": "~0.0.3",
41-
"webgl-heatmap-leaflet": "*",
42-
"leaflet-plugins": "*",
43-
"esri-leaflet": "2.0.x",
44-
"proj4": "*",
45-
"font-awesome": "~4.3.x",
46-
"proj4leaflet": "*",
47-
"Leaflet.MakiMarkers": "*",
48-
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
49-
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
50-
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
51-
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
52-
"ionrangeslider": "~1.9.3",
53-
"leaflet-minimap": "~2.2.0",
54-
"esri-leaflet-clustered-feature-layer": "~1.0.x",
55-
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
56-
"leaflet-search": "~1.5.8",
57-
"highlightjs": "~8.8.0",
58-
"angular-highlightjs": "~0.4.3"
59-
},
60-
"ignoredDependencies": [
61-
"leaflet-dist"
62-
],
63-
"ignore": [
64-
"website/",
65-
"**/.*",
66-
"src",
67-
"doc",
68-
"examples",
69-
"test",
70-
"*.md",
71-
"Gruntfile.js",
72-
"package.json",
73-
"bower.json",
74-
"dist/coverage/"
75-
]
2+
"name": "ui-leaflet",
3+
"author": "https://github.com/angular-ui/ui-leaflet/graphs/contributors",
4+
"description": "ui-leaflet - An AngularJS directive to easily interact with Leaflet maps",
5+
"version": "1.0.0",
6+
"homepage": "http://angular-ui.github.io/ui-leaflet/",
7+
"keywords": [
8+
"angularjs",
9+
"javascript",
10+
"directive",
11+
"leaflet",
12+
"angular-ui"
13+
],
14+
"main": [
15+
"dist/ui-leaflet.js"
16+
],
17+
"dependencies": {
18+
"angular": "1.x",
19+
"angular-simple-logger": "~0.1.4",
20+
"leaflet": "~1.0.x"
21+
},
22+
"resolutions": {
23+
"angular": "~1.5.x",
24+
"leaflet": "1.0.x"
25+
},
26+
"devDependencies": {
27+
"jquery": "*",
28+
"semantic-ui": "*",
29+
"bootstrap": "*",
30+
"prism": "*",
31+
"angular-route": "1.x",
32+
"angular-animate": "1.x",
33+
"angular-mocks": "1.x",
34+
"leaflet.markercluster": "*",
35+
"leaflet.draw": "*",
36+
"Leaflet.label": "*",
37+
"leaflet-tilelayer-geojson": "*",
38+
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
39+
"Leaflet.awesome-markers": "*",
40+
"leaflet-providers": "~1.1.5",
41+
"leaflet.vector-markers": "0.0.4",
42+
"webgl-heatmap-leaflet": "*",
43+
"leaflet-plugins": "*",
44+
"esri-leaflet": "*",
45+
"proj4": "*",
46+
"font-awesome": "~4.3.x",
47+
"proj4leaflet": "*",
48+
"Leaflet.MakiMarkers": "*",
49+
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
50+
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
51+
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
52+
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
53+
"leaflet-minimap": "~2.2.0",
54+
"esri-leaflet-clustered-feature-layer": "~1.0.x",
55+
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
56+
"leaflet-search": "~1.5.8",
57+
"highlightjs": "~8.8.0",
58+
"angular-highlightjs": "~0.4.3"
59+
},
60+
"ignore": [
61+
"dist/coverage/",
62+
"dist/src/",
63+
"website/",
64+
"**/.*",
65+
"src",
66+
"doc",
67+
"examples",
68+
"test",
69+
"*.md",
70+
"Gruntfile.js",
71+
"package.json",
72+
"dist/coverage/",
73+
"logo.svg"
74+
]
7675
}

0 commit comments

Comments
 (0)