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
3342f6e6
Commit
3342f6e6
authored
Aug 23, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE desktop] Bug with editor loading.
parent
c47166ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+2
-1
apps/documenteditor/main/app/view/Toolbar.js
apps/documenteditor/main/app/view/Toolbar.js
+5
-4
No files found.
apps/documenteditor/main/app/controller/Toolbar.js
View file @
3342f6e6
...
@@ -2194,7 +2194,8 @@ define([
...
@@ -2194,7 +2194,8 @@ define([
var
me
=
this
,
equationsStore
=
this
.
getApplication
().
getCollection
(
'
EquationGroups
'
);
var
me
=
this
,
equationsStore
=
this
.
getApplication
().
getCollection
(
'
EquationGroups
'
);
me
.
equationPickers
=
[];
me
.
equationPickers
=
[];
me
.
toolbar
.
btnInsertEquation
.
menu
.
removeAll
();
for
(
var
i
=
0
;
i
<
equationsStore
.
length
;
++
i
)
{
for
(
var
i
=
0
;
i
<
equationsStore
.
length
;
++
i
)
{
var
equationGroup
=
equationsStore
.
at
(
i
);
var
equationGroup
=
equationsStore
.
at
(
i
);
...
...
apps/documenteditor/main/app/view/Toolbar.js
View file @
3342f6e6
...
@@ -1186,7 +1186,9 @@ define([
...
@@ -1186,7 +1186,9 @@ define([
]
]
})
})
);
);
if
(
this
.
mode
.
isDesktopApp
)
this
.
mnuitemHideTitleBar
.
hide
();
this
.
btnMarkers
.
setMenu
(
this
.
btnMarkers
.
setMenu
(
new
Common
.
UI
.
Menu
({
new
Common
.
UI
.
Menu
({
items
:
[
items
:
[
...
@@ -1511,10 +1513,9 @@ define([
...
@@ -1511,10 +1513,9 @@ define([
}
}
}
}
if
(
mode
.
isDesktopApp
)
{
if
(
mode
.
isDesktopApp
)
$
(
'
.toolbar-group-native
'
).
hide
();
$
(
'
.toolbar-group-native
'
).
hide
();
this
.
mnuitemHideTitleBar
.
hide
();
}
this
.
btnMailRecepients
.
setVisible
(
mode
.
canCoAuthoring
==
true
&&
mode
.
canUseMailMerge
);
this
.
btnMailRecepients
.
setVisible
(
mode
.
canCoAuthoring
==
true
&&
mode
.
canUseMailMerge
);
this
.
listStylesAdditionalMenuItem
.
setVisible
(
mode
.
canEditStyles
);
this
.
listStylesAdditionalMenuItem
.
setVisible
(
mode
.
canEditStyles
);
},
},
...
...
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