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
186126f3
Commit
186126f3
authored
Sep 14, 2016
by
Oleg Korshul
Committed by
GitHub
Sep 14, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #67 from ONLYOFFICE/hotfix/v4.1.2
Hotfix/v4.1.2
parents
c256953c
211bdd79
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
slide/Drawing/HtmlPage.js
slide/Drawing/HtmlPage.js
+4
-0
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+3
-0
word/apiBuilder.js
word/apiBuilder.js
+5
-5
No files found.
slide/Drawing/HtmlPage.js
View file @
186126f3
...
...
@@ -3064,6 +3064,10 @@ function CEditorPage(api)
this
.
onTimerScroll
=
function
(
isThUpdateSync
)
{
var
oWordControl
=
oThis
;
if
(
oWordControl
.
m_oApi
.
isLongAction
())
return
;
oWordControl
.
m_nTimeDrawingLast
=
new
Date
().
getTime
();
var
isRepaint
=
oWordControl
.
m_bIsScroll
;
...
...
word/Drawing/HtmlPage.js
View file @
186126f3
...
...
@@ -3765,6 +3765,9 @@ function CEditorPage(api)
if
(
!
oWordControl
.
m_oApi
.
bInit_word_control
)
return
;
if
(
oWordControl
.
m_oApi
.
isLongAction
())
return
;
oWordControl
.
m_nTimeDrawingLast
=
new
Date
().
getTime
();
var
isRepaint
=
oWordControl
.
m_bIsScroll
;
if
(
oWordControl
.
m_bIsScroll
)
...
...
word/apiBuilder.js
View file @
186126f3
...
...
@@ -1304,9 +1304,9 @@
this
.
Document
.
Selection_Remove
(
true
);
}
var
oParagraph
=
this
.
Document
.
Content
[
this
.
Document
.
CurPos
.
ContentPos
]
;
if
(
!
oParagraph
||
!
(
oParagraph
instanceof
Paragraph
)
)
return
false
;
var
oParagraph
=
this
.
Document
.
Get_CurrentParagraph
()
;
if
(
!
oParagraph
)
return
;
var
oNearestPos
=
{
Paragraph
:
oParagraph
,
...
...
@@ -1318,9 +1318,9 @@
if
(
!
this
.
Document
.
Can_InsertContent
(
oSelectedContent
,
oNearestPos
))
return
false
;
this
.
Document
.
Insert_Content
(
oSelectedContent
,
oNearestPos
);
this
.
Document
.
Selection_Remove
(
true
);
oParagraph
.
Parent
.
Insert_Content
(
oSelectedContent
,
oNearestPos
);
oParagraph
.
Clear_NearestPosArray
();
this
.
Document
.
Selection_Remove
(
true
);
return
true
;
};
...
...
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