Commit e721f205 authored by Oleg Korshul's avatar Oleg Korshul

.

parent 1e831653
......@@ -520,7 +520,7 @@ function (window, undefined)
AscCommon.check_MouseDownEvent(_e, true);
global_mouseEvent.KoefPixToMM = 1;
global_mouseEvent.LockMouse();
this.Api.sendEvent("asc_onHidePopMenu");
this.ClearContextMenu();
this.MoveAfterDown = false;
this.TimeDown = new Date().getTime();
......
......@@ -1110,12 +1110,12 @@
CMobileTouchManagerBase.prototype.SendShowContextMenu = function()
{
if (-1 != this.ContextMenuShowTimerId)
{
clearTimeout(this.ContextMenuShowTimerId);
}
var that = this;
this.ContextMenuShowTimerId = setTimeout(function()
{
that.ContextMenuShowTimerId = -1;
var _pos = that.delegate.GetContextMenuPosition();
that.Api.sendEvent("asc_onShowPopMenu", _pos.X, _pos.Y, (_pos.Mode > 1) ? true : false);
}, 500);
......@@ -1366,6 +1366,10 @@
{
//this.ContextMenuLastMode = AscCommon.MobileTouchContextMenuType.None;
//this.ContextMenuLastModeCounter = 0;
if (this.ContextMenuShowTimerId != -1)
clearTimeout(this.ContextMenuShowTimerId);
this.Api.sendEvent("asc_onHidePopMenu");
};
......
......@@ -395,7 +395,7 @@
AscCommon.check_MouseDownEvent(e.touches ? e.touches[0] : e, true);
global_mouseEvent.KoefPixToMM = 1;
global_mouseEvent.LockMouse();
this.Api.sendEvent("asc_onHidePopMenu");
this.ClearContextMenu();
this.TableCurrentMoveValueMin = null;
this.TableCurrentMoveValueMax = null;
......
......@@ -92,7 +92,8 @@
AscCommon.check_MouseDownEvent(e.touches ? e.touches[0] : e, true);
global_mouseEvent.KoefPixToMM = 1;
global_mouseEvent.LockMouse();
this.Api.sendEvent("asc_onHidePopMenu");
this.ClearContextMenu();
this.TableCurrentMoveValueMin = null;
this.TableCurrentMoveValueMax = null;
......@@ -759,7 +760,7 @@
// создаем делегата. инициализация его - ПОСЛЕ создания iScroll
this.delegate.Init(this);
this.Api.sendEvent("asc_onHidePopMenu");
this.ClearContextMenu();
};
CReaderTouchManager.prototype.onTouchStart = function(e)
......
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