Rename base-control to control (close #656)

bem · Jun 29, 2014 · 8ab035c · 8ab035c
1 parent a0eecc5
commit 8ab035c
Show file tree

Hide file tree

Showing 38 changed files with 238 additions and 242 deletions.
diff --git a/common.blocks/attach/attach.deps.js b/common.blocks/attach/attach.deps.js
@@ -1,7 +1,7 @@
 [{
     mustDeps : { block : 'i-bem', elems : ['dom', 'i18n'] },
     shouldDeps : [
-        { block : 'base-control' },
+        { block : 'control' },
         { block : 'button' },
         { block : 'icon' },
         { elems : ['button', 'control', 'no-file', 'file'] },

diff --git a/common.blocks/attach/attach.js b/common.blocks/attach/attach.js
@@ -4,16 +4,16 @@
 
 modules.define(
     'attach',
-    ['i-bem__dom', 'base-control', 'jquery', 'BEMHTML', 'strings__escape'],
-    function(provide, BEMDOM, BaseControl, $, BEMHTML, escape) {
+    ['i-bem__dom', 'control', 'jquery', 'BEMHTML', 'strings__escape'],
+    function(provide, BEMDOM, Control, $, BEMHTML, escape) {
 
 /**
  * @exports
  * @class attach
- * @augments base-control
+ * @augments control
  * @bem
  */
-provide(BEMDOM.decl({ block : this.name, baseBlock : BaseControl }, /** @lends attach.prototype */{
+provide(BEMDOM.decl({ block : this.name, baseBlock : Control }, /** @lends attach.prototype */{
     onSetMod : {
         'disabled' : function(modName, modVal) {
             this.__base.apply(this, arguments);

diff --git a/common.blocks/attach/attach.ru.md b/common.blocks/attach/attach.ru.md
@@ -113,7 +113,7 @@
 
 ### Зависимости блока
 
-* `base-control`
+* `control`
 * `i-bem__dom`
 * `icon`
 * `button`
diff --git a/common.blocks/base-control/base-control.spec.js b/common.blocks/base-control/base-control.spec.js
diff --git a/common.blocks/button/button.bemhtml b/common.blocks/button/button.bemhtml
@@ -10,7 +10,7 @@ block('button')(
 
     js()(true),
 
-    // Implements `base-control`'s interface
+    // NOTE: mix below is to satisfy interface of `control`
     mix()([{ elem : 'control' }]),
 
     attrs()(

diff --git a/common.blocks/button/button.bh.js b/common.blocks/button/button.bh.js
@@ -7,7 +7,7 @@ module.exports = function(bh) {
 
         ctx
             .attr('role', 'button') // Common attributes)
-            .mix({ elem : 'control' }); // Implements `base-control`'s interface
+            .mix({ elem : 'control' }); // NOTE: satisfy interface of `control`
 
         json.tabIndex && ctx.attr('tabindex', json.tabIndex);
         json.id && ctx.attr('id', json.id);

diff --git a/common.blocks/button/button.deps.js b/common.blocks/button/button.deps.js
@@ -9,7 +9,7 @@
         { block : 'keyboard', elem : 'codes' },
         'functions',
         'events',
-        'base-control'
+        'control'
     ]
 },
 {

diff --git a/common.blocks/button/button.en.md b/common.blocks/button/button.en.md
@@ -570,5 +570,5 @@ This element intended to set a text position in the button.
 
 The `button` block depends on
 
-* `base-control`, that provides public API for the controls.`i-bem__dom`
+* `control`, that provides public API for the controls
 * `i-bem__dom`
diff --git a/common.blocks/button/button.js b/common.blocks/button/button.js
@@ -4,16 +4,16 @@
 
 modules.define(
     'button',
-    ['i-bem__dom', 'base-control', 'jquery', 'dom', 'functions', 'keyboard__codes'],
-    function(provide, BEMDOM, BaseControl, $, dom, functions, keyCodes) {
+    ['i-bem__dom', 'control', 'jquery', 'dom', 'functions', 'keyboard__codes'],
+    function(provide, BEMDOM, Control, $, dom, functions, keyCodes) {
 
 /**
  * @exports
  * @class button
- * @augments base-control
+ * @augments control
  * @bem
  */
-provide(BEMDOM.decl({ block : this.name, baseBlock : BaseControl }, /** @lends button.prototype */{
+provide(BEMDOM.decl({ block : this.name, baseBlock : Control }, /** @lends button.prototype */{
     beforeSetMod : {
         'pressed' : {
             'true' : function() {

diff --git a/common.blocks/button/button.ru.md b/common.blocks/button/button.ru.md
@@ -298,6 +298,6 @@
 
 ## Зависимости
 
-* `base-control`
+* `control`
 * `i-bem__dom`
 * `keyboard`
diff --git a/common.blocks/checkbox/checkbox.deps.js b/common.blocks/checkbox/checkbox.deps.js
@@ -6,7 +6,7 @@
             mods : { disabled : true, focused : true, checked : true }
         },
         { block : 'jquery', elem : 'event', mods : { type : 'pointer' } },
-        'base-control'
+        'control'
     ]
 },
 {

diff --git a/common.blocks/checkbox/checkbox.en.md b/common.blocks/checkbox/checkbox.en.md
@@ -309,5 +309,5 @@ The `control` element is added to the block on a template engine level.
 ## Block's dependencies
 
 * `i-bem__dom`
-* `base-control`
+* `control`
 * `button`
diff --git a/common.blocks/checkbox/checkbox.js b/common.blocks/checkbox/checkbox.js
@@ -2,15 +2,15 @@
  * @module checkbox
  */
 
-modules.define('checkbox', ['i-bem__dom', 'base-control'], function(provide, BEMDOM, BaseControl) {
+modules.define('checkbox', ['i-bem__dom', 'control'], function(provide, BEMDOM, Control) {
 
 /**
  * @exports
  * @class checkbox
- * @augments base-control
+ * @augments control
  * @bem
  */
-provide(BEMDOM.decl({ block : this.name, baseBlock : BaseControl }, /** @lends checkbox.prototype */{
+provide(BEMDOM.decl({ block : this.name, baseBlock : Control }, /** @lends checkbox.prototype */{
     onSetMod : {
         'checked' : function(modName, modVal) {
             this.elem('control').prop(modName, modVal);

diff --git a/common.blocks/checkbox/checkbox.ru.md b/common.blocks/checkbox/checkbox.ru.md
@@ -267,5 +267,5 @@
 ## Зависимости блока
 
 * `i-bem__dom`
-* `base-control`
+* `control`
 * `button`
diff --git a/....blocks/base-control/base-control.deps.js → common.blocks/control/control.deps.js b/....blocks/base-control/base-control.deps.js → common.blocks/control/control.deps.js
diff --git a/...on.blocks/base-control/base-control.en.md → common.blocks/control/control.en.md b/...on.blocks/base-control/base-control.en.md → common.blocks/control/control.en.md
@@ -1,4 +1,4 @@
-# base-control
+# control
 
 Auxiliary block designed to implement the common functionality of the most blocks of [bem-components](https://github.com/bem/bem-components) library to provide them `focused` and `disabled` states: [attach](https://github.com/bem/bem-components/blob/v2/common.blocks/attach/attach.en.md), [button](https://github.com/bem/bem-components/blob/v2/common.blocks/button/button.en.md), [checkbox](https://github.com/bem/bem-components/blob/v2/common.blocks/checkbox/checkbox.en.title.txt), [input], [link], [menu], [radio].
 

diff --git a/common.blocks/base-control/base-control.js → common.blocks/control/control.js b/common.blocks/base-control/base-control.js → common.blocks/control/control.js
@@ -1,17 +1,17 @@
-/** @module base-control */
+/** @module control */
 
 modules.define(
-    'base-control',
+    'control',
     ['i-bem__dom', 'dom', 'next-tick'],
     function(provide, BEMDOM, dom, nextTick) {
 
 /**
  * @exports
- * @class base-control
+ * @class control
  * @abstract
  * @bem
  */
-provide(BEMDOM.decl(this.name, /** @lends base-control.prototype */{
+provide(BEMDOM.decl(this.name, /** @lends control.prototype */{
     beforeSetMod : {
         'focused' : {
             'true' : function() {
@@ -97,7 +97,7 @@ provide(BEMDOM.decl(this.name, /** @lends base-control.prototype */{
     _blur : function() {
         this.elem('control').blur();
     }
-}, /** @lends base-control */{
+}, /** @lends control */{
     live : function() {
         this
             .liveBindTo('control', 'focusin', this.prototype._onFocus)

diff --git a/...on.blocks/base-control/base-control.ru.md → common.blocks/control/control.ru.md b/...on.blocks/base-control/base-control.ru.md → common.blocks/control/control.ru.md
@@ -1,4 +1,4 @@
-# base-control
+# control
 
 Вспомогательный блок. Используется для работы большинства блоков библиотеки [bem-components](https://github.com/bem/bem-components):
 

diff --git a/...ks/base-control/base-control.ru.title.txt → common.blocks/control/control.ru.title.txt b/...ks/base-control/base-control.ru.title.txt → common.blocks/control/control.ru.title.txt