linting

AdFabConnect · Oct 2, 2016 · 865d41b · 865d41b
1 parent 7c320c7
commit 865d41b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/cli/core/config/config.js b/src/cli/core/config/config.js
@@ -17,7 +17,7 @@ var loadLocalConfig = (result) => {
         stat = fse.statSync(website + '/abe.json')
         if (stat) {
           var json = fse.readJsonSync(website + '/abe.json')
-          var result = extend(true, result, json)
+          result = extend(true, result, json)
         }
       }catch(e) {
         if (!hintAbeJson) {
@@ -30,7 +30,9 @@ var loadLocalConfig = (result) => {
         }
       }
     }
-  }catch(e){}
+  }catch(e){
+    console.log('LoadConfig Error')
+  }
 }
 
 loadLocalConfig(result)
@@ -58,17 +60,6 @@ result.getDefault = (conf) => {
 }
 
 result.get = (conf, file) => {
-  return result.exist(conf, result)
-
-  if(typeof file !== 'undefined' && file !== null && file !== '') {
-    var website = file.replace(result.root, '')
-    website = website.split('/')[0]
-
-    var websiteConf = result.exist(conf, result.websites[website])
-    if(websiteConf !== false) {
-      return websiteConf
-    }
-  }
 
   return result.exist(conf, result)
 }

diff --git a/src/cli/helpers/file-parser.js b/src/cli/helpers/file-parser.js
@@ -312,7 +312,7 @@ export default class FileParser {
         var name1 = entry.name1 ? entry.name1 : ''
         var name2 = entry.name2 ? entry.name2 : ''
 
-        let exclude =  new RegExp(config.files.exclude);
+        let exclude =  new RegExp(config.files.exclude)
         if(!exclude.test(name1) && !exclude.test(name2) && entry.type1 !== 'directory' && entry.type2 !== 'directory') {
 
           if(typeof entry.path1 !== 'undefined' && entry.path1 !== null) {