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

leafletDraw #184

Closed
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ root = true

# Change these settings to your own preference
indent_style = space
indent_size = 4
indent_size = 2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Start using 2 space indent. I'll fix it as I go; or I can do all the files in another follow up PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Editors tend to pick what's around, so it might be good idea to do one massive PR instead of leaving mixed styles behind.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Id rather not do all of it right now as it makes it even harder to review. Ill do it immediately after this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, absolutely, indentation PR has to have only spaces changed and nothing else.

We had this with Meanjs and it was good to watch for a moment with minimum amount of PR's pending.

# We recommend you to keep these unchanged
end_of_line = lf
Expand Down
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
4 changes: 2 additions & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"node": true,
"browser": true,
"esnext": true,
"browser": true,
"bitwise": true,
"curly": false,
"eqeqeq": true,
"immed": true,
"indent": 4,
"indent": 2,
"latedef": true,
"newcap": true,
"noarg": true,
Expand Down
2 changes: 2 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
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
9 changes: 7 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
global._ = require('lodash');

module.exports = function (grunt) {
require('load-grunt-config')(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());
});
};
2 changes: 2 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
"angular-highlightjs": "~0.4.3"
},
"ignore": [
"dist/coverage/",
"dist/src/",
"website/",
"**/.*",
"src",
Expand Down
2 changes: 1 addition & 1 deletion coffeelint.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"indentation": {
"name": "indentation",
"value": 4,
"value": 2,
"level": "error"
},
"camel_case_classes": {
Expand Down
Loading