Merge b6a3378 into 7947ae6

bem · Mar 5, 2015 · c34d227 · c34d227
2 parents 7947ae6 + b6a3378
commit c34d227
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 51 deletions.
diff --git a/.bem/techs/bemhtml.js b/.bem/techs/bemhtml.js
@@ -20,7 +20,7 @@ exports.techMixin = {
 
     getBuildResultChunk : function(relPath, path, suffix) {
         var content = this.readContent(path, suffix);
-        return (suffix !== 'bemhtml.xjst' ?
+        return (suffix !== 'bemhtml.xjst'?
             content.then(function(source) { return compat.transpile(source); }) :
             content)
                 .then(function(source) {
@@ -62,7 +62,7 @@ exports.techMixin = {
         var tmpl = ['block(\'{{bemBlockName}}\')'];
 
         vars.ElemName && tmpl.push('.elem(\'{{bemElemName}}\')');
-        vars.ModVal && tmpl.push('.' + (vars.ElemName ? 'elemMod' : 'mod') + '(\'{{bemModName}}\', \'{{bemModVal}}\')');
+        vars.ModVal && tmpl.push('.' + (vars.ElemName? 'elemMod' : 'mod') + '(\'{{bemModName}}\', \'{{bemModVal}}\')');
 
         return Template.process(tmpl.join(''), vars);
     },

diff --git a/.jscs.json b/.jscs.json
@@ -1,4 +1,7 @@
 {
+    "plugins": ["jscs-bem"],
+    "preset": "bem",
+
     "excludeFiles": [
         ".bem/cache/**",
         ".enb/tmp/**",
@@ -14,29 +17,7 @@
         "common.blocks/inherit/**",
         "common.blocks/ecma/__array/ecma__array.spec.js",
         "common.blocks/jquery/__event/_type/jquery__event_type_pointerclick.js",
-        "common.blocks/jquery/__event/_type/jquery__event_type_pointer.js",
-        "common.blocks/jquery/__event/_type/jquery__event_type_pointerpressrelease.js"
+        "*.docs/**/*.bemdecl.js"
     ],
-    "fileExtensions": [".js", ".bemtree", ".bemhtml"],
-    "requireSpaceAfterKeywords": ["do", "else"],
-    "disallowSpaceAfterKeywords": ["if", "for", "while", "switch"],
-    "disallowSpacesInFunctionExpression": {
-        "beforeOpeningRoundBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "requireSpacesInsideObjectBrackets": "all",
-    "requireSpaceAfterObjectKeys": true,
-    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
-    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-    "disallowSpaceBeforeBinaryOperators": [","],
-    "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-    "requireSpaceAfterBinaryOperators": [",", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-    "disallowKeywords": ["with"],
-    "disallowKeywordsOnNewLine": ["else"],
-    "requireLineFeedAtFileEnd": true,
-    "disallowMultipleLineBreaks": true,
-    "validateJSDoc": {
-        "checkParamNames": true,
-        "requireParamTypes": true
-    }
+    "fileExtensions": [".js", ".bemtree", ".bemhtml"]
 }
diff --git a/common.blocks/i-bem/__i18n/_dummy/i-bem__i18n_dummy_yes.bemhtml b/common.blocks/i-bem/__i18n/_dummy/i-bem__i18n_dummy_yes.bemhtml
@@ -21,5 +21,5 @@ oninit(function() {
         i18n.key = function(key) { return key; };
         i18n.lang = function() { return; };
 
-    })(this, typeof BEM === 'undefined' ? {} : BEM);
+    })(this, typeof BEM === 'undefined'? {} : BEM);
 });
diff --git a/common.blocks/i-bem/__i18n/test/complex_test.js b/common.blocks/i-bem/__i18n/test/complex_test.js
@@ -27,7 +27,7 @@ suite('BEM.I18N Complex tests', function() {
                     return (lastNumber === 1 && lastNumbers !== 11)?
                             params.one : (
                                     (lastNumber > 1 && lastNumber < 5) && (lastNumbers < 10 || lastNumbers > 20)?
-                                        params.some : params.many );
+                                        params.some : params.many);
                 }).call(this, params);
             },
             'plural_adv' : function(params) {
@@ -75,7 +75,7 @@ suite('BEM.I18N Complex tests', function() {
                         'one' : 'Найдена',
                         'some' : 'Найдено',
                         'many' : 'Найдено'
-                    } ) + ' \n' +
+                    }) + ' \n' +
                     params['count'] + '\n' +
                     this.keyset('i-tanker__dynamic').key('plural_adv', {
                         'count' : params['count'],
@@ -90,10 +90,10 @@ suite('BEM.I18N Complex tests', function() {
                 return this.keyset('i-tanker__dynamic').key('plural_adv', {
                         'count' : params['count'],
                         'none' : 'Ничего не найдено на страницах Помощи.',
-                        'one' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {  } ) + '</p>' + 'Найдена',
-                        'some' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {  } ) + '</p>' + 'Найдено',
-                        'many' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {  } ) + '</p>' + 'Найдено'
-                    } ) + ' \n' +
+                        'one' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {}) + '</p>' + 'Найдена',
+                        'some' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {}) + '</p>' + 'Найдено',
+                        'many' : '<p>' + this.keyset('i-locale').key('not-found-in-section', {}) + '</p>' + 'Найдено'
+                    }) + ' \n' +
                     params['count'] + '\n' +
                     this.keyset('i-tanker__dynamic').key('plural_adv', {
                         'count' : params['count'],

diff --git a/common.blocks/i-bem/i-bem.bemtree b/common.blocks/i-bem/i-bem.bemtree
@@ -118,8 +118,8 @@ match(this._mode === '')(
             block = this._currBlock || this.block;
 
         return apply('default', {
-            block : vBlock || (vElem ? block : undefined),
-            _currBlock : (vBlock || vElem) ? undefined : block,
+            block : vBlock || (vElem? block : undefined),
+            _currBlock : (vBlock || vElem)? undefined : block,
             elem  : vElem,
             mods : vBlock? this.ctx.mods || (this.ctx.mods = {}) : this.mods,
             elemMods : this.ctx.elemMods || {}

diff --git a/common.blocks/jquery/__event/_type/jquery__event_type_pointernative.js b/common.blocks/jquery/__event/_type/jquery__event_type_pointernative.js
@@ -532,7 +532,9 @@ var touchEvents = {
     removePrimaryPointer : function(pointer) {
         if(pointer.isPrimary) {
             this.firstTouch = null;
-            //this.firstXY = null;
+            // TODO(@narqo): It seems that, flushing `firstXY` flag explicitly in `touchmove` handler is enough.
+            // Original code from polymer doing `this.firstXY = null` on every `removePrimaryPointer` call, but looks
+            // like it is harmful in some of our usecases.
             this.resetClickCount();
         }
     },

diff --git a/..._event/_type/jquery__event_type_pointernative.tests/simple.blocks/example/example.bemhtml b/..._event/_type/jquery__event_type_pointernative.tests/simple.blocks/example/example.bemhtml
@@ -4,8 +4,8 @@ block('example').content()({
         elem : 'inner1',
         content : {
             elem : 'inner2',
-            content: {
-                elem: 'inner3'
+            content : {
+                elem : 'inner3'
             }
         }
     }

diff --git a/common.blocks/querystring/__uri/querystring__uri.spec.js b/common.blocks/querystring/__uri/querystring__uri.spec.js
@@ -2,31 +2,31 @@ modules.define('spec', ['querystring__uri'], function(provide, qs) {
 
 describe('querystring__uri', function() {
     describe('decodeURIComponent()', function() {
-        
+
         it('should be able to decode cp1251 encoded params', function() {
             qs.decodeURIComponent('%F2%E0%E1%EB%EE').should.be.eql('табло');
         });
-    
+
         it('should not fall on params encoded with unknown encoding', function() {
             qs.decodeURIComponent('%COCO%C0C0').should.be.eql('%COCO%C0C0');
         });
-        
+
     });
-    
+
     describe('decodeURI()', function() {
-        
+
         it('should be able to decode url with cp1251 encoded params', function() {
             qs
                 .decodeURI('http://test.com/ololo/trololo.html?text=%F2%E0%E1%EB%EE')
                 .should.be.eql('http://test.com/ololo/trololo.html?text=табло');
         });
-    
+
         it('should not fall on url with params encoded with unknown encoding', function() {
             qs
                 .decodeURI('http://test.com/ololo/trololo.html?text=%COCO%C0C0')
                 .should.be.eql('http://test.com/ololo/trololo.html?text=%COCO%C0C0');
         });
-        
+
     });
 });
 

diff --git a/common.blocks/querystring/__uri/querystring__uri.vanilla.js b/common.blocks/querystring/__uri/querystring__uri.vanilla.js
@@ -19,7 +19,7 @@ function convert(str) {
 
 function decode(fn,  str) {
     var decoded = '';
-    
+
     // Try/catch block for getting the encoding of the source string.
     // Error is thrown if a non-UTF8 string is input.
     // If the string was not decoded, it is returned without changes.
@@ -32,7 +32,7 @@ function decode(fn,  str) {
             decoded = str;
         }
     }
-    
+
     return decoded;
 }
 

diff --git a/common.blocks/querystring/querystring.spec.js b/common.blocks/querystring/querystring.spec.js
@@ -65,7 +65,7 @@ describe('querystring', function() {
                 { str : 'foo=1&bar=2', obj : { 'foo' : '1', 'bar' : '2' } },
                 {
                     str : 'my%20weird%20field=q1!2%22\'w%245%267%2Fz8)%3F',
-                    obj : { 'my weird field' : "q1!2\"'w$5&7/z8)?"  }
+                    obj : { 'my weird field' : 'q1!2"\'w$5&7/z8)?' }
                 },
                 { str : 'foo%3Dbaz=bar', obj : { 'foo=baz' : 'bar' } },
                 { str : 'foo=bar&bar=baz', obj : { foo : 'bar', bar : 'baz' } },

diff --git a/desktop.blocks/page/page.bemhtml b/desktop.blocks/page/page.bemhtml
@@ -2,7 +2,7 @@ block('page')(
     elem('head')(
         content()(function() {
             return [
-                this.ctx['x-ua-compatible'] === false ?
+                this.ctx['x-ua-compatible'] === false?
                     false :
                     {
                         tag : 'meta',

diff --git a/desktop.blocks/ua/ua.js b/desktop.blocks/ua/ua.js
@@ -1,4 +1,4 @@
-/** 
+/**
  * @module ua
  * @description Detect some user agent features (works like jQuery.browser in jQuery 1.8)
  * @see http://code.jquery.com/jquery-migrate-1.1.1.js

diff --git a/package.json b/package.json
@@ -23,7 +23,8 @@
     "bem": "~0.9.0",
     "mocha": "~1.9.0",
     "jshint-groups": "0.6.0",
-    "jscs": "1.5.3",
+    "jscs": "^1.11.3",
+    "jscs-bem": "^0.1.2",
     "git-hooks": "~0.0.6",
     "bower-npm-install": "~0.5.4",
     "bower": "1.3.12",