Skip to content

Commit

Permalink
Merge pull request #58 from neocotic/develop
Browse files Browse the repository at this point in the history 
2.1.0 WIP
  • Loading branch information
@neocotic
neocotic authored Oct 4, 2016
2 parents 1ffd092 + 7236d44 commit 9184ca2
Show file tree
Hide file tree
Showing 31 changed files with 5,699 additions and 2,818 deletions.
13 changes: 13 additions & 0 deletions .babelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"plugins": [
"transform-runtime"
],
"presets": [
[
"es2015",
{
"modules": false
}
]
]
}
325 changes: 9 additions & 316 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,333 +1,26 @@
{
"extends": "skelp/v3/es6",
"env": {
"browser": true,
"es6": true,
"node": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"rules": {
"arrow-parens": [
2,
"always"
"max-params": [
"error",
5
],
"arrow-spacing": [
2,
{
"before": true,
"after": true
}
],
"constructor-super": 2,
"generator-star-spacing": [
2,
{
"before": true,
"after": false
}
],
"no-class-assign": 2,
"no-const-assign": 2,
"no-dupe-class-members": 2,
"no-this-before-super": 2,
"no-var": 2,
"object-shorthand": [
1,
"always"
],
"prefer-arrow-callback": 2,
"prefer-const": 0,
"prefer-spread": 0,
"prefer-reflect": 0,
"prefer-template": 1,
"require-yield": 0,
"comma-dangle": [
2,
"never"
],
"no-cond-assign": [
2,
"except-parens"
],
"no-console": 0,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty": 2,
"no-ex-assign": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 2,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-sparse-arrays": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"block-scoped-var": 0,
"complexity": [
1,
6
],
"consistent-return": 2,
"curly": 2,
"default-case": 0,
"dot-notation": [
2,
{
"allowKeywords": true,
"allowPattern": ""
}
],
"dot-location": [
2,
"property"
],
"eqeqeq": [
2,
"allow-null"
],
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-div-regex": 2,
"no-else-return": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new": 2,
"no-octal-escape": 2,
"no-octal": 0,
"no-param-reassign": 0,
"no-process-env": 0,
"no-proto": 2,
"no-redeclare": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unused-expressions": 2,
"no-void": 2,
"no-warning-comments": 1,
"no-with": 2,
"radix": 2,
"vars-on-top": 0,
"wrap-iife": [
2,
"inside"
],
"yoda": 0,
"strict": [
2,
"safe"
],
"no-catch-shadow": 0,
"no-delete-var": 2,
"no-label-var": 2,
"no-shadow-restricted-names": 2,
"no-shadow": 0,
"no-undef-init": 2,
"no-undef": 2,
"no-undefined": 2,
"no-bitwise": "off",
"no-unused-vars": [
1,
{
"vars": "all",
"args": "after-used"
}
],
"no-use-before-define": [
2,
"nofunc"
],
"handle-callback-err": [
2,
"^(err|error)$"
],
"no-mixed-requires": [
1,
true
],
"no-new-require": 2,
"no-path-concat": 2,
"no-process-exit": 2,
"no-restricted-modules": 0,
"no-sync": 2,
"brace-style": [
2,
"1tbs",
{
"allowSingleLine": false
}
],
"camelcase": [
2,
{
"properties": "always"
}
],
"comma-spacing": [
2,
{
"before": false,
"after": true
}
],
"comma-style": [
2,
"last"
],
"consistent-this": 0,
"eol-last": 0,
"func-names": 0,
"func-style": 0,
"indent": [
2,
2
],
"key-spacing": [
2,
{
"beforeColon": false,
"afterColon": true
}
],
"linebreak-style": [
2,
"unix"
],
"max-nested-callbacks": [
2,
3
],
"new-cap": [
2,
"warn",
{
"newIsCap": true,
"capIsNew": true
"args": "none"
}
],
"new-parens": 2,
"newline-after-var": 0,
"no-array-constructor": 2,
"no-continue": 0,
"no-inline-comments": 2,
"no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": 2,
"no-nested-ternary": 2,
"no-new-object": 2,
"no-spaced-func": 2,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-underscore-dangle": 0,
"no-unneeded-ternary": 2,
"one-var": [
2,
"never"
],
"operator-assignment": [
2,
"always"
],
"operator-linebreak": [
2,
"after"
],
"padded-blocks": [
2,
"never"
],
"quote-props": [
2,
"as-needed"
],
"quotes": [
2,
"single"
],
"semi-spacing": [
2,
{
"before": false,
"after": true
}
],
"semi": [
2,
"never"
],
"sort-vars": 0,
"keyword-spacing": [
2,
{
"before": true,
"after": true
}
],
"space-before-blocks": [
2,
"always"
],
"space-before-function-paren": [
2,
"never"
],
"object-curly-spacing": [
2,
"always"
],
"computed-property-spacing": [
2,
"never"
],
"array-bracket-spacing": [
2,
"always"
],
"space-in-parens": [
2,
"never"
],
"space-infix-ops": 2,
"space-unary-ops": [
2,
{
"words": true,
"nonwords": false
}
],
"spaced-comment": [
2,
"always"
],
"wrap-regex": 0
"prefer-reflect": "off",
"sort-keys": "off"
}
}
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: node_js
node_js:
- "0.10"
- "0.12"
- "4.0"
- "6.0"
- "4"
- "6"
script:
- npm test
env:
Expand Down
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Version 2.1.0, 2016.10.04

* Allow `padding` to be set explicitly [#44](https://github.com/neocotic/qrious/issues/44)
* Fix support for older browsers [#55](https://github.com/neocotic/qrious/issues/55)
* Update code style to fit with other projects
* Update build system to run on older Node.js versions at a reduced capacity

## Version 2.0.2, 2016.08.05

* Fix bug where mask is incorrectly applied [#50](https://github.com/neocotic/qrious/issues/50)
Expand Down
Loading

0 comments on commit 9184ca2

Please sign in to comment.