diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js index 7051e5e8f..f495a591c 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -410,6 +410,44 @@ define([ this.btnReplaceAll.setDisabled(disable); }, + fillResultColsSize: function () { + this.resizeResults.currentWidths = []; + this.resizeResults.currentResizersPosition = []; + + var headerCols = this.$resultsContainer.find('.header-item'), + resizers = this.$resultsContainer.find('.header-resizer'); + _.each(headerCols, _.bind(function (item) { + var data = $(item).data('col'), + resCol = this.$resultsContainer.find('.search-items [data-col=' + data + ']')[0]; + this.resizeResults.currentWidths.push({ + name: data, + headerWidth: $(item).outerWidth(), + resultWidth: $(resCol).outerWidth() + }); + }, this)); + _.each(resizers, _.bind(function (item) { + this.resizeResults.currentResizersPosition.push($(item).position().left); + }, this)); + + console.log('this.resizeResults.currentWidths', this.resizeResults.currentWidths); + console.log('this.resizeResults.currentResizersPosition', this.resizeResults.currentResizersPosition); + }, + + applyResultColsSize: function () { + if (this.resizeResults.isChanged) { + var headerCols = this.$resultsContainer.find('.header-item'), + resizers = this.$resultsContainer.find('.header-resizer'); + _.each(headerCols, _.bind(function (item, index) { + var currentWidth = this.resizeResults.currentWidths[index]; + $(item).width(currentWidth.headerWidth); + this.$resultsContainer.find('.search-items [data-col=' + currentWidth.name + ']').width(currentWidth.resultWidth); + }, this)); + _.each(resizers, _.bind(function (item, index) { + $(item).position({left: this.resizeResults.currentResizersPosition[index]}); + }, this)); + } + }, + resultsResizeStart: function (e) { $(document).on('mousemove', this.resizeResults.events.mousemove) .on('mouseup', this.resizeResults.events.mouseup); @@ -431,6 +469,9 @@ define([ console.log('initX ', this.resizeResults.initX); console.log('max/doc width ', this.resizeResults.max); console.log('min 0/header resizer left - container left border ', this.resizeResults.min); + + this.fillResultColsSize(); + this.resizeResults.isChanged = true; }, resultsResizeMove: function (e) { @@ -491,6 +532,8 @@ define([ this.updateFormulaColWidth(); this.$resultsContainer.scrollerX.update({alwaysVisibleX: true}); + + this.fillResultColsSize(); }, onLayoutResize: function () { diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index d94158c2c..9c1054dd5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -445,6 +445,7 @@ define([ me.addTooltips($item, item); }); this.view.$resultsContainer.show(); + this.view.applyResultColsSize(); } },