Commit fe391962 authored by Oleg Korshul's avatar Oleg Korshul

mobile version (web)

parent 388697eb
...@@ -220,6 +220,11 @@ function (window, undefined) ...@@ -220,6 +220,11 @@ function (window, undefined)
return _mode; return _mode;
}; };
CMobileDelegateEditorCell.prototype.IsInObject = function()
{
var _controller = this.WB.getWorksheet().objectRender.controller;
return (null != _controller.getSelectedObjectsBounds(true));
};
CMobileDelegateEditorCell.prototype.GetContextMenuInfo = function(info) CMobileDelegateEditorCell.prototype.GetContextMenuInfo = function(info)
{ {
info.Clear(); info.Clear();
...@@ -408,7 +413,7 @@ function (window, undefined) ...@@ -408,7 +413,7 @@ function (window, undefined)
} }
var _object_bounds = _controller.getSelectedObjectsBounds(true); var _object_bounds = _controller.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds) if (_object_bounds)
{ {
_pos = this.ConvertCoordsToCursor(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex); _pos = this.ConvertCoordsToCursor(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X; _posX = _pos.X;
...@@ -858,7 +863,8 @@ function (window, undefined) ...@@ -858,7 +863,8 @@ function (window, undefined)
this.Api.sendEvent("asc_onTapEvent", e); this.Api.sendEvent("asc_onTapEvent", e);
var typeMenu = this.delegate.GetContextMenuType(); var typeMenu = this.delegate.GetContextMenuType();
if (typeMenu == AscCommon.MobileTouchContextMenuType.Target) if (typeMenu == AscCommon.MobileTouchContextMenuType.Target ||
(typeMenu == AscCommon.MobileTouchContextMenuType.Select && this.delegate.IsInObject()))
isPreventDefault = false; isPreventDefault = false;
} }
else else
...@@ -924,10 +930,13 @@ function (window, undefined) ...@@ -924,10 +930,13 @@ function (window, undefined)
this.delegate.Api.controller._onMouseMove(_e); this.delegate.Api.controller._onMouseMove(_e);
} }
if (this.CellEditorType == Asc.c_oAscCellEditorState.editFormula)
isPreventDefault = false;
if (this.Api.isViewMode || isPreventDefault) if (this.Api.isViewMode || isPreventDefault)
AscCommon.g_inputContext.preventVirtualKeyboard(e); AscCommon.g_inputContext.preventVirtualKeyboard(e);
if (true !== this.iScroll.isAnimating) if (true !== this.iScroll.isAnimating && (this.CellEditorType != Asc.c_oAscCellEditorState.editFormula))
this.CheckContextMenuTouchEnd(isCheckContextMenuMode, isCheckContextMenuSelect, isCheckContextMenuCursor); this.CheckContextMenuTouchEnd(isCheckContextMenuMode, isCheckContextMenuSelect, isCheckContextMenuCursor);
return false; return false;
......
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
} }
var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds(true); var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds) if (_object_bounds)
{ {
_pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex); _pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X; _posX = _pos.X;
......
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
} }
var _object_bounds = _controller.getSelectedObjectsBounds(true); var _object_bounds = _controller.getSelectedObjectsBounds(true);
if ((0 == _mode || 2 == _mode) && _object_bounds) if (_object_bounds)
{ {
_pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex); _pos = this.DrawingDocument.ConvertCoordsToCursorWR(_object_bounds.minX, _object_bounds.minY, _object_bounds.pageIndex);
_posX = _pos.X; _posX = _pos.X;
...@@ -799,7 +799,8 @@ ...@@ -799,7 +799,8 @@
this.Api.sendEvent("asc_onTapEvent", e); this.Api.sendEvent("asc_onTapEvent", e);
var typeMenu = this.delegate.GetContextMenuType(); var typeMenu = this.delegate.GetContextMenuType();
if (typeMenu == AscCommon.MobileTouchContextMenuType.Target) if (typeMenu == AscCommon.MobileTouchContextMenuType.Target ||
typeMenu == AscCommon.MobileTouchContextMenuType.Select)
isPreventDefault = false; isPreventDefault = false;
} }
else else
......
...@@ -496,7 +496,8 @@ ...@@ -496,7 +496,8 @@
this.Api.sendEvent("asc_onTapEvent", e); this.Api.sendEvent("asc_onTapEvent", e);
var typeMenu = this.delegate.GetContextMenuType(); var typeMenu = this.delegate.GetContextMenuType();
if (typeMenu == AscCommon.MobileTouchContextMenuType.Target) if (typeMenu == AscCommon.MobileTouchContextMenuType.Target ||
typeMenu == AscCommon.MobileTouchContextMenuType.Select)
isPreventDefault = false; isPreventDefault = false;
} }
else else
......
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