chore: build for v1.8.1

nhn · Feb 24, 2017 · bf9540f · bf9540f
1 parent cfc569d
commit bf9540f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 30 deletions.
diff --git a/dist/grid.comb.js b/dist/grid.comb.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Mon Feb 13 2017 10:19:09 GMT+0900 (KST)"
- * version: 1.8.0
+ * bundle created at "Fri Feb 24 2017 16:41:07 GMT+0900 (KST)"
+ * version: 1.8.1
  */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -11323,9 +11323,9 @@
 	     * @private
 	     */
 	    _getStartRowSpanMinCount: function(startIndex) {
-	        var firstRow = this.dataModel.at(startIndex),
-	            result = 0,
-	            counts;
+	        var firstRow = this.dataModel.at(startIndex);
+	        var result = 0;
+	        var counts;
 
 	        if (firstRow) {
 	            counts = _.pluck(firstRow.getRowSpanData(), 'count');
@@ -11342,15 +11342,21 @@
 	     * @private
 	     */
 	    _getEndRowSpanMaxCount: function(endIndex) {
-	        var lastRow = this.dataModel.at(endIndex),
-	            result = 0,
-	            counts;
+	        var lastRow = this.dataModel.at(endIndex);
+	        var result = 0;
+	        var counts;
 
 	        if (lastRow) {
 	            counts = _.pluck(lastRow.getRowSpanData(), 'count');
 	            counts.push(0); // count가 양수인 경우(mainRow인 경우)에만 최대값을 구함. 없으면 0
 	            result = _.max(counts);
 	        }
+
+	        // subtract 1, as the count includes main-cell itself
+	        if (result > 0) {
+	            result -= 1;
+	        }
+
 	        return result;
 	    },
 

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 "Mon Feb 13 2017 10:19:09 GMT+0900 (KST)"
- * version: 1.8.0
+ * bundle created at "Fri Feb 24 2017 16:41:07 GMT+0900 (KST)"
+ * version: 1.8.1
  */
 .tui-grid-container {
   width: 100%;

diff --git a/dist/grid.js b/dist/grid.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Mon Feb 13 2017 10:19:09 GMT+0900 (KST)"
- * version: 1.8.0
+ * bundle created at "Fri Feb 24 2017 16:41:07 GMT+0900 (KST)"
+ * version: 1.8.1
  */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -7848,9 +7848,9 @@
 	     * @private
 	     */
 	    _getStartRowSpanMinCount: function(startIndex) {
-	        var firstRow = this.dataModel.at(startIndex),
-	            result = 0,
-	            counts;
+	        var firstRow = this.dataModel.at(startIndex);
+	        var result = 0;
+	        var counts;
 
 	        if (firstRow) {
 	            counts = _.pluck(firstRow.getRowSpanData(), 'count');
@@ -7867,15 +7867,21 @@
 	     * @private
 	     */
 	    _getEndRowSpanMaxCount: function(endIndex) {
-	        var lastRow = this.dataModel.at(endIndex),
-	            result = 0,
-	            counts;
+	        var lastRow = this.dataModel.at(endIndex);
+	        var result = 0;
+	        var counts;
 
 	        if (lastRow) {
 	            counts = _.pluck(lastRow.getRowSpanData(), 'count');
 	            counts.push(0); // count가 양수인 경우(mainRow인 경우)에만 최대값을 구함. 없으면 0
 	            result = _.max(counts);
 	        }
+
+	        // subtract 1, as the count includes main-cell itself
+	        if (result > 0) {
+	            result -= 1;
+	        }
+
 	        return result;
 	    },
 

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