Commit 7095d1e7 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 32394

parent c49f8b39
......@@ -9,6 +9,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/AdvancedOptions.js",
"../cell/apiDefines.js",
"../cell/utils/utils.js",
"../cell/view/HandlerList.js",
......@@ -21,7 +22,6 @@
"../common/downloaderfiles.js",
"../common/NumFormat.js",
"../common/SerializeChart.js",
"../common/AdvancedOptions.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
......
......@@ -9,6 +9,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/AdvancedOptions.js",
"../slide/apiDefines.js",
"../common/CollaborativeEditingBase.js",
"../slide/Editor/CollaborativeEditing.js",
......@@ -20,7 +21,6 @@
"../common/downloaderfiles.js",
"../common/NumFormat.js",
"../common/SerializeChart.js",
"../common/AdvancedOptions.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
......
......@@ -12,6 +12,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/AdvancedOptions.js",
"../word/apiDefines.js",
"../common/CollaborativeEditingBase.js",
"../word/Editor/CollaborativeEditing.js",
......@@ -23,7 +24,6 @@
"../common/downloaderfiles.js",
"../common/NumFormat.js",
"../common/SerializeChart.js",
"../common/AdvancedOptions.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
......
......@@ -2030,6 +2030,11 @@ var editor;
};
spreadsheet_api.prototype.asc_enableKeyEvents = function(isEnabled) {
if (!this.isLoadFullApi) {
this.tmpFocus = value;
return;
}
if (this.wb) {
this.wb.enableKeyEventsHandler(isEnabled);
}
......
......@@ -110,6 +110,8 @@ function baseEditorsApi(name, editorId) {
// Использовать ли обрезанные шрифты
this.isUseEmbeddedCutFonts = ("true" == ASC_DOCS_API_USE_EMBEDDED_FONTS.toLowerCase());
this.tmpFocus = null;
this.fCurCallback = null;
return this;
......@@ -231,10 +233,10 @@ baseEditorsApi.prototype.sync_EndAction = function(type, id) {
this.decrementCounterLongAction();
}
};
baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function()
{
baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function() {
this.sendEvent("asc_OnTryUndoInFastCollaborative");
};
baseEditorsApi.prototype.asc_enableKeyEvents = function(val) {};
baseEditorsApi.prototype.asc_setViewMode = function() {
};
baseEditorsApi.prototype.getViewMode = function() {
......@@ -630,6 +632,10 @@ baseEditorsApi.prototype.asc_getUrlType = function(url) {
this.textArtPreviewManager = new AscCommon.TextArtPreviewManager();
AscFormat.initStyleManager();
if (null !== this.tmpFocus) {
this.asc_enableKeyEvents(this.tmpFocus);
}
};
baseEditorsApi.prototype.sendStandartTextures = function() {
......
......@@ -3530,11 +3530,16 @@ asc_docs_api.prototype.ChangeColorScheme = function(index_scheme)
/*----------------------------------------------------------------*/
asc_docs_api.prototype.asc_enableKeyEvents = function(value){
if (!this.isLoadFullApi) {
this.tmpFocus = value;
return;
}
if (this.WordControl.IsFocus != value) {
this.WordControl.IsFocus = value;
this.asc_fireCallback("asc_onEnableKeyEventsChanged", value);
}
}
};
//-----------------------------------------------------------------
......
......@@ -5257,6 +5257,11 @@ asc_docs_api.prototype.sync_currentPageCallback = function(number){
/*----------------------------------------------------------------*/
asc_docs_api.prototype.asc_enableKeyEvents = function(value){
if (!this.isLoadFullApi) {
this.tmpFocus = value;
return;
}
if (this.WordControl.IsFocus != value) {
this.WordControl.IsFocus = value;
......
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