Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
web-apps
Commits
b5510030
Commit
b5510030
authored
Jun 05, 2017
by
Julia Radzhabova
Committed by
GitHub
Jun 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #77 from ONLYOFFICE/hotfix/v4.3.5
Hotfix/v4.3.5
parents
80025b35
fc82df5e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
apps/api/documents/api.js
apps/api/documents/api.js
+3
-1
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+4
-3
apps/documenteditor/main/app/controller/Statusbar.js
apps/documenteditor/main/app/controller/Statusbar.js
+8
-4
No files found.
apps/api/documents/api.js
View file @
b5510030
...
...
@@ -115,7 +115,8 @@
statusBar: true,
autosave: true,
forcesave: false,
commentAuthorOnly: false
commentAuthorOnly: false,
showReviewChanges: false
},
plugins: {
autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}',
...
...
@@ -328,6 +329,7 @@
if
(
!
_config
.
document
.
permissions
)
_config
.
document
.
permissions
=
{};
_config
.
document
.
permissions
.
edit
=
_config
.
document
.
permissions
.
review
=
false
;
_config
.
editorConfig
.
canUseHistory
=
false
;
}
if
(
!
_config
.
document
.
title
||
_config
.
document
.
title
==
''
)
...
...
apps/common/main/lib/component/ComboBoxFonts.js
View file @
b5510030
...
...
@@ -383,12 +383,11 @@ define([
}
$
(
this
.
el
).
find
(
'
ul
'
).
scrollTop
(
0
);
this
.
trigger
(
'
show:after
'
,
this
,
e
);
this
.
flushVisibleFontsTiles
();
this
.
updateVisibleFontsTiles
(
null
,
0
);
}
else
{
Common
.
UI
.
ComboBox
.
prototype
.
onAfterShowMenu
.
apply
(
this
,
arguments
);
}
this
.
flushVisibleFontsTiles
();
this
.
updateVisibleFontsTiles
(
null
,
0
);
},
onAfterHideMenu
:
function
(
e
)
{
...
...
@@ -399,6 +398,8 @@ define([
},
addItemToRecent
:
function
(
record
)
{
if
(
this
.
recent
<
1
)
return
;
if
(
record
.
get
(
'
type
'
)
!=
FONT_TYPE_RECENT
&&
!
this
.
store
.
findWhere
({
name
:
record
.
get
(
'
name
'
),
type
:
FONT_TYPE_RECENT
}))
{
var
fonts
=
this
.
store
.
where
({
type
:
FONT_TYPE_RECENT
});
...
...
apps/documenteditor/main/app/controller/Statusbar.js
View file @
b5510030
...
...
@@ -182,6 +182,8 @@ define([
value
=
Common
.
localStorage
.
getItem
(
"
de-new-changes
"
);
this
.
showNewChangesTip
=
!
(
value
&&
parseInt
(
value
)
==
1
)
&&
!
this
.
statusbar
.
mode
.
isLightVersion
;
var
showChangesPanel
=
(
typeof
(
this
.
statusbar
.
mode
.
customization
)
==
'
object
'
&&
!!
this
.
statusbar
.
mode
.
customization
.
showReviewChanges
);
if
(
this
.
statusbar
.
mode
.
isReviewOnly
)
{
var
iconEl
=
$
(
'
.btn-icon
'
,
this
.
statusbar
.
btnReview
.
cmpEl
);
(
this
.
api
.
asc_HaveRevisionsChanges
())
?
iconEl
.
removeClass
(
this
.
statusbar
.
btnReviewCls
).
addClass
(
'
btn-ic-changes
'
)
:
iconEl
.
removeClass
(
'
btn-ic-changes
'
).
addClass
(
this
.
statusbar
.
btnReviewCls
);
...
...
@@ -197,9 +199,10 @@ define([
}
else
{
value
=
Common
.
localStorage
.
getItem
(
"
de-track-changes
"
);
var
doc_review
=
this
.
api
.
asc_IsTrackRevisions
();
if
(
!
doc_review
)
if
(
!
doc_review
)
{
this
.
changeReviewStatus
(
false
);
else
{
this
.
statusbar
.
mnuChangesPanel
.
setChecked
(
showChangesPanel
);
}
else
{
var
iconEl
=
$
(
'
.btn-icon
'
,
this
.
statusbar
.
btnReview
.
cmpEl
);
(
this
.
api
.
asc_HaveRevisionsChanges
())
?
iconEl
.
removeClass
(
this
.
statusbar
.
btnReviewCls
).
addClass
(
'
btn-ic-changes
'
)
:
iconEl
.
removeClass
(
'
btn-ic-changes
'
).
addClass
(
this
.
statusbar
.
btnReviewCls
);
if
(
value
!==
null
&&
parseInt
(
value
)
==
1
)
{
...
...
@@ -214,6 +217,7 @@ define([
this
.
statusbar
.
btnReview
.
updateHint
(
this
.
statusbar
.
tipReview
);
}
else
{
this
.
changeReviewStatus
(
false
);
this
.
statusbar
.
mnuChangesPanel
.
setChecked
(
showChangesPanel
);
if
(
this
.
api
.
asc_HaveRevisionsChanges
()
&&
this
.
showNewChangesTip
&&
!
statusbarIsHidden
){
this
.
statusbar
.
btnReview
.
updateHint
(
''
);
if
(
this
.
newChangesTooltip
===
undefined
)
...
...
@@ -296,11 +300,11 @@ define([
if
(
this
.
api
)
{
this
.
api
.
asc_SetTrackRevisions
(
state
);
}
this
.
showHideReviewChangesPanel
(
state
&&
!
this
.
statusbar
.
mode
.
isLightVersion
);
this
.
showHideReviewChangesPanel
(
state
);
},
showHideReviewChangesPanel
:
function
(
state
)
{
this
.
reviewChangesPanel
[
state
?
'
show
'
:
'
hide
'
]();
this
.
reviewChangesPanel
[
(
state
&&
!
this
.
statusbar
.
mode
.
isLightVersion
)
?
'
show
'
:
'
hide
'
]();
},
synchronizeChanges
:
function
()
{
...
...
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