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

Commit 7b0de23

Browse files
committed
Merge pull request #187 from realtymaps/dev/nmccready/issue_185_babel_indent_karma
issue 185 babel, karma, and indent fixes
2 parents 09b9298 + 2a83b1f commit 7b0de23

39 files changed

+3216
-3726
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Thumbs.db
77
# ===========
88
dist/ui-leaflet.pre.js
99
dist/coverage/
10+
dist/src/
1011
js/angular-leaflet-directive-webpage.ngmin.js
1112

1213
# Related ecosystem

.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"node": true,
3-
"browser": true,
43
"esnext": true,
4+
"browser": true,
55
"bitwise": true,
66
"curly": false,
77
"eqeqeq": true,

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Thumbs.db
55

66
# Project
77
# ===========
8+
dist/coverage/
9+
dist/src/
810
dist/ui-leaflet.pre.js
911
js/angular-leaflet-directive-webpage.ngmin.js
1012

@@ -44,3 +46,4 @@ package.json
4446
bower.json
4547

4648
dist/coverage/
49+
logo.svg

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22

33
node_js:
4-
- "0.10"
4+
- "4"
55

66
env:
77
global:
@@ -13,6 +13,6 @@ before_script:
1313
  - npm install -g grunt-cli
1414
  - npm install -g bower
1515
- bower install --config.interactive=false
16-
16+
1717
notifications:
1818
slack: ng-leaflet:DYS8q20K3um7RVFU8D8yGCIq

Gruntfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
global._ = require('lodash');
22

3-
module.exports = function (grunt) {
3+
const karmaRunner = require('./grunt/utils/karma');
4+
5+
module.exports = (grunt) => {
46
require('load-grunt-config')(grunt);
7+
grunt.registerTask('karma', 'karma runner', function() {
8+
return karmaRunner('../../test/karma.conf.js', grunt)(this.async());
9+
});
510
};

bower.json

Lines changed: 71 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,73 @@
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-
"dependencies": {
18-
"angular": "1.x",
19-
"angular-simple-logger": "~0.1.4",
20-
"leaflet": "0.7.x"
21-
},
22-
"devDependencies": {
23-
"jquery": "*",
24-
"semantic-ui": "*",
25-
"bootstrap": "*",
26-
"prism": "*",
27-
"angular-route": "1.x",
28-
"angular-animate": "1.x",
29-
"angular-mocks": "1.x",
30-
"leaflet.markercluster": "*",
31-
"leaflet.draw": "*",
32-
"Leaflet.label": "*",
33-
"leaflet-tilelayer-geojson": "*",
34-
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
35-
"Leaflet.awesome-markers": "*",
36-
"leaflet-providers": "~1.1.5",
37-
"leaflet.vector-markers": "~0.0.3",
38-
"webgl-heatmap-leaflet": "*",
39-
"leaflet-plugins": "*",
40-
"esri-leaflet": "*",
41-
"proj4": "*",
42-
"font-awesome": "~4.3.x",
43-
"proj4leaflet": "*",
44-
"Leaflet.MakiMarkers": "*",
45-
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
46-
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
47-
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
48-
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
49-
"ionrangeslider": "~1.9.3",
50-
"leaflet-minimap": "~2.2.0",
51-
"esri-leaflet-clustered-feature-layer": "~1.0.x",
52-
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
53-
"leaflet-search": "~1.5.8",
54-
"highlightjs": "~8.8.0",
55-
"angular-highlightjs": "~0.4.3"
56-
},
57-
"ignore": [
58-
"website/",
59-
"**/.*",
60-
"src",
61-
"doc",
62-
"examples",
63-
"test",
64-
"*.md",
65-
"Gruntfile.js",
66-
"package.json",
67-
"bower.json",
68-
"dist/coverage/"
69-
]
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": "0.7.x"
21+
},
22+
"devDependencies": {
23+
"jquery": "*",
24+
"semantic-ui": "*",
25+
"bootstrap": "*",
26+
"prism": "*",
27+
"angular-route": "1.x",
28+
"angular-animate": "1.x",
29+
"angular-mocks": "1.x",
30+
"leaflet.markercluster": "*",
31+
"leaflet.draw": "*",
32+
"Leaflet.label": "*",
33+
"leaflet-tilelayer-geojson": "*",
34+
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
35+
"Leaflet.awesome-markers": "*",
36+
"leaflet-providers": "~1.1.5",
37+
"leaflet.vector-markers": "~0.0.3",
38+
"webgl-heatmap-leaflet": "*",
39+
"leaflet-plugins": "*",
40+
"esri-leaflet": "*",
41+
"proj4": "*",
42+
"font-awesome": "~4.3.x",
43+
"proj4leaflet": "*",
44+
"Leaflet.MakiMarkers": "*",
45+
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
46+
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
47+
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
48+
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
49+
"ionrangeslider": "~1.9.3",
50+
"leaflet-minimap": "~2.2.0",
51+
"esri-leaflet-clustered-feature-layer": "~1.0.x",
52+
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
53+
"leaflet-search": "~1.5.8",
54+
"highlightjs": "~8.8.0",
55+
"angular-highlightjs": "~0.4.3"
56+
},
57+
"ignore": [
58+
"dist/coverage/",
59+
"dist/src/",
60+
"website/",
61+
"**/.*",
62+
"src",
63+
"doc",
64+
"examples",
65+
"test",
66+
"*.md",
67+
"Gruntfile.js",
68+
"package.json",
69+
"bower.json",
70+
"dist/coverage/",
71+
"logo.svg"
72+
]
7073
}

coffeelint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"colon_assignment_spacing": {
4444
"name": "colon_assignment_spacing",
45-
"level": "warn",
45+
"level": "ignore",
4646
"spacing": {
4747
"left": 0,
4848
"right": 1

0 commit comments

Comments
 (0)