Commit 00ae364d authored by Alexander.Trofimov's avatar Alexander.Trofimov

move document.js to common

parent 9c4f5e87
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"../common/Drawings/WorkEvents.js", "../common/Drawings/WorkEvents.js",
"../cell/model/History.js", "../cell/model/History.js",
"../common/editor/document.js",
"../common/editor/documentContent.js", "../common/editor/documentContent.js",
"../common/Shapes/EditorSettings.js", "../common/Shapes/EditorSettings.js",
...@@ -136,7 +137,6 @@ ...@@ -136,7 +137,6 @@
"../word/Editor/Sections.js", "../word/Editor/Sections.js",
"../word/Editor/Numbering.js", "../word/Editor/Numbering.js",
"../word/Editor/HeaderFooter.js", "../word/Editor/HeaderFooter.js",
"../word/Editor/Document.js",
"../word/Editor/Table.js", "../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js", "../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js", "../word/Editor/Table/TableDraw.js",
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"../common/Drawings/WorkEvents.js", "../common/Drawings/WorkEvents.js",
"../word/Editor/History.js", "../word/Editor/History.js",
"../common/editor/document.js",
"../common/editor/documentContent.js", "../common/editor/documentContent.js",
"../common/Shapes/EditorSettings.js", "../common/Shapes/EditorSettings.js",
...@@ -137,7 +138,6 @@ ...@@ -137,7 +138,6 @@
"../word/Editor/FlowObjects.js", "../word/Editor/FlowObjects.js",
"../word/Editor/Paragraph.js", "../word/Editor/Paragraph.js",
"../word/Editor/Paragraph_Recalculate.js", "../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Document.js",
"../word/Editor/HeaderFooter.js", "../word/Editor/HeaderFooter.js",
"../word/Editor/Math.js", "../word/Editor/Math.js",
"../word/Editor/Spelling.js", "../word/Editor/Spelling.js",
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
"../common/Drawings/WorkEvents.js", "../common/Drawings/WorkEvents.js",
"../word/Editor/History.js", "../word/Editor/History.js",
"../common/editor/document.js",
"../common/editor/documentContent.js", "../common/editor/documentContent.js",
"../common/Shapes/EditorSettings.js", "../common/Shapes/EditorSettings.js",
...@@ -110,7 +111,6 @@ ...@@ -110,7 +111,6 @@
"../word/Editor/Sections.js", "../word/Editor/Sections.js",
"../word/Editor/Numbering.js", "../word/Editor/Numbering.js",
"../word/Editor/HeaderFooter.js", "../word/Editor/HeaderFooter.js",
"../word/Editor/Document.js",
"../word/Editor/Common.js", "../word/Editor/Common.js",
"../word/Editor/Table.js", "../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js", "../word/Editor/Table/TableRecalculate.js",
......
...@@ -38,8 +38,6 @@ var changestype_Paragraph_Content = AscCommon.changestype_Paragraph_Content; ...@@ -38,8 +38,6 @@ var changestype_Paragraph_Content = AscCommon.changestype_Paragraph_Content;
var changestype_2_Element_and_Type = AscCommon.changestype_2_Element_and_Type; var changestype_2_Element_and_Type = AscCommon.changestype_2_Element_and_Type;
var changestype_2_ElementsArray_and_Type = AscCommon.changestype_2_ElementsArray_and_Type; var changestype_2_ElementsArray_and_Type = AscCommon.changestype_2_ElementsArray_and_Type;
var g_oTableId = AscCommon.g_oTableId; var g_oTableId = AscCommon.g_oTableId;
var Editor_Copy = AscCommon.Editor_Copy;
var Editor_Paste = AscCommon.Editor_Paste;
var History = AscCommon.History; var History = AscCommon.History;
var c_oAscHAnchor = Asc.c_oAscHAnchor; var c_oAscHAnchor = Asc.c_oAscHAnchor;
...@@ -10904,7 +10902,7 @@ CDocument.prototype = ...@@ -10904,7 +10902,7 @@ CDocument.prototype =
{ {
if ( true === e.CtrlKey ) // Ctrl + Insert (аналогично Ctrl + C) if ( true === e.CtrlKey ) // Ctrl + Insert (аналогично Ctrl + C)
{ {
Editor_Copy(this.Api); AscCommon.Editor_Copy(this.Api);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
else if ( true === e.ShiftKey && false === editor.isViewMode ) // Shift + Insert (аналогично Ctrl + V) else if ( true === e.ShiftKey && false === editor.isViewMode ) // Shift + Insert (аналогично Ctrl + V)
...@@ -10919,7 +10917,7 @@ CDocument.prototype = ...@@ -10919,7 +10917,7 @@ CDocument.prototype =
window.GlobalPasteFlag = true; window.GlobalPasteFlag = true;
editor.incrementCounterLongAction(); editor.incrementCounterLongAction();
Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true); AscCommon.Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
else else
...@@ -10931,7 +10929,7 @@ CDocument.prototype = ...@@ -10931,7 +10929,7 @@ CDocument.prototype =
AscCommon.SafariIntervalFocus(); AscCommon.SafariIntervalFocus();
window.GlobalPasteFlag = true; window.GlobalPasteFlag = true;
editor.incrementCounterLongAction(); editor.incrementCounterLongAction();
Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true); AscCommon.Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
} }
...@@ -10954,7 +10952,7 @@ CDocument.prototype = ...@@ -10954,7 +10952,7 @@ CDocument.prototype =
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
{ {
Editor_Copy(this.Api, true); AscCommon.Editor_Copy(this.Api, true);
} }
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
...@@ -11032,7 +11030,7 @@ CDocument.prototype = ...@@ -11032,7 +11030,7 @@ CDocument.prototype =
} }
else // Ctrl + C - copy else // Ctrl + C - copy
{ {
Editor_Copy(this.Api); AscCommon.Editor_Copy(this.Api);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
} }
...@@ -11173,7 +11171,7 @@ CDocument.prototype = ...@@ -11173,7 +11171,7 @@ CDocument.prototype =
window.GlobalPasteFlag = true; window.GlobalPasteFlag = true;
editor.incrementCounterLongAction(); editor.incrementCounterLongAction();
Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true); AscCommon.Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
else else
...@@ -11185,7 +11183,7 @@ CDocument.prototype = ...@@ -11185,7 +11183,7 @@ CDocument.prototype =
AscCommon.SafariIntervalFocus(); AscCommon.SafariIntervalFocus();
window.GlobalPasteFlag = true; window.GlobalPasteFlag = true;
editor.incrementCounterLongAction(); editor.incrementCounterLongAction();
Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true); AscCommon.Editor_Paste(this.DrawingDocument.m_oWordControl.m_oApi, true);
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
} }
...@@ -11202,7 +11200,7 @@ CDocument.prototype = ...@@ -11202,7 +11200,7 @@ CDocument.prototype =
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
{ {
Editor_Copy(this.Api, true); AscCommon.Editor_Copy(this.Api, true);
} }
bRetValue = keydownresult_PreventKeyPress; bRetValue = keydownresult_PreventKeyPress;
} }
......
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