Commit f6effb66 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Объединил _drawCells и _drawCellsBorders в одну функцию _drawCellsAndBorders

Поправил баг http://bugzserver/show_bug.cgi?id=25000

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57340 954022d7-b5bf-4e40-9824-e11837661b57
parent cf8869c1
...@@ -1984,8 +1984,7 @@ function DrawingObjects() { ...@@ -1984,8 +1984,7 @@ function DrawingObjects() {
drawingCtx.clearRect( x1, y1, w, h ); drawingCtx.clearRect( x1, y1, w, h );
drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h); drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h);
worksheet._drawGrid(/*drawingCtx*/undefined, r_); worksheet._drawGrid(/*drawingCtx*/undefined, r_);
worksheet._drawCells(/*drawingCtx*/undefined, r_); worksheet._drawCellsAndBorders(/*drawingCtx*/undefined, r_);
worksheet._drawCellsBorders(/*drawingCtx*/undefined, r_);
} }
} }
}; };
...@@ -2108,8 +2107,7 @@ function DrawingObjects() { ...@@ -2108,8 +2107,7 @@ function DrawingObjects() {
drawingCtx.clearRect( x1, y1, w, h ); drawingCtx.clearRect( x1, y1, w, h );
drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h); drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h);
worksheet._drawGrid(undefined, updatedRange); worksheet._drawGrid(undefined, updatedRange);
worksheet._drawCells(undefined, updatedRange); worksheet._drawCellsAndBorders(undefined, updatedRange);
worksheet._drawCellsBorders(undefined, updatedRange);
} }
} }
else else
...@@ -2333,8 +2331,7 @@ function DrawingObjects() { ...@@ -2333,8 +2331,7 @@ function DrawingObjects() {
_this._drawWorksheetLayer = function (range, offsetLeft, offsetTop) { _this._drawWorksheetLayer = function (range, offsetLeft, offsetTop) {
worksheet._drawGrid(/*drawingCtx*/undefined, range, offsetLeft, offsetTop); worksheet._drawGrid(/*drawingCtx*/undefined, range, offsetLeft, offsetTop);
worksheet._drawCells(/*drawingCtx*/undefined, range, offsetLeft, offsetTop); worksheet._drawCellsAndBorders(/*drawingCtx*/undefined, range, offsetLeft, offsetTop);
worksheet._drawCellsBorders(/*drawingCtx*/undefined, range, offsetLeft, offsetTop);
}; };
_this.drawWorksheetLayer = function (range) { _this.drawWorksheetLayer = function (range) {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment