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
14fdcdd6
Commit
14fdcdd6
authored
May 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE, PE] Реализовано открытие пустой правой панели во время загрузки документа. fix Bug 32119
parent
6b400523
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
2 deletions
+20
-2
apps/documenteditor/main/app/template/RightMenu.template
apps/documenteditor/main/app/template/RightMenu.template
+2
-0
apps/documenteditor/main/app/view/RightMenu.js
apps/documenteditor/main/app/view/RightMenu.js
+8
-1
apps/presentationeditor/main/app/template/RightMenu.template
apps/presentationeditor/main/app/template/RightMenu.template
+2
-0
apps/presentationeditor/main/app/view/RightMenu.js
apps/presentationeditor/main/app/view/RightMenu.js
+8
-1
No files found.
apps/documenteditor/main/app/template/RightMenu.template
View file @
14fdcdd6
...
...
@@ -16,6 +16,8 @@
</div>
<div id="id-textart-settings" class="settings-panel">
</div>
<div id="id-empty-settings" class="settings-panel">
</div>
</div>
<div class="tool-menu-btns">
<div class="ct-btn-category arrow-left" />
...
...
apps/documenteditor/main/app/view/RightMenu.js
View file @
14fdcdd6
...
...
@@ -142,7 +142,9 @@ define([
this
.
trigger
(
'
render:before
'
,
this
);
el
.
css
(
'
width
'
,
'
40px
'
);
var
open
=
Common
.
localStorage
.
getItem
(
"
de-hide-right-settings
"
);
open
=
(
open
===
null
||
parseInt
(
open
)
==
0
);
el
.
css
(
'
width
'
,
((
open
)
?
MENU_SCALE_PART
:
SCALE_MIN
)
+
'
px
'
);
el
.
show
();
el
.
html
(
this
.
template
({}));
...
...
@@ -194,6 +196,11 @@ define([
});
}
if
(
open
)
{
$
(
'
#id-empty-settings
'
).
parent
().
css
(
"
display
"
,
"
inline-block
"
);
$
(
'
#id-empty-settings
'
).
addClass
(
"
active
"
);
}
this
.
trigger
(
'
render:after
'
,
this
);
return
this
;
...
...
apps/presentationeditor/main/app/template/RightMenu.template
View file @
14fdcdd6
...
...
@@ -14,6 +14,8 @@
</div>
<div id="id-textart-settings" class="settings-panel">
</div>
<div id="id-empty-settings" class="settings-panel">
</div>
</div>
<div class="tool-menu-btns">
<div class="ct-btn-category arrow-left" />
...
...
apps/presentationeditor/main/app/view/RightMenu.js
View file @
14fdcdd6
...
...
@@ -141,7 +141,9 @@ define([
this
.
trigger
(
'
render:before
'
,
this
);
el
.
css
(
'
width
'
,
'
40px
'
);
var
open
=
Common
.
localStorage
.
getItem
(
"
pe-hide-right-settings
"
);
open
=
(
open
===
null
||
parseInt
(
open
)
==
0
);
el
.
css
(
'
width
'
,
((
open
)
?
MENU_SCALE_PART
:
SCALE_MIN
)
+
'
px
'
);
el
.
show
();
el
.
html
(
this
.
template
({}));
...
...
@@ -178,6 +180,11 @@ define([
});
}
if
(
open
)
{
$
(
'
#id-empty-settings
'
).
parent
().
css
(
"
display
"
,
"
inline-block
"
);
$
(
'
#id-empty-settings
'
).
addClass
(
"
active
"
);
}
this
.
trigger
(
'
render:after
'
,
this
);
return
this
;
...
...
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