2.6.1

nhn · Dec 12, 2017 · c7288c4 · c7288c4
1 parent 129c59c
commit c7288c4
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 27 deletions.
diff --git a/dist/tui-grid.comb.js b/dist/tui-grid.comb.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Thu Nov 30 2017 15:09:08 GMT+0900 (KST)"
- * version: 2.6.0
+ * bundle created at "Tue Dec 12 2017 21:18:15 GMT+0900 (KST)"
+ * version: 2.6.1
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -8419,6 +8419,25 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return text.replace(/\{\{(\w*)\}\}/g, function(value, prop) {
 	            return values.hasOwnProperty(prop) ? values[prop] : '';
 	        });
+	    },
+
+	    /**
+	     * Detect right button by mouse event
+	     * @param {object} ev - Mouse event
+	     * @returns {boolea} State
+	     */
+	    isRightClickEvent: function(ev) {
+	        var rightClick;
+
+	        ev = ev || window.event;
+
+	        if (ev.which) {
+	            rightClick = ev.which === 3;
+	        } else if (ev.button) {
+	            rightClick = ev.button === 2;
+	        }
+
+	        return rightClick;
 	    }
 	};
 
@@ -11231,11 +11250,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    },
 
 	    /**
-	     * Data.ColumnModel 이 변경되었을 때 열고정 영역 frame, 열고정 영역이 아닌 frame 의 list 를 재생성 하기 위한 이벤트 핸들러
+	     * Event handler for regenerating left and right side frames when the Data.ColumnModel is changed
 	     * @private
 	     */
 	    _onColumnModelChange: function() {
-	        this.set({scrollTop: 0}, {silent: true});
+	        this.set({
+	            scrollLeft: 0,
+	            scrollTop: 0
+	        }, {silent: true});
 
 	        this._resetViewModelList();
 	        this._setRenderingRange(true);
@@ -16622,6 +16644,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	var View = __webpack_require__(4);
 	var DragEventEmitter = __webpack_require__(38);
 	var GridEvent = __webpack_require__(15);
+	var util = __webpack_require__(16);
 	var constMap = __webpack_require__(10);
 	var classNameConst = __webpack_require__(18);
 	var frameConst = constMap.frame;
@@ -16753,6 +16776,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (isTargetInput && ev.shiftKey) {
 	            ev.preventDefault();
 	        }
+
+	        if (util.isRightClickEvent(ev)) {
+	            return;
+	        }
+
 	        if (!isTargetInput || ev.shiftKey) {
 	            this.dragEmitter.start(ev, {
 	                pageX: ev.pageX,

diff --git a/dist/tui-grid.comb.min.js b/dist/tui-grid.comb.min.js
diff --git a/dist/tui-grid.css b/dist/tui-grid.css
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Thu Nov 30 2017 15:09:08 GMT+0900 (KST)"
- * version: 2.6.0
+ * bundle created at "Tue Dec 12 2017 21:18:15 GMT+0900 (KST)"
+ * version: 2.6.1
  */
 .tui-grid-container {
   width: 100%;

diff --git a/dist/tui-grid.js b/dist/tui-grid.js
@@ -1,6 +1,6 @@
 /*!
- * bundle created at "Thu Nov 30 2017 15:09:08 GMT+0900 (KST)"
- * version: 2.6.0
+ * bundle created at "Tue Dec 12 2017 21:18:15 GMT+0900 (KST)"
+ * version: 2.6.1
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -4950,6 +4950,25 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return text.replace(/\{\{(\w*)\}\}/g, function(value, prop) {
 	            return values.hasOwnProperty(prop) ? values[prop] : '';
 	        });
+	    },
+
+	    /**
+	     * Detect right button by mouse event
+	     * @param {object} ev - Mouse event
+	     * @returns {boolea} State
+	     */
+	    isRightClickEvent: function(ev) {
+	        var rightClick;
+
+	        ev = ev || window.event;
+
+	        if (ev.which) {
+	            rightClick = ev.which === 3;
+	        } else if (ev.button) {
+	            rightClick = ev.button === 2;
+	        }
+
+	        return rightClick;
 	    }
 	};
 
@@ -7762,11 +7781,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    },
 
 	    /**
-	     * Data.ColumnModel 이 변경되었을 때 열고정 영역 frame, 열고정 영역이 아닌 frame 의 list 를 재생성 하기 위한 이벤트 핸들러
+	     * Event handler for regenerating left and right side frames when the Data.ColumnModel is changed
 	     * @private
 	     */
 	    _onColumnModelChange: function() {
-	        this.set({scrollTop: 0}, {silent: true});
+	        this.set({
+	            scrollLeft: 0,
+	            scrollTop: 0
+	        }, {silent: true});
 
 	        this._resetViewModelList();
 	        this._setRenderingRange(true);
@@ -13153,6 +13175,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	var View = __webpack_require__(4);
 	var DragEventEmitter = __webpack_require__(38);
 	var GridEvent = __webpack_require__(15);
+	var util = __webpack_require__(16);
 	var constMap = __webpack_require__(10);
 	var classNameConst = __webpack_require__(18);
 	var frameConst = constMap.frame;
@@ -13284,6 +13307,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (isTargetInput && ev.shiftKey) {
 	            ev.preventDefault();
 	        }
+
+	        if (util.isRightClickEvent(ev)) {
+	            return;
+	        }
+
 	        if (!isTargetInput || ev.shiftKey) {
 	            this.dragEmitter.start(ev, {
 	                pageX: ev.pageX,

diff --git a/dist/tui-grid.min.css b/dist/tui-grid.min.css
diff --git a/dist/tui-grid.min.js b/dist/tui-grid.min.js