Commit 694233ae authored by Oleg Korshul's avatar Oleg Korshul

.

parent 320ca78d
......@@ -407,8 +407,8 @@ function (window, undefined)
_mode = 2;
}
var _object_bounds = _controller.getSelectedObjectsBounds();
if ((0 == _mode) && _object_bounds)
var _object_bounds = _controller.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds)
{
_pos = this.ConvertCoordsToCursor(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X;
......@@ -501,6 +501,13 @@ function (window, undefined)
// никаких таблиц
this.TableTrackEnabled = false;
this.CellEditorType = Asc.c_oAscCellEditorState.editEnd;
var _that = this;
this.Api.asc_registerCallback('asc_onEditCell', function(_state) {
_that.CellEditorType = _state;
});
};
CMobileTouchManager.prototype.MoveCursorToPoint = function()
......@@ -684,6 +691,8 @@ function (window, undefined)
}
case AscCommon.MobileTouchMode.Zoom:
{
this.Api.asc_closeCellEditor();
this.ZoomDistance = this.getPointerDistance(e);
this.ZoomValue = this.delegate.GetZoom();
......
......@@ -6362,9 +6362,9 @@ DrawingObjectsController.prototype =
this.checkSelectedObjectsAndCallback(this.unGroupCallback, null, false, AscDFH.historydescription_CommonControllerUnGroup)
},
getSelectedObjectsBounds: function()
getSelectedObjectsBounds: function(isTextSelectionUse)
{
if(!this.getTargetDocContent() && this.selectedObjects.length > 0)
if((!this.getTargetDocContent() || true === isTextSelectionUse) && this.selectedObjects.length > 0)
{
var nPageIndex, aDrawings, oRes, aSelectedCopy, i;
if(this.selection.groupSelection)
......
......@@ -435,8 +435,8 @@
_mode = 2;
}
var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds();
if ((0 == _mode) && _object_bounds)
var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds)
{
_pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X;
......
......@@ -320,8 +320,8 @@
_mode = 2;
}
var _object_bounds = _controller.getSelectedObjectsBounds();
if ((0 == _mode) && _object_bounds)
var _object_bounds = _controller.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds)
{
_pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X;
......
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