Skip to content

Commit

Permalink
upgrade eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Mar 4, 2016
1 parent 3925f38 commit df42f8b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 190 deletions.
185 changes: 8 additions & 177 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,183 +1,14 @@
{
"env": {
"browser": true,
"node": true
},

"plugins": ["html"],
"extends": "standard",
"plugins": [
"html"
],
"globals": {
"chrome": true,
"bridge": true
},

"ecmaFeatures": {
"arrowFunctions": true,
"destructuring": true,
"classes": true,
"defaultParams": true,
"blockBindings": true,
"modules": true,
"objectLiteralComputedProperties": true,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"restParams": true,
"spread": true,
"templateStrings": true
"bridge": true,
"chrome": true
},

"rules": {
"accessor-pairs": 2,
"array-bracket-spacing": 0,
"block-scoped-var": 0,
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"camelcase": 0,
"comma-dangle": [2, "never"],
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"complexity": 0,
"computed-property-spacing": 0,
"consistent-return": 0,
"consistent-this": 0,
"constructor-super": 2,
"curly": [2, "multi-line"],
"default-case": 0,
"dot-location": [2, "property"],
"dot-notation": 0,
"eol-last": 2,
"eqeqeq": [2, "allow-null"],
"func-names": 0,
"func-style": 0,
"generator-star-spacing": [2, { "before": true, "after": true }],
"guard-for-in": 0,
"handle-callback-err": [2, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"linebreak-style": 0,
"lines-around-comment": 0,
"max-nested-callbacks": 0,
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"newline-after-var": 0,
"no-alert": 0,
"no-array-constructor": 2,
"no-caller": 2,
"no-catch-shadow": 0,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 0,
"no-continue": 0,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-else-return": 0,
"no-empty": 0,
"no-empty-character-class": 2,
"no-empty-label": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 0,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-inline-comments": 0,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-lonely-if": 0,
"no-loop-func": 0,
"no-mixed-requires": 0,
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 0,
"no-new": 2,
"no-new-func": 0,
"no-new-object": 2,
"no-new-require": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 0,
"no-path-concat": 0,
"no-process-env": 0,
"no-process-exit": 0,
"no-proto": 0,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 0,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-this-before-super": 2,
"no-throw-literal": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 0,
"no-underscore-dangle": 0,
"no-unexpected-multiline": 2,
"no-unneeded-ternary": 2,
"no-unreachable": 2,
"no-unused-expressions": 0,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-use-before-define": 0,
"no-var": 0,
"no-void": 0,
"no-warning-comments": 0,
"no-with": 2,
"object-curly-spacing": 0,
"object-shorthand": 0,
"one-var": [2, { "initialized": "never" }],
"operator-assignment": 0,
"operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
"padded-blocks": 0,
"prefer-const": 0,
"quote-props": 0,
"quotes": [2, "single", "avoid-escape"],
"radix": 2,
"semi": [2, "never"],
"semi-spacing": 0,
"sort-vars": 0,
"space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "always"],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
"strict": 0,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": [2, "any"],
"wrap-regex": 0,
"yoda": [2, "never"]
"arrow-parens": [2, "as-needed"],
"standard/object-curly-even-spacing": 0
}
}
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@
"babel-runtime": "^5.8.0",
"cross-env": "^1.0.5",
"css-loader": "^0.23.0",
"eslint": "^1.8.0",
"eslint": "^2.0.0",
"eslint-config-standard": "^5.1.0",
"eslint-plugin-promise": "^1.0.8",
"eslint-plugin-standard": "^1.3.2",
"eslint-plugin-html": "^1.1.0",
"file-loader": "^0.8.4",
"stylus-loader": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion shells/chrome/src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const ports = {}

chrome.runtime.onConnect.addListener((port) => {
chrome.runtime.onConnect.addListener(port => {
let tab
let name
if (isNumeric(port.name)) {
Expand Down
1 change: 0 additions & 1 deletion src/backend/hook.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*/

export function installHook (window) {

let listeners = {}

const hook = {
Expand Down
4 changes: 2 additions & 2 deletions src/devtools/components/ComponentInspector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ export default {
if (!this.hasTarget) return
if (isChrome) {
chrome.devtools.inspectedWindow.eval(
`inspect(window.__VUE_DEVTOOLS_INSTANCE_MAP__.get(${ this.target.id }).$el)`
`inspect(window.__VUE_DEVTOOLS_INSTANCE_MAP__.get(${this.target.id}).$el)`
)
} else {
alert('DOM inspection is not supported in this shell.')
window.alert('DOM inspection is not supported in this shell.')
}
},
sendToConsole () {
Expand Down
14 changes: 7 additions & 7 deletions src/devtools/components/ComponentInstance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
</template>

<script>
const expansionMap = {}
export default {
name: 'ComponentInstance',
props: {
Expand Down Expand Up @@ -83,11 +81,13 @@ export default {
}
function getInstanceHeight (instance, expansionMap) {
return expansionMap[instance.id]
? Number(instance.children.map(child => {
return getInstanceHeight(child, expansionMap)
})) + 22
: 0
if (expansionMap[instance.id]) {
return Number(instance.children.map(child => {
return getInstanceHeight(child, expansionMap)
})) + 22
} else {
return 0
}
}
</script>

Expand Down
1 change: 0 additions & 1 deletion src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export function stringify (data) {
*/

function sanitize (data) {
let ret
if (
!isPrimitive(data) &&
!Array.isArray(data) &&
Expand Down

0 comments on commit df42f8b

Please sign in to comment.