Updated code style

bem · Nov 8, 2014 · 3ef8dbd · 3ef8dbd
1 parent 3261cdd
commit 3ef8dbd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,6 +1,5 @@
 {
     "bitwise": true,
-    "curly": true,
     "eqeqeq": true,
     "es3": true,
     "forin": true,

diff --git a/lib/bem-naming.js b/lib/bem-naming.js
@@ -56,28 +56,18 @@ BEMNaming.prototype.typeOf = function (obj) {
         obj = this.parse(obj);
     }
 
-    if (!obj || !obj.block) { return; }
+    if (!obj || !obj.block) return;
 
     var hasModVal = obj.hasOwnProperty('modVal'),
         isMod = obj.modName && (!hasModVal || obj.modVal);
 
     if (obj.elem) {
-        if (isMod) {
-            return TYPES.ELEM_MOD;
-        }
-
-        if (!hasModVal) {
-            return TYPES.ELEM;
-        }
+        if (isMod) return TYPES.ELEM_MOD;
+        if (!hasModVal) return TYPES.ELEM;
     }
 
-    if (isMod) {
-        return TYPES.BLOCK_MOD;
-    }
-
-    if (!hasModVal) {
-        return TYPES.BLOCK;
-    }
+    if (isMod) return TYPES.BLOCK_MOD;
+    if (!hasModVal) return TYPES.BLOCK;
 };
 
 /**
@@ -129,9 +119,7 @@ BEMNaming.prototype.isElemMod = function (obj) {
 BEMNaming.prototype.parse = function (str) {
     var executed = this._regex.exec(str);
 
-    if (!executed) {
-        return undefined;
-    }
+    if (!executed) return;
 
     var elem = executed[5],
         modName = executed[2] || executed[6],

diff --git a/test/.jshintrc b/test/.jshintrc
@@ -1,6 +1,5 @@
 {
     "bitwise": true,
-    "curly": true,
     "eqeqeq": true,
     "forin": true,
     "freeze": true,