Skip to content

Commit fd15ade

Browse files
committed
fix eslint issues
remove unneeded submodules
1 parent abeddbd commit fd15ade

20 files changed

Lines changed: 1045 additions & 1075 deletions

.eslintrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parserOptions": {
3-
//xx "ecmaVersion": 6
3+
"ecmaVersion": 6
44
},
55
"extends": [
66
// "standard"
@@ -15,7 +15,10 @@
1515
"rules": {
1616
"no-var": ["error"],
1717
"quotes": ["error", "double"],
18-
"indent": ["error", 4],
18+
"indent": [
19+
"error",
20+
4
21+
]
1922
/*
2023
"padded-blocks": ["error", "always"],
2124
"arrow-parens": [2, "as-needed", {"requireForBlockBody": true }],

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[submodule "sample/3rdparties/dropzone"]
2-
path = sample/3rdparties/dropzone
3-
url = http://github.com/enyo/dropzone.git
4-
[submodule "oce"]
5-
path = oce
6-
url = http://github.com/tpaviot/oce.git

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
- TRAVIS_NODE_VERSION="7"
1616
#- TRAVIS_NODE_VERSION="7" ARCH="x86"
1717
#- TRAVIS_ELECTRON_VERSION="1.4.14" TRAVIS_NODE_VERSION="6"
18+
- TRAVIS_NODE_VERSION="8"
1819

1920
matrix:
2021
exclude:
@@ -24,6 +25,8 @@ matrix:
2425
env: TRAVIS_NODE_VERSION="6" ARCH="x86"
2526
- os: osx
2627
env: TRAVIS_NODE_VERSION="7"
28+
- os: osx
29+
env: TRAVIS_NODE_VERSION="8"
2730
#- os: osx
2831
# env: TRAVIS_NODE_VERSION="7" ARCH="x86"
2932

Gruntfile.js

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,31 @@
1-
module.exports = function(grunt) {
2-
// Do grunt-related things in here
3-
grunt.initConfig({
4-
pkg: grunt.file.readJSON('package.json'),
1+
module.exports = function (grunt) {
2+
// Do grunt-related things in here
3+
grunt.initConfig({
4+
pkg: grunt.file.readJSON("package.json"),
55

6-
jshint: {
7-
files: ['Gruntfile.js', 'lib/**/*.js', 'test/**/*.js'],
8-
options: {
9-
// options here to override JSHint defaults
10-
globals: {
11-
jQuery: true,
12-
console: true,
13-
module: true,
14-
document: true
15-
}
16-
}
17-
},
18-
19-
20-
21-
mochacli: {
22-
options: {
23-
//reporter: 'nyan'
24-
reporter: 'spec'
25-
},
26-
all: ['test/**/*_test.js']
6+
mochacli: {
7+
options: {
8+
//reporter: "nyan"
9+
reporter: "spec"
10+
},
11+
all: ["test/**/*_test.js"]
2712

28-
},
13+
},
2914

15+
docco: {
16+
debug: {
17+
src: ["lib/*.js", "test/**/*.js"],
18+
options: {
19+
output: "docs/"
20+
}
21+
}
3022

31-
concat: {
32-
options: {
33-
separator: ';'
34-
},
35-
dist: {
36-
src: ['lib/**/*.js'],
37-
dest: 'dist/<%= pkg.name %>.js'
38-
}
39-
40-
},
41-
uglify: {
42-
options: {
43-
// the banner is inserted at the top of the output
44-
banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
45-
},
46-
dist: {
47-
files: {
48-
'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
49-
}
5023
}
51-
},
52-
53-
docco: {
54-
debug: {
55-
src: ['lib/*.js','test/**/*.js'],
56-
options: {
57-
output: 'docs/'
58-
}
59-
}
60-
61-
}
62-
});
63-
64-
grunt.loadNpmTasks('grunt-contrib-uglify');
65-
grunt.loadNpmTasks('grunt-contrib-concat');
66-
grunt.loadNpmTasks('grunt-contrib-jshint');
67-
grunt.loadNpmTasks('grunt-mocha-cli');
68-
grunt.loadNpmTasks('grunt-docco');
69-
grunt.registerTask('doc', ['docco']);
24+
});
25+
grunt.loadNpmTasks("grunt-mocha-cli");
26+
grunt.loadNpmTasks("grunt-docco");
27+
grunt.registerTask("doc", ["docco"]);
7028

71-
grunt.registerTask('default', ['jshint','mochacli','concat','uglify']);// ['jshint', 'qunit', 'concat', 'uglify']);
29+
grunt.registerTask("default", ["mochacli", "doc"]);
7230
};
7331

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ clone_folder: c:\projects\node-occ
7272
clone_depth: 5
7373

7474
matrix:
75-
fast_finish: true
75+
fast_finish: false
7676
allow_failures:
7777
- nodejs_version: 7
7878

lib/bindings.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const binary = require('node-pre-gyp');
2-
const path = require('path');
3-
const bindingPath = binary.find(path.resolve(path.join(__dirname, '../package.json')));
1+
const binary = require("node-pre-gyp");
2+
const path = require("path");
3+
const bindingPath = binary.find(path.resolve(path.join(__dirname, "../package.json")));
44
const binding = require(bindingPath);
5-
module.exports = binding;// was require('../build/Release/occ');
6-
//xx module.exports = require('../build/Debug/occ');
5+
module.exports = binding;// was require("../build/Release/occ");
6+
//xx module.exports = require("../build/Debug/occ");

0 commit comments

Comments
 (0)