add eslint

zhuzujie · Jul 27, 2016 · ca07275 · ca07275
1 parent 2036a6e
commit ca07275
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/.eslintrc.json 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
@@ -23,7 +23,7 @@
 
 /**
  * !#en WebView event type
- * !#zh 网页视图加载事件类型
+ * !#zh 网页视图事件类型
  * @enum WebView.EventType
  */
 var EventType = _ccsg.WebView.EventType;