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
fb0e00ed
Commit
fb0e00ed
authored
Oct 19, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE] Hints in the toolbar are moved to delayed loading.
parent
65ec79e1
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
54 deletions
+61
-54
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-1
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+6
-1
apps/presentationeditor/main/app/view/Toolbar.js
apps/presentationeditor/main/app/view/Toolbar.js
+54
-52
No files found.
apps/presentationeditor/main/app/controller/Main.js
View file @
fb0e00ed
...
...
@@ -653,7 +653,7 @@ define([
if
(
window
.
styles_loaded
)
{
clearInterval
(
timer_sl
);
toolbarController
.
getView
(
'
Toolbar
'
).
createDelayedElements
();
toolbarController
.
createDelayedElements
();
documentHolderController
.
getView
(
'
DocumentHolder
'
).
createDelayedElements
();
...
...
apps/presentationeditor/main/app/controller/Toolbar.js
View file @
fb0e00ed
...
...
@@ -171,7 +171,7 @@ define([
// Create toolbar view
this
.
toolbar
=
this
.
createView
(
'
Toolbar
'
);
this
.
toolbar
.
on
(
'
render:after
'
,
_
.
bind
(
this
.
onToolbarAfterRender
,
this
));
//
this.toolbar.on('render:after', _.bind(this.onToolbarAfterRender, this));
},
onToolbarAfterRender
:
function
(
toolbar
)
{
...
...
@@ -1829,6 +1829,11 @@ define([
}
},
createDelayedElements
:
function
()
{
this
.
toolbar
.
createDelayedElements
();
this
.
onToolbarAfterRender
(
this
.
toolbar
);
},
textEmptyImgUrl
:
'
You need to specify image URL.
'
,
textWarning
:
'
Warning
'
,
textFontSizeErr
:
'
The entered value must be more than 0
'
,
...
...
apps/presentationeditor/main/app/view/Toolbar.js
View file @
fb0e00ed
This diff is collapsed.
Click to expand it.
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