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

лочим клаву, пока BlockIteration

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60329 954022d7-b5bf-4e40-9824-e11837661b57
parent d380a1e5
...@@ -1842,7 +1842,7 @@ function CEditorPage(api) ...@@ -1842,7 +1842,7 @@ function CEditorPage(api)
this.onKeyDown = function(e) this.onKeyDown = function(e)
{ {
var oWordControl = oThis; var oWordControl = oThis;
if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_bIsMouseLock === true) if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.IsLongIteration === true || oWordControl.m_bIsMouseLock === true)
return; return;
if (oThis.DemonstrationManager.Mode) if (oThis.DemonstrationManager.Mode)
...@@ -1870,7 +1870,7 @@ function CEditorPage(api) ...@@ -1870,7 +1870,7 @@ function CEditorPage(api)
} }
var oWordControl = oThis; var oWordControl = oThis;
if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_bIsMouseLock === true) if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.IsLongIteration === true || oWordControl.m_bIsMouseLock === true)
return; return;
check_KeyboardEvent(e); check_KeyboardEvent(e);
...@@ -1890,7 +1890,7 @@ function CEditorPage(api) ...@@ -1890,7 +1890,7 @@ function CEditorPage(api)
this.onKeyDownTBIM = function(e) this.onKeyDownTBIM = function(e)
{ {
var oWordControl = oThis; var oWordControl = oThis;
if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_bIsMouseLock === true) if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.IsLongIteration === true || oWordControl.m_bIsMouseLock === true)
return; return;
check_KeyboardEvent(e); check_KeyboardEvent(e);
...@@ -1996,7 +1996,7 @@ function CEditorPage(api) ...@@ -1996,7 +1996,7 @@ function CEditorPage(api)
} }
var oWordControl = oThis; var oWordControl = oThis;
if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_bIsMouseLock === true) if (false === oWordControl.m_oApi.bInit_word_control || oWordControl.IsFocus === false || oWordControl.m_oApi.IsLongIteration === true || oWordControl.m_bIsMouseLock === true)
return; return;
if (window.opera && !oWordControl.IsKeyDownButNoPress) if (window.opera && !oWordControl.IsKeyDownButNoPress)
......
...@@ -146,6 +146,8 @@ function asc_docs_api(name) ...@@ -146,6 +146,8 @@ function asc_docs_api(name)
this.tableStylesIdCounter = 0; this.tableStylesIdCounter = 0;
//выставляем тип copypaste //выставляем тип copypaste
g_bIsDocumentCopyPaste = false; g_bIsDocumentCopyPaste = false;
this.IsLongIteration = false;
this.TrackFile = null; this.TrackFile = null;
...@@ -1591,10 +1593,17 @@ asc_docs_api.prototype.sync_DownloadAsCallBack = function(){ ...@@ -1591,10 +1593,17 @@ asc_docs_api.prototype.sync_DownloadAsCallBack = function(){
asc_docs_api.prototype.sync_StartAction = function(type, id){ asc_docs_api.prototype.sync_StartAction = function(type, id){
//this.AsyncAction //this.AsyncAction
this.asc_fireCallback("asc_onStartAction", type, id); this.asc_fireCallback("asc_onStartAction", type, id);
// по идее нужен счетчик, но перед выпуском делаем верняк
if (c_oAscAsyncActionType.BlockInteraction == type)
this.IsLongIteration = true;
} }
asc_docs_api.prototype.sync_EndAction = function(type, id){ asc_docs_api.prototype.sync_EndAction = function(type, id){
//this.AsyncAction //this.AsyncAction
this.asc_fireCallback("asc_onEndAction", type, id); this.asc_fireCallback("asc_onEndAction", type, id);
if (c_oAscAsyncActionType.BlockInteraction == type)
this.IsLongIteration = false;
} }
asc_docs_api.prototype.sync_AddURLCallback = function(){ asc_docs_api.prototype.sync_AddURLCallback = function(){
this.asc_fireCallback("asc_onAddURL"); this.asc_fireCallback("asc_onAddURL");
......
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