Commit c9e692d5 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander.Trofimov

[ios] для нативной версии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67207 954022d7-b5bf-4e40-9824-e11837661b57
parent 613988b6
...@@ -1144,7 +1144,7 @@ ...@@ -1144,7 +1144,7 @@
WorksheetView.prototype._prepareDrawingObjects = function () { WorksheetView.prototype._prepareDrawingObjects = function () {
this.objectRender = new DrawingObjects(); this.objectRender = new DrawingObjects();
if (!window["NATIVE_EDITOR_ENJINE"]) if (!window["NATIVE_EDITOR_ENJINE"] || window['IS_NATIVE_EDITOR'])
this.objectRender.init(this); this.objectRender.init(this);
}; };
...@@ -1877,7 +1877,7 @@ ...@@ -1877,7 +1877,7 @@
// ----- Drawing ----- // ----- Drawing -----
WorksheetView.prototype.draw = function (lockDraw) { WorksheetView.prototype.draw = function (lockDraw) {
if (lockDraw || this.model.workbook.bCollaborativeChanges) if (lockDraw || this.model.workbook.bCollaborativeChanges || window['IS_NATIVE_EDITOR'])
return this; return this;
this._clean(); this._clean();
this._drawCorner(); this._drawCorner();
...@@ -2328,7 +2328,7 @@ ...@@ -2328,7 +2328,7 @@
} }
} }
if (!drawingCtx) { if (!drawingCtx && !window['IS_NATIVE_EDITOR']) {
left = this.cols[range.c1].left; left = this.cols[range.c1].left;
top = this.rows[range.r1].top; top = this.rows[range.r1].top;
// set clipping rect to cells area // set clipping rect to cells area
...@@ -2343,7 +2343,7 @@ ...@@ -2343,7 +2343,7 @@
var mergedCells = this._drawCells(drawingCtx, range, offsetX, offsetY); var mergedCells = this._drawCells(drawingCtx, range, offsetX, offsetY);
this._drawCellsBorders(drawingCtx, range, offsetX, offsetY, mergedCells); this._drawCellsBorders(drawingCtx, range, offsetX, offsetY, mergedCells);
if (!drawingCtx) { if (!drawingCtx && !window['IS_NATIVE_EDITOR']) {
// restore canvas' original clipping range // restore canvas' original clipping range
this.drawingCtx.restore(); this.drawingCtx.restore();
} }
...@@ -3370,6 +3370,9 @@ ...@@ -3370,6 +3370,9 @@
* @param {Asc.Range} [range] * @param {Asc.Range} [range]
*/ */
WorksheetView.prototype._drawSelection = function (range) { WorksheetView.prototype._drawSelection = function (range) {
if (window['IS_NATIVE_EDITOR'])
return;
if (!this.isSelectionDialogMode) { if (!this.isSelectionDialogMode) {
this._drawCollaborativeElements(/*bIsDrawObjects*/true); this._drawCollaborativeElements(/*bIsDrawObjects*/true);
this._drawSelectionRange(range); this._drawSelectionRange(range);
...@@ -3778,6 +3781,9 @@ ...@@ -3778,6 +3781,9 @@
}; };
WorksheetView.prototype.cleanSelection = function (range, isFrozen) { WorksheetView.prototype.cleanSelection = function (range, isFrozen) {
if (window['IS_NATIVE_EDITOR'])
return;
isFrozen = !!isFrozen; isFrozen = !!isFrozen;
if (range === undefined) if (range === undefined)
range = this.visibleRange; range = this.visibleRange;
...@@ -4996,6 +5002,7 @@ ...@@ -4996,6 +5002,7 @@
tm.width = asc_calcnpt( tm.width, this._getPPIX() ); tm.width = asc_calcnpt( tm.width, this._getPPIX() );
tm.height = asc_calcnpt(tm.height, 96); tm.height = asc_calcnpt(tm.height, 96);
tm.baseline = asc_calcnpt(tm.baseline, 96); tm.baseline = asc_calcnpt(tm.baseline, 96);
if (tm.centerline !== undefined) { if (tm.centerline !== undefined) {
tm.centerline = asc_calcnpt(tm.centerline, 96); tm.centerline = asc_calcnpt(tm.centerline, 96);
} }
...@@ -7094,6 +7101,7 @@ ...@@ -7094,6 +7101,7 @@
this.cleanSelection(); this.cleanSelection();
ar.assign2(newRange); ar.assign2(newRange);
this._drawSelection(); this._drawSelection();
//ToDo this.drawDepCells(); //ToDo this.drawDepCells();
if (!this.isCellEditMode) { if (!this.isCellEditMode) {
......
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