chore: build for v1.5.1

nhn · Oct 27, 2016 · 32abb90 · 32abb90
1 parent 4a22769
commit 32abb90
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 45 deletions.
diff --git a/dist/grid.comb.js b/dist/grid.comb.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Fri Oct 21 2016 14:46:00 GMT+0900 (KST)"
- * version: 1.5.0
+ * bundle created at "Thu Oct 27 2016 17:27:35 GMT+0900 (KST)"
+ * version: 1.5.1
  */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -13054,6 +13054,9 @@
 	var classNameConst = __webpack_require__(15);
 	var TABLE_BORDER_WIDTH = __webpack_require__(10).dimension.TABLE_BORDER_WIDTH;
 
+	var MESSAGE_LOADING = '요청을 처리 중입니다.';
+	var MESSAGE_EMPTY = '데이터가 존재하지 않습니다.';
+
 	/**
 	 * Layer class that represents the state of rendering phase.
 	 * @module view/stateLayer
@@ -13067,7 +13070,6 @@
 	    initialize: function(options) {
 	        this.dimensionModel = options.dimensionModel;
 	        this.renderModel = options.renderModel;
-	        this.timeoutIdForDelay = null;
 
 	        this.listenTo(this.dimensionModel, 'change', this._refreshLayout);
 	        this.listenTo(this.renderModel, 'change:state', this.render);
@@ -13077,7 +13079,7 @@
 
 	    template: _.template(
 	        '<div class="' + classNameConst.LAYER_STATE_CONTENT + '">' +
-	        '    <%= text %>' +
+	        '    <p><%= text %></p>' +
 	        '    <% if (isLoading) { %>' +
 	        '    <div class="' + classNameConst.LAYER_STATE_LOADING + '"></div>' +
 	        '    <% } %>' +
@@ -13111,9 +13113,7 @@
 	            isLoading: (renderState === stateConst.LOADING)
 	        });
 
-	        this.$el.html(layerHtml).show().css({
-	            bottom: this.dimensionModel.get('paginationHeight')
-	        });
+	        this.$el.html(layerHtml).show();
 	        this._refreshLayout();
 	    },
 
@@ -13125,9 +13125,9 @@
 	    _getMessage: function(renderState) {
 	        switch (renderState) {
 	            case stateConst.LOADING:
-	                return '요청을 처리 중입니다.';
+	                return MESSAGE_LOADING;
 	            case stateConst.EMPTY:
-	                return (this.renderModel.get('emptyMessage') || '데이터가 존재하지 않습니다.');
+	                return (this.renderModel.get('emptyMessage') || MESSAGE_EMPTY);
 	            default:
 	                return null;
 	        }
@@ -13138,13 +13138,25 @@
 	     * @private
 	     */
 	    _refreshLayout: function() {
-	        var headerHeight = this.dimensionModel.get('headerHeight');
-	        var toolbarHeight = this.dimensionModel.get('toolbarHeight');
+	        var dimensionModel = this.dimensionModel;
+	        var headerHeight = dimensionModel.get('headerHeight');
+	        var bodyHeight = dimensionModel.get('bodyHeight');
+	        var toolbarHeight = dimensionModel.get('toolbarHeight');
+	        var scrollXHeight = dimensionModel.getScrollXHeight();
+	        var scrollYWidth = dimensionModel.getScrollYWidth();
 
-	        this.$el.css('top', headerHeight + toolbarHeight - TABLE_BORDER_WIDTH);
+	        this.$el.css({
+	            top: headerHeight + toolbarHeight - TABLE_BORDER_WIDTH,
+	            height: bodyHeight - scrollXHeight - TABLE_BORDER_WIDTH,
+	            left: 0,
+	            right: scrollYWidth
+	        });
 	    }
 	});
 
+	StateLayer.MESSAGE_LOADING = MESSAGE_LOADING;
+	StateLayer.MESSAGE_EMPTY = MESSAGE_EMPTY;
+
 	module.exports = StateLayer;
 
 

