Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
13bc24ae
Commit
13bc24ae
authored
Apr 29, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "move document.js to common"
This reverts commit
00ae364d
.
parent
7682be27
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17427 additions
and
17449 deletions
+17427
-17449
build/configs/webexcel.json
build/configs/webexcel.json
+1
-1
build/configs/webpowerpoint.json
build/configs/webpowerpoint.json
+1
-1
build/configs/webword.json
build/configs/webword.json
+1
-1
word/Editor/Document.js
word/Editor/Document.js
+17424
-17446
No files found.
build/configs/webexcel.json
View file @
13bc24ae
...
@@ -25,7 +25,6 @@
...
@@ -25,7 +25,6 @@
"../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"
,
...
@@ -137,6 +136,7 @@
...
@@ -137,6 +136,7 @@
"../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"
,
...
...
build/configs/webpowerpoint.json
View file @
13bc24ae
...
@@ -25,7 +25,6 @@
...
@@ -25,7 +25,6 @@
"../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"
,
...
@@ -138,6 +137,7 @@
...
@@ -138,6 +137,7 @@
"../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"
,
...
...
build/configs/webword.json
View file @
13bc24ae
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
"../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"
,
...
@@ -111,6 +110,7 @@
...
@@ -111,6 +110,7 @@
"../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"
,
...
...
common/editor/d
ocument.js
→
word/Editor/D
ocument.js
View file @
13bc24ae
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
"
use strict
"
;
"
use strict
"
;
// TODO: Сейчас Paragraph.Recalculate_FastWholeParagraph работает только на добавлении текста, надо переделать
// TODO: Сейчас Paragraph.Recalculate_FastWholeParagraph работает только на добавлении текста, надо переделать
...
@@ -38,6 +14,8 @@ var changestype_Paragraph_Content = AscCommon.changestype_Paragraph_Content;
...
@@ -38,6 +14,8 @@ 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
;
...
@@ -10902,7 +10880,7 @@ CDocument.prototype =
...
@@ -10902,7 +10880,7 @@ CDocument.prototype =
{
{
if
(
true
===
e
.
CtrlKey
)
// Ctrl + Insert (аналогично Ctrl + C)
if
(
true
===
e
.
CtrlKey
)
// Ctrl + Insert (аналогично Ctrl + C)
{
{
AscCommon
.
Editor_Copy
(
this
.
Api
);
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)
...
@@ -10917,7 +10895,7 @@ CDocument.prototype =
...
@@ -10917,7 +10895,7 @@ CDocument.prototype =
window
.
GlobalPasteFlag
=
true
;
window
.
GlobalPasteFlag
=
true
;
editor
.
incrementCounterLongAction
();
editor
.
incrementCounterLongAction
();
AscCommon
.
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
else
else
...
@@ -10929,7 +10907,7 @@ CDocument.prototype =
...
@@ -10929,7 +10907,7 @@ CDocument.prototype =
AscCommon
.
SafariIntervalFocus
();
AscCommon
.
SafariIntervalFocus
();
window
.
GlobalPasteFlag
=
true
;
window
.
GlobalPasteFlag
=
true
;
editor
.
incrementCounterLongAction
();
editor
.
incrementCounterLongAction
();
AscCommon
.
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
}
}
...
@@ -10952,7 +10930,7 @@ CDocument.prototype =
...
@@ -10952,7 +10930,7 @@ CDocument.prototype =
{
{
if
(
false
===
this
.
Document_Is_SelectionLocked
(
changestype_Paragraph_Content
)
)
if
(
false
===
this
.
Document_Is_SelectionLocked
(
changestype_Paragraph_Content
)
)
{
{
AscCommon
.
Editor_Copy
(
this
.
Api
,
true
);
Editor_Copy
(
this
.
Api
,
true
);
}
}
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
...
@@ -11030,7 +11008,7 @@ CDocument.prototype =
...
@@ -11030,7 +11008,7 @@ CDocument.prototype =
}
}
else
// Ctrl + C - copy
else
// Ctrl + C - copy
{
{
AscCommon
.
Editor_Copy
(
this
.
Api
);
Editor_Copy
(
this
.
Api
);
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
}
}
...
@@ -11171,7 +11149,7 @@ CDocument.prototype =
...
@@ -11171,7 +11149,7 @@ CDocument.prototype =
window
.
GlobalPasteFlag
=
true
;
window
.
GlobalPasteFlag
=
true
;
editor
.
incrementCounterLongAction
();
editor
.
incrementCounterLongAction
();
AscCommon
.
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
else
else
...
@@ -11183,7 +11161,7 @@ CDocument.prototype =
...
@@ -11183,7 +11161,7 @@ CDocument.prototype =
AscCommon
.
SafariIntervalFocus
();
AscCommon
.
SafariIntervalFocus
();
window
.
GlobalPasteFlag
=
true
;
window
.
GlobalPasteFlag
=
true
;
editor
.
incrementCounterLongAction
();
editor
.
incrementCounterLongAction
();
AscCommon
.
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
Editor_Paste
(
this
.
DrawingDocument
.
m_oWordControl
.
m_oApi
,
true
);
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
}
}
...
@@ -11200,7 +11178,7 @@ CDocument.prototype =
...
@@ -11200,7 +11178,7 @@ CDocument.prototype =
{
{
if
(
false
===
this
.
Document_Is_SelectionLocked
(
changestype_Paragraph_Content
)
)
if
(
false
===
this
.
Document_Is_SelectionLocked
(
changestype_Paragraph_Content
)
)
{
{
AscCommon
.
Editor_Copy
(
this
.
Api
,
true
);
Editor_Copy
(
this
.
Api
,
true
);
}
}
bRetValue
=
keydownresult_PreventKeyPress
;
bRetValue
=
keydownresult_PreventKeyPress
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment