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

issue 185 babel, karma, and indent fixes #187

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Thumbs.db
# ===========
dist/ui-leaflet.pre.js
dist/coverage/
dist/src/
js/angular-leaflet-directive-webpage.ngmin.js

# Related ecosystem
Expand Down
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"node": true,
"browser": true,
"esnext": true,
"browser": true,
"bitwise": true,
"curly": false,
"eqeqeq": true,
Expand Down
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Thumbs.db

# Project
# ===========
dist/coverage/
dist/src/
dist/ui-leaflet.pre.js
js/angular-leaflet-directive-webpage.ngmin.js

Expand Down Expand Up @@ -44,3 +46,4 @@ package.json
bower.json

dist/coverage/
logo.svg
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "0.10"
- "4"

env:
global:
Expand All @@ -13,6 +13,6 @@ before_script:
  - npm install -g grunt-cli
  - npm install -g bower
- bower install --config.interactive=false

notifications:
slack: ng-leaflet:DYS8q20K3um7RVFU8D8yGCIq
7 changes: 6 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
global._ = require('lodash');

module.exports = function (grunt) {
const karmaRunner = require('./grunt/utils/karma');

module.exports = (grunt) => {
require('load-grunt-config')(grunt);
grunt.registerTask('karma', 'karma runner', function() {
return karmaRunner('../../test/karma.conf.js', grunt)(this.async());
});
};
139 changes: 71 additions & 68 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,70 +1,73 @@
{
"name": "ui-leaflet",
"author": "https://github.com/angular-ui/ui-leaflet/graphs/contributors",
"description": "ui-leaflet - An AngularJS directive to easily interact with Leaflet maps",
"version": "1.0.0",
"homepage": "http://angular-ui.github.io/ui-leaflet/",
"keywords": [
"angularjs",
"javascript",
"directive",
"leaflet",
"angular-ui"
],
"main": [
"dist/ui-leaflet.js"
],
"dependencies": {
"angular": "1.x",
"angular-simple-logger": "~0.1.4",
"leaflet": "0.7.x"
},
"devDependencies": {
"jquery": "*",
"semantic-ui": "*",
"bootstrap": "*",
"prism": "*",
"angular-route": "1.x",
"angular-animate": "1.x",
"angular-mocks": "1.x",
"leaflet.markercluster": "*",
"leaflet.draw": "*",
"Leaflet.label": "*",
"leaflet-tilelayer-geojson": "*",
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
"Leaflet.awesome-markers": "*",
"leaflet-providers": "~1.1.5",
"leaflet.vector-markers": "~0.0.3",
"webgl-heatmap-leaflet": "*",
"leaflet-plugins": "*",
"esri-leaflet": "*",
"proj4": "*",
"font-awesome": "~4.3.x",
"proj4leaflet": "*",
"Leaflet.MakiMarkers": "*",
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
"ionrangeslider": "~1.9.3",
"leaflet-minimap": "~2.2.0",
"esri-leaflet-clustered-feature-layer": "~1.0.x",
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
"leaflet-search": "~1.5.8",
"highlightjs": "~8.8.0",
"angular-highlightjs": "~0.4.3"
},
"ignore": [
"website/",
"**/.*",
"src",
"doc",
"examples",
"test",
"*.md",
"Gruntfile.js",
"package.json",
"bower.json",
"dist/coverage/"
]
"name": "ui-leaflet",
"author": "https://github.com/angular-ui/ui-leaflet/graphs/contributors",
"description": "ui-leaflet - An AngularJS directive to easily interact with Leaflet maps",
"version": "1.0.0",
"homepage": "http://angular-ui.github.io/ui-leaflet/",
"keywords": [
"angularjs",
"javascript",
"directive",
"leaflet",
"angular-ui"
],
"main": [
"dist/ui-leaflet.js"
],
"dependencies": {
"angular": "1.x",
"angular-simple-logger": "~0.1.4",
"leaflet": "0.7.x"
},
"devDependencies": {
"jquery": "*",
"semantic-ui": "*",
"bootstrap": "*",
"prism": "*",
"angular-route": "1.x",
"angular-animate": "1.x",
"angular-mocks": "1.x",
"leaflet.markercluster": "*",
"leaflet.draw": "*",
"Leaflet.label": "*",
"leaflet-tilelayer-geojson": "*",
"Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
"Leaflet.awesome-markers": "*",
"leaflet-providers": "~1.1.5",
"leaflet.vector-markers": "~0.0.3",
"webgl-heatmap-leaflet": "*",
"leaflet-plugins": "*",
"esri-leaflet": "*",
"proj4": "*",
"font-awesome": "~4.3.x",
"proj4leaflet": "*",
"Leaflet.MakiMarkers": "*",
"Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
"Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
"Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",
"Leaflet.PolylineDecorator": "bbecquet/Leaflet.PolylineDecorator",
"ionrangeslider": "~1.9.3",
"leaflet-minimap": "~2.2.0",
"esri-leaflet-clustered-feature-layer": "~1.0.x",
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
"leaflet-search": "~1.5.8",
"highlightjs": "~8.8.0",
"angular-highlightjs": "~0.4.3"
},
"ignore": [
"dist/coverage/",
"dist/src/",
"website/",
"**/.*",
"src",
"doc",
"examples",
"test",
"*.md",
"Gruntfile.js",
"package.json",
"bower.json",
"dist/coverage/",
"logo.svg"
]
}
2 changes: 1 addition & 1 deletion coffeelint.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"colon_assignment_spacing": {
"name": "colon_assignment_spacing",
"level": "warn",
"level": "ignore",
"spacing": {
"left": 0,
"right": 1
Expand Down
Loading