diff --git a/dist/grid.comb.min.js b/dist/grid.comb.min.js
diff --git a/dist/grid.css b/dist/grid.css
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Fri Oct 21 2016 14:46:00 GMT+0900 (KST)"
- * version: 1.5.0
+ * bundle created at "Thu Oct 27 2016 17:27:35 GMT+0900 (KST)"
+ * version: 1.5.1
  */
 .tui-grid-container {
   width: 100%;
@@ -122,10 +122,6 @@
 }
 .tui-grid-layer-state {
   position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   border-style: solid;
   border-color: #ccc;
   border-width: 1px;

diff --git a/dist/grid.js b/dist/grid.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Fri Oct 21 2016 14:44:34 GMT+0900 (KST)"
- * version: 1.5.0
+ * bundle created at "Thu Oct 27 2016 17:27:35 GMT+0900 (KST)"
+ * version: 1.5.1
  */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -9579,6 +9579,9 @@
 	var classNameConst = __webpack_require__(14);
 	var TABLE_BORDER_WIDTH = __webpack_require__(9).dimension.TABLE_BORDER_WIDTH;
 
+	var MESSAGE_LOADING = '요청을 처리 중입니다.';
+	var MESSAGE_EMPTY = '데이터가 존재하지 않습니다.';
+
 	/**
 	 * Layer class that represents the state of rendering phase.
 	 * @module view/stateLayer
@@ -9592,7 +9595,6 @@
 	    initialize: function(options) {
 	        this.dimensionModel = options.dimensionModel;
 	        this.renderModel = options.renderModel;
-	        this.timeoutIdForDelay = null;
 
 	        this.listenTo(this.dimensionModel, 'change', this._refreshLayout);
 	        this.listenTo(this.renderModel, 'change:state', this.render);
@@ -9602,7 +9604,7 @@
 
 	    template: _.template(
 	        '<div class="' + classNameConst.LAYER_STATE_CONTENT + '">' +
-	        '    <%= text %>' +
+	        '    <p><%= text %></p>' +
 	        '    <% if (isLoading) { %>' +
 	        '    <div class="' + classNameConst.LAYER_STATE_LOADING + '"></div>' +
 	        '    <% } %>' +
@@ -9636,9 +9638,7 @@
 	            isLoading: (renderState === stateConst.LOADING)
 	        });
 
-	        this.$el.html(layerHtml).show().css({
-	            bottom: this.dimensionModel.get('paginationHeight')
-	        });
+	        this.$el.html(layerHtml).show();
 	        this._refreshLayout();
 	    },
 
@@ -9650,9 +9650,9 @@
 	    _getMessage: function(renderState) {
 	        switch (renderState) {
 	            case stateConst.LOADING:
-	                return '요청을 처리 중입니다.';
+	                return MESSAGE_LOADING;
 	            case stateConst.EMPTY:
-	                return (this.renderModel.get('emptyMessage') || '데이터가 존재하지 않습니다.');
+	                return (this.renderModel.get('emptyMessage') || MESSAGE_EMPTY);
 	            default:
 	                return null;
 	        }
@@ -9663,13 +9663,25 @@
 	     * @private
 	     */
 	    _refreshLayout: function() {
-	        var headerHeight = this.dimensionModel.get('headerHeight');
-	        var toolbarHeight = this.dimensionModel.get('toolbarHeight');
+	        var dimensionModel = this.dimensionModel;
+	        var headerHeight = dimensionModel.get('headerHeight');
+	        var bodyHeight = dimensionModel.get('bodyHeight');
+	        var toolbarHeight = dimensionModel.get('toolbarHeight');
+	        var scrollXHeight = dimensionModel.getScrollXHeight();
+	        var scrollYWidth = dimensionModel.getScrollYWidth();
 
-	        this.$el.css('top', headerHeight + toolbarHeight - TABLE_BORDER_WIDTH);
+	        this.$el.css({
+	            top: headerHeight + toolbarHeight - TABLE_BORDER_WIDTH,
+	            height: bodyHeight - scrollXHeight - TABLE_BORDER_WIDTH,
+	            left: 0,
+	            right: scrollYWidth
+	        });
 	    }
 	});
 
+	StateLayer.MESSAGE_LOADING = MESSAGE_LOADING;
+	StateLayer.MESSAGE_EMPTY = MESSAGE_EMPTY;
+
 	module.exports = StateLayer;
 
 

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.5.0",
+  "version": "1.5.1",
   "description": "TOAST UI Grid : Powerful data grid control supported by TOAST UI",
   "main": "dist/grid.js",
   "scripts": {