Commit d29c4b64 authored by Oleg Korshul's avatar Oleg Korshul

mobile (web) bugs

parent 951a9cd3
...@@ -618,6 +618,9 @@ ...@@ -618,6 +618,9 @@
this.pointerTouchesCoords = {}; this.pointerTouchesCoords = {};
this.IsZoomCheckFit = false; this.IsZoomCheckFit = false;
this.isShowingContextMenu = false;
this.isMobileContextMenuShowResize = false;
} }
CMobileTouchManagerBase.prototype.initEvents = function(_id) CMobileTouchManagerBase.prototype.initEvents = function(_id)
...@@ -768,6 +771,11 @@ ...@@ -768,6 +771,11 @@
var _Transform = _table_outline_dr.TableMatrix; var _Transform = _table_outline_dr.TableMatrix;
var _PageNum = _table_outline_dr.CurrentPageIndex; var _PageNum = _table_outline_dr.CurrentPageIndex;
var _PageNumOrigin = _PageNum;
if (_table_outline_dr.TableOutline)
_PageNumOrigin = _table_outline_dr.TableOutline.PageNum;
if (!_Transform || global_MatrixTransformer.IsIdentity(_Transform)) if (!_Transform || global_MatrixTransformer.IsIdentity(_Transform))
{ {
var _x = global_mouseEvent.X; var _x = global_mouseEvent.X;
...@@ -777,7 +785,7 @@ ...@@ -777,7 +785,7 @@
var _offset = this.TableRulersRectSize + this.TableRulersRectOffset; var _offset = this.TableRulersRectSize + this.TableRulersRectOffset;
if (_x > (posLT.X - _offset - _eps) && _x < (posLT.X - this.TableRulersRectOffset + _eps) && if (_x > (posLT.X - _offset - _eps) && _x < (posLT.X - this.TableRulersRectOffset + _eps) &&
_y > (posLT.Y - _offset - _eps) && _y < (posLT.Y - this.TableRulersRectOffset + _eps)) _y > (posLT.Y - _offset - _eps) && _y < (posLT.Y - this.TableRulersRectOffset + _eps) && (_PageNumOrigin == _PageNum))
{ {
this.Mode = AscCommon.MobileTouchMode.TableMove; this.Mode = AscCommon.MobileTouchMode.TableMove;
bIsTable = true; bIsTable = true;
...@@ -1084,6 +1092,20 @@ ...@@ -1084,6 +1092,20 @@
var _position = this.delegate.GetScrollPosition(); var _position = this.delegate.GetScrollPosition();
this.iScroll.refresh(_position); this.iScroll.refresh(_position);
} }
if (this.isMobileContextMenuShowResize)
this.SendShowContextMenu();
};
CMobileTouchManagerBase.prototype.Resize_Before = function()
{
this.isMobileContextMenuShowResize = this.isShowingContextMenu;
};
CMobileTouchManagerBase.prototype.Resize_After = function()
{
if (this.isMobileContextMenuShowResize)
this.SendShowContextMenu();
this.isMobileContextMenuShowResize = false;
}; };
// есть ли тач или анимационный скролл/зум // есть ли тач или анимационный скролл/зум
...@@ -1114,6 +1136,8 @@ ...@@ -1114,6 +1136,8 @@
if (-1 != this.ContextMenuShowTimerId) if (-1 != this.ContextMenuShowTimerId)
clearTimeout(this.ContextMenuShowTimerId); clearTimeout(this.ContextMenuShowTimerId);
this.isShowingContextMenu = true;
var that = this; var that = this;
this.ContextMenuShowTimerId = setTimeout(function() this.ContextMenuShowTimerId = setTimeout(function()
{ {
...@@ -1373,6 +1397,7 @@ ...@@ -1373,6 +1397,7 @@
if (this.ContextMenuShowTimerId != -1) if (this.ContextMenuShowTimerId != -1)
clearTimeout(this.ContextMenuShowTimerId); clearTimeout(this.ContextMenuShowTimerId);
this.isShowingContextMenu = false;
this.Api.sendEvent("asc_onHidePopMenu"); this.Api.sendEvent("asc_onHidePopMenu");
}; };
......
...@@ -945,6 +945,9 @@ function CEditorPage(api) ...@@ -945,6 +945,9 @@ function CEditorPage(api)
oWordControl.m_bIsRePaintOnScroll = true; oWordControl.m_bIsRePaintOnScroll = true;
oWordControl.OnScroll(); oWordControl.OnScroll();
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_After();
}; };
this.zoom_Out = function() this.zoom_Out = function()
...@@ -2438,6 +2441,9 @@ function CEditorPage(api) ...@@ -2438,6 +2441,9 @@ function CEditorPage(api)
return; return;
} }
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_Before();
//console.log("resize"); //console.log("resize");
this.CheckRetinaDisplay(); this.CheckRetinaDisplay();
this.m_oBody.Resize(this.Width * g_dKoef_pix_to_mm, this.Height * g_dKoef_pix_to_mm, this); this.m_oBody.Resize(this.Width * g_dKoef_pix_to_mm, this.Height * g_dKoef_pix_to_mm, this);
...@@ -2489,6 +2495,9 @@ function CEditorPage(api) ...@@ -2489,6 +2495,9 @@ function CEditorPage(api)
this.onTimerScroll_sync(true); this.onTimerScroll_sync(true);
this.DemonstrationManager.Resize(); this.DemonstrationManager.Resize();
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_After();
}; };
this.OnResize2 = function(isAttack) this.OnResize2 = function(isAttack)
......
...@@ -997,6 +997,9 @@ function CEditorPage(api) ...@@ -997,6 +997,9 @@ function CEditorPage(api)
oWordControl.OnScroll(); oWordControl.OnScroll();
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_After();
}; };
this.zoom_Out = function() this.zoom_Out = function()
...@@ -2648,6 +2651,9 @@ function CEditorPage(api) ...@@ -2648,6 +2651,9 @@ function CEditorPage(api)
if (!isNewSize && false === isAttack) if (!isNewSize && false === isAttack)
return; return;
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_Before();
this.CheckRetinaDisplay(); this.CheckRetinaDisplay();
this.m_oBody.Resize(this.Width * g_dKoef_pix_to_mm, this.Height * g_dKoef_pix_to_mm, this); this.m_oBody.Resize(this.Width * g_dKoef_pix_to_mm, this.Height * g_dKoef_pix_to_mm, this);
this.onButtonTabsDraw(); this.onButtonTabsDraw();
...@@ -2705,6 +2711,9 @@ function CEditorPage(api) ...@@ -2705,6 +2711,9 @@ function CEditorPage(api)
this.OnScroll(); this.OnScroll();
this.onTimerScroll2_sync(); this.onTimerScroll2_sync();
if (this.MobileTouchManager)
this.MobileTouchManager.Resize_After();
}; };
this.checkNeedRules = function() this.checkNeedRules = function()
......
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