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
98c04632
Commit
98c04632
authored
Aug 12, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Refactoring + disable "insert page number to current position" when paragraph is disabled.
parent
6ea59501
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
69 deletions
+73
-69
apps/common/main/lib/component/Button.js
apps/common/main/lib/component/Button.js
+3
-4
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+2
-2
apps/documenteditor/main/app/view/Toolbar.js
apps/documenteditor/main/app/view/Toolbar.js
+68
-63
No files found.
apps/common/main/lib/component/Button.js
View file @
98c04632
...
@@ -414,8 +414,7 @@ define([
...
@@ -414,8 +414,7 @@ define([
},
},
setDisabled
:
function
(
disabled
)
{
setDisabled
:
function
(
disabled
)
{
if
(
this
.
rendered
&&
if
(
this
.
rendered
&&
this
.
disabled
!=
disabled
)
{
this
.
disabled
!=
disabled
)
{
var
el
=
this
.
cmpEl
,
var
el
=
this
.
cmpEl
,
isGroup
=
el
.
hasClass
(
'
btn-group
'
);
isGroup
=
el
.
hasClass
(
'
btn-group
'
);
...
@@ -490,9 +489,9 @@ define([
...
@@ -490,9 +489,9 @@ define([
}
}
}
}
}
}
}
}
,
,
setMenu
:
function
(
m
)
{
setMenu
:
function
(
m
)
{
if
(
m
&&
_
.
isObject
(
m
)
&&
_
.
isFunction
(
m
.
render
)){
if
(
m
&&
_
.
isObject
(
m
)
&&
_
.
isFunction
(
m
.
render
)){
this
.
menu
=
m
;
this
.
menu
=
m
;
this
.
menu
.
render
(
this
.
cmpEl
);
this
.
menu
.
render
(
this
.
cmpEl
);
...
...
apps/common/main/lib/component/ComboBoxFonts.js
View file @
98c04632
...
@@ -85,8 +85,8 @@ define([
...
@@ -85,8 +85,8 @@ define([
initialize
:
function
(
options
)
{
initialize
:
function
(
options
)
{
Common
.
UI
.
ComboBox
.
prototype
.
initialize
.
call
(
this
,
_
.
extend
(
options
,
{
Common
.
UI
.
ComboBox
.
prototype
.
initialize
.
call
(
this
,
_
.
extend
(
options
,
{
displayField
:
'
name
'
displayField
:
'
name
'
,
,
scroller
:
{
scroller
:
{
alwaysVisibleY
:
true
,
alwaysVisibleY
:
true
,
onChange
:
this
.
updateVisibleFontsTiles
.
bind
(
this
)
onChange
:
this
.
updateVisibleFontsTiles
.
bind
(
this
)
}
}
...
...
apps/documenteditor/main/app/view/Toolbar.js
View file @
98c04632
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