build for v1.4.0-c

nhn · Jul 12, 2016 · 2a22910 · 2a22910
1 parent 8eb1cbc
commit 2a22910
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 25 deletions.
diff --git a/dist/grid.css b/dist/grid.css
@@ -1,7 +1,7 @@
 /**
  * @fileoverview tui-grid
  * @author NHN Ent. FE Development Team
- * @version 1.4.0-b
+ * @version 1.4.0-c
  * @license MIT
  * @link https://github.com/nhnent/tui.grid
  */

diff --git a/dist/grid.js b/dist/grid.js
@@ -1,7 +1,7 @@
 /**
  * @fileoverview tui-grid
  * @author NHN Ent. FE Development Team
- * @version 1.4.0-b
+ * @version 1.4.0-c
  * @license MIT
  * @link https://github.com/nhnent/tui.grid
  */
@@ -9701,10 +9701,16 @@ var InputPainter = tui.util.defineClass(Painter, /**@lends module:painter/input/
     _onFocusIn: function(event) {
         var $target = $(event.target);
         var address = this._getCellAddress($target);
+        var self = this;
 
-        this._executeCustomEventHandler(event);
-        this.trigger('focusIn', $target, address);
-        this.controller.startEditing(address);
+        // Defers starting editing
+        // as button-type(checkbox, radio) defers finishing editing for detecting blurred state.
+        // see {@link module:painter/input/button#_onFocusOut}
+        _.defer(function() {
+            self._executeCustomEventHandler(event);
+            self.trigger('focusIn', $target, address);
+            self.controller.startEditing(address);
+        });
     },
 
     /**
@@ -15584,8 +15590,7 @@ var StateLayer = View.extend(/**@lends module:view/stateLayer.prototype */{
      */
     _refreshLayout: function() {
         var headerHeight = this.dimensionModel.get('headerHeight');
-
-        this.$el.css(top, headerHeight);
+        this.$el.css('top', headerHeight);
     }
 });
 

diff --git a/dist/grid.min.css b/dist/grid.min.css
diff --git a/dist/grid.min.js b/dist/grid.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tui-grid",
-  "version": "1.4.0-b",
+  "version": "1.4.0-c",
   "description": "grid",
   "main": "gulpfiles.js",
   "directories": {

diff --git a/samples/css/grid.css b/samples/css/grid.css
@@ -1,7 +1,7 @@
 /**
  * @fileoverview tui-grid
  * @author NHN Ent. FE Development Team
- * @version 1.4.0-b
+ * @version 1.4.0-c
  * @license MIT
  * @link https://github.com/nhnent/tui.grid
  */

diff --git a/samples/css/grid.min.css b/samples/css/grid.min.css
diff --git a/samples/js/grid.js b/samples/js/grid.js
@@ -1,7 +1,7 @@
 /**
  * @fileoverview tui-grid
  * @author NHN Ent. FE Development Team
- * @version 1.4.0-b
+ * @version 1.4.0-c
  * @license MIT
  * @link https://github.com/nhnent/tui.grid
  */
@@ -9701,10 +9701,16 @@ var InputPainter = tui.util.defineClass(Painter, /**@lends module:painter/input/
     _onFocusIn: function(event) {
         var $target = $(event.target);
         var address = this._getCellAddress($target);
+        var self = this;
 
-        this._executeCustomEventHandler(event);
-        this.trigger('focusIn', $target, address);
-        this.controller.startEditing(address);
+        // Defers starting editing
+        // as button-type(checkbox, radio) defers finishing editing for detecting blurred state.
+        // see {@link module:painter/input/button#_onFocusOut}
+        _.defer(function() {
+            self._executeCustomEventHandler(event);
+            self.trigger('focusIn', $target, address);
+            self.controller.startEditing(address);
+        });
     },
 
     /**
@@ -15584,8 +15590,7 @@ var StateLayer = View.extend(/**@lends module:view/stateLayer.prototype */{
      */
     _refreshLayout: function() {
         var headerHeight = this.dimensionModel.get('headerHeight');
-
-        this.$el.css(top, headerHeight);
+        this.$el.css('top', headerHeight);
     }
 });
 

diff --git a/samples/js/grid.min.js b/samples/js/grid.min.js