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
b23cbb32
Commit
b23cbb32
authored
Apr 11, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Bugs with document without styles: update from style, create new style, delete all styles.
parent
65ccd925
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
7 deletions
+13
-7
apps/common/main/lib/component/ComboDataView.js
apps/common/main/lib/component/ComboDataView.js
+4
-0
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+4
-3
apps/documenteditor/main/app/view/StyleTitleDialog.js
apps/documenteditor/main/app/view/StyleTitleDialog.js
+5
-4
No files found.
apps/common/main/lib/component/ComboDataView.js
View file @
b23cbb32
...
@@ -456,6 +456,10 @@ define([
...
@@ -456,6 +456,10 @@ define([
}
}
},
},
clearComboView
:
function
()
{
this
.
fieldPicker
.
store
.
reset
([]);
},
selectByIndex
:
function
(
index
)
{
selectByIndex
:
function
(
index
)
{
if
(
index
<
0
)
if
(
index
<
0
)
this
.
fieldPicker
.
deselectAll
();
this
.
fieldPicker
.
deselectAll
();
...
...
apps/documenteditor/main/app/controller/Toolbar.js
View file @
b23cbb32
...
@@ -733,7 +733,7 @@ define([
...
@@ -733,7 +733,7 @@ define([
var
styleRec
=
listStyle
.
menuPicker
.
store
.
findWhere
({
var
styleRec
=
listStyle
.
menuPicker
.
store
.
findWhere
({
title
:
name
title
:
name
});
});
this
.
_state
.
prstyle
=
(
listStyle
.
menuPicker
.
store
.
length
>
0
)
?
name
:
undefined
;
this
.
_state
.
prstyle
=
(
listStyle
.
menuPicker
.
store
.
length
>
0
||
window
.
styles_loaded
)
?
name
:
undefined
;
listStyle
.
menuPicker
.
selectRecord
(
styleRec
);
listStyle
.
menuPicker
.
selectRecord
(
styleRec
);
listStyle
.
resumeEvents
();
listStyle
.
resumeEvents
();
...
@@ -1892,7 +1892,7 @@ define([
...
@@ -1892,7 +1892,7 @@ define([
me
.
_state
.
prstyle
=
title
;
me
.
_state
.
prstyle
=
title
;
style
.
put_Name
(
title
);
style
.
put_Name
(
title
);
characterStyle
.
put_Name
(
title
+
'
_character
'
);
characterStyle
.
put_Name
(
title
+
'
_character
'
);
style
.
put_Next
(
nextStyle
.
asc_getName
()
);
style
.
put_Next
(
(
nextStyle
)
?
nextStyle
.
asc_getName
()
:
null
);
me
.
api
.
asc_AddNewStyle
(
style
);
me
.
api
.
asc_AddNewStyle
(
style
);
}
}
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
me
.
toolbar
);
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
me
.
toolbar
);
...
@@ -2630,7 +2630,8 @@ define([
...
@@ -2630,7 +2630,8 @@ define([
if
(
self
.
_state
.
prstyle
)
styleRec
=
listStyles
.
menuPicker
.
store
.
findWhere
({
title
:
self
.
_state
.
prstyle
});
if
(
self
.
_state
.
prstyle
)
styleRec
=
listStyles
.
menuPicker
.
store
.
findWhere
({
title
:
self
.
_state
.
prstyle
});
listStyles
.
fillComboView
((
styleRec
)
?
styleRec
:
listStyles
.
menuPicker
.
store
.
at
(
0
),
true
);
listStyles
.
fillComboView
((
styleRec
)
?
styleRec
:
listStyles
.
menuPicker
.
store
.
at
(
0
),
true
);
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
this
);
}
}
else
if
(
listStyles
.
rendered
)
listStyles
.
clearComboView
();
window
.
styles_loaded
=
true
;
window
.
styles_loaded
=
true
;
},
},
...
...
apps/documenteditor/main/app/view/StyleTitleDialog.js
View file @
b23cbb32
...
@@ -107,9 +107,10 @@ define([
...
@@ -107,9 +107,10 @@ define([
menuStyle
:
'
width: 100%; max-height: 290px;
'
,
menuStyle
:
'
width: 100%; max-height: 290px;
'
,
editable
:
false
,
editable
:
false
,
cls
:
'
input-group-nr
'
,
cls
:
'
input-group-nr
'
,
data
:
this
.
options
.
formats
data
:
this
.
options
.
formats
,
disabled
:
(
this
.
options
.
formats
.
length
==
0
)
});
});
if
(
this
.
options
.
formats
.
length
>
0
)
this
.
cmbNextStyle
.
setValue
(
this
.
options
.
formats
[
0
].
value
);
this
.
cmbNextStyle
.
setValue
(
this
.
options
.
formats
[
0
].
value
);
},
},
...
@@ -129,7 +130,7 @@ define([
...
@@ -129,7 +130,7 @@ define([
getNextStyle
:
function
()
{
getNextStyle
:
function
()
{
var
me
=
this
;
var
me
=
this
;
return
me
.
cmbNextStyle
.
getValue
()
;
return
(
me
.
options
.
formats
.
length
>
0
)
?
me
.
cmbNextStyle
.
getValue
()
:
null
;
},
},
onBtnClick
:
function
(
event
)
{
onBtnClick
:
function
(
event
)
{
...
...
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