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
c0234c7c
Commit
c0234c7c
authored
Jun 28, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Fix Bug 34998.
parent
ce1ab38f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
8 deletions
+20
-8
apps/documenteditor/main/app/view/ChartSettings.js
apps/documenteditor/main/app/view/ChartSettings.js
+2
-1
apps/presentationeditor/main/app/view/ChartSettings.js
apps/presentationeditor/main/app/view/ChartSettings.js
+2
-1
apps/spreadsheeteditor/main/app/view/ChartSettings.js
apps/spreadsheeteditor/main/app/view/ChartSettings.js
+4
-2
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+12
-4
No files found.
apps/documenteditor/main/app/view/ChartSettings.js
View file @
c0234c7c
...
...
@@ -145,7 +145,8 @@ define([
this
.
mnuChartTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
{
this
.
btnChartType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
}
}
else
this
.
btnChartType
.
setIconCls
(
''
);
this
.
updateChartStyles
(
this
.
api
.
asc_getChartPreviews
(
type
));
this
.
_state
.
ChartType
=
type
;
}
...
...
apps/presentationeditor/main/app/view/ChartSettings.js
View file @
c0234c7c
...
...
@@ -128,7 +128,8 @@ define([
this
.
mnuChartTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
{
this
.
btnChartType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
}
}
else
this
.
btnChartType
.
setIconCls
(
''
);
this
.
updateChartStyles
(
this
.
api
.
asc_getChartPreviews
(
type
));
this
.
_state
.
ChartType
=
type
;
}
...
...
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file @
c0234c7c
...
...
@@ -160,7 +160,8 @@ define([
this
.
mnuChartTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
{
this
.
btnChartType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
}
}
else
this
.
btnChartType
.
setIconCls
(
''
);
this
.
updateChartStyles
(
this
.
api
.
asc_getChartPreviews
(
type
));
this
.
_state
.
ChartType
=
type
;
}
...
...
@@ -226,7 +227,8 @@ define([
this
.
mnuSparkTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
{
this
.
btnSparkType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
}
}
else
this
.
btnSparkType
.
setIconCls
(
''
);
this
.
_state
.
SparkType
=
type
;
styleChanged
=
true
;
}
...
...
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file @
c0234c7c
...
...
@@ -1332,7 +1332,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this
.
mnuChartTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
{
this
.
btnChartType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
}
}
else
this
.
btnChartType
.
setIconCls
(
''
);
this
.
_noApply
=
false
;
...
...
@@ -1389,6 +1390,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this
.
mnuSparkTypePicker
.
selectRecord
(
record
,
true
);
if
(
record
)
this
.
btnSparkType
.
setIconCls
(
'
item-chartlist
'
+
record
.
get
(
'
iconCls
'
));
else
this
.
btnSparkType
.
setIconCls
(
''
);
this
.
updateSparkStyles
((
this
.
sparklineStyles
)
?
this
.
sparklineStyles
:
props
.
asc_getStyles
());
...
...
@@ -1443,10 +1446,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
},
getSettings
:
function
()
{
var
value
,
type
=
this
.
mnuChartTypePicker
.
getSelectedRec
()[
0
].
get
(
'
type
'
);
var
value
;
if
(
this
.
isChart
)
{
var
rec
=
this
.
mnuChartTypePicker
.
getSelectedRec
(),
type
=
(
rec
&&
rec
.
length
>
0
)
?
rec
[
0
].
get
(
'
type
'
)
:
this
.
currentChartType
;
this
.
chartSettings
.
putType
(
type
);
this
.
chartSettings
.
putInColumns
(
this
.
cmbDataDirect
.
getValue
()
==
1
);
...
...
@@ -1503,7 +1508,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if
(
this
.
isChart
)
{
var
isvalid
;
if
(
!
_
.
isEmpty
(
this
.
txtDataRange
.
getValue
()))
{
isvalid
=
this
.
api
.
asc_checkDataRange
(
Asc
.
c_oAscSelectionDialogType
.
Chart
,
this
.
txtDataRange
.
getValue
(),
true
,
this
.
cmbDataDirect
.
getValue
()
==
0
,
this
.
mnuChartTypePicker
.
getSelectedRec
()[
0
].
get
(
'
type
'
));
var
rec
=
this
.
mnuChartTypePicker
.
getSelectedRec
(),
type
=
(
rec
&&
rec
.
length
>
0
)
?
rec
[
0
].
get
(
'
type
'
)
:
this
.
currentChartType
;
isvalid
=
this
.
api
.
asc_checkDataRange
(
Asc
.
c_oAscSelectionDialogType
.
Chart
,
this
.
txtDataRange
.
getValue
(),
true
,
this
.
cmbDataDirect
.
getValue
()
==
0
,
type
);
if
(
isvalid
==
Asc
.
c_oAscError
.
ID
.
No
)
return
true
;
}
else
...
...
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