diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000000..acc0572d311 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,24 @@ +{ + "extends": "eslint:recommended", + "rules": { + "comma-dangle": 0, + "no-console": 0, + "no-constant-condition": 0, + "semi": 1 + }, + "env": { + "browser": true, + "node": true, + "es6": true, + "mocha": true + }, + "plugins": [ + ], + "globals": { + "cc": false, + "CC_EDITOR": false, + "CC_DEV": false, + "CC_JSB": false, + "_ccsg": false + } +} diff --git a/cocos2d/core/components/CCWebView.js b/cocos2d/core/components/CCWebView.js index 6049f31c355..cddc3c8274e 100644 --- a/cocos2d/core/components/CCWebView.js +++ b/cocos2d/core/components/CCWebView.js @@ -23,7 +23,7 @@ /** * !#en WebView event type - * !#zh 网页视图加载事件类型 + * !#zh 网页视图事件类型 * @enum WebView.EventType */ var EventType = _ccsg.WebView.EventType;