Commit 51dd94f0 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

баги с линейками и клавиатурой

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64665 954022d7-b5bf-4e40-9824-e11837661b57
parent 7ef9e0cb
...@@ -1847,6 +1847,12 @@ function CEditorPage(api) ...@@ -1847,6 +1847,12 @@ function CEditorPage(api)
this.onKeyDown = function(e) this.onKeyDown = function(e)
{ {
if (oThis.m_oApi.asc_IsLongAction())
{
e.preventDefault();
return;
}
var oWordControl = oThis; var oWordControl = oThis;
if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.asc_IsLongAction() || oWordControl.m_bIsMouseLock === true) if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.asc_IsLongAction() || oWordControl.m_bIsMouseLock === true)
return; return;
......
...@@ -994,7 +994,7 @@ function CHorRuler() ...@@ -994,7 +994,7 @@ function CHorRuler()
if (_y <= 3 || _y > 5.6) if (_y <= 3 || _y > 5.6)
{ {
this.IsDrawingCurTab = false; this.IsDrawingCurTab = false;
word_control.m_oOverlayApi.Clear(); word_control.OnUpdateOverlay();
} }
else else
{ {
...@@ -1325,7 +1325,7 @@ function CHorRuler() ...@@ -1325,7 +1325,7 @@ function CHorRuler()
this.OnMouseUp = function(left, top, e) this.OnMouseUp = function(left, top, e)
{ {
var word_control = this.m_oWordControl; var word_control = this.m_oWordControl;
this.m_oWordControl.m_oOverlayApi.Clear(); this.m_oWordControl.OnUpdateOverlay();
var lockedElement = check_MouseUpEvent(e); var lockedElement = check_MouseUpEvent(e);
this.m_dIndentLeft_old = -10000; this.m_dIndentLeft_old = -10000;
...@@ -1413,7 +1413,7 @@ function CHorRuler() ...@@ -1413,7 +1413,7 @@ function CHorRuler()
this.OnMouseUpExternal = function() this.OnMouseUpExternal = function()
{ {
var word_control = this.m_oWordControl; var word_control = this.m_oWordControl;
this.m_oWordControl.m_oOverlayApi.Clear(); this.m_oWordControl.OnUpdateOverlay();
this.m_dIndentLeft_old = -10000; this.m_dIndentLeft_old = -10000;
this.m_dIndentLeftFirst_old = -10000; this.m_dIndentLeftFirst_old = -10000;
...@@ -2632,7 +2632,7 @@ function CVerRuler() ...@@ -2632,7 +2632,7 @@ function CVerRuler()
var lockedElement = check_MouseUpEvent(e); var lockedElement = check_MouseUpEvent(e);
//this.m_oWordControl.m_oOverlayApi.UnShow(); //this.m_oWordControl.m_oOverlayApi.UnShow();
this.m_oWordControl.m_oOverlayApi.Clear(); this.m_oWordControl.OnUpdateOverlay();
switch (this.DragType) switch (this.DragType)
{ {
...@@ -2668,7 +2668,7 @@ function CVerRuler() ...@@ -2668,7 +2668,7 @@ function CVerRuler()
this.OnMouseUpExternal = function() this.OnMouseUpExternal = function()
{ {
//this.m_oWordControl.m_oOverlayApi.UnShow(); //this.m_oWordControl.m_oOverlayApi.UnShow();
this.m_oWordControl.m_oOverlayApi.Clear(); this.m_oWordControl.OnUpdateOverlay();
switch (this.DragType) switch (this.DragType)
{ {
......
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