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
ceb5fb0a
Commit
ceb5fb0a
authored
Mar 24, 2017
by
Julia Radzhabova
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Disabled adding sparklines and changing data/location range.
parent
0df0720f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
38 deletions
+41
-38
apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
...adsheeteditor/main/app/template/ChartSettingsDlg.template
+29
-29
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+4
-1
apps/spreadsheeteditor/main/app/view/Toolbar.js
apps/spreadsheeteditor/main/app/view/Toolbar.js
+8
-8
No files found.
apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
View file @
ceb5fb0a
...
...
@@ -335,35 +335,35 @@
<!--<div id="spark-dlg-radio-single" style="display: block;"></div>-->
<!--</div>-->
<table cols="2" style="width: 100%;">
<
tr
>
<
td colspan=2
>
<
label class="header"><%= scope.textDataRange %></label
>
<
/td
>
<
/tr
>
<
tr
>
<
td class="padding-small" width="200"
>
<
div id="spark-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div
>
<
/td
>
<
td class="padding-small" style="text-align: right;"
>
<
button type="button" class="btn btn-text-default" id="spark-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button
>
<
/td
>
<
/tr
>
<
tr
>
<
td colspan=2
>
<
label class="header"><%= scope.textLocationRange %></label
>
<
/td
>
<
/tr
>
<
tr
>
<
td class="padding-large" width="200"
>
<
div id="spark-dlg-txt-location" class="input-row" style="margin-right: 10px;"></div
>
<
/td
>
<
td class="padding-large" style="text-align: right;"
>
<
button type="button" class="btn btn-text-default" id="spark-dlg-btn-location-data" style="min-width: 100px;"><%= scope.textSelectData %></button
>
<
/td
>
<
/tr
>
<
tr
>
<
td colspan=2 class="padding-large"></td
>
<
/tr
>
<
!--<tr>--
>
<
!--<td colspan=2 >--
>
<
!--<label class="header"><%= scope.textDataRange %></label>--
>
<
!--</td>--
>
<
!--</tr>--
>
<
!--<tr>--
>
<
!--<td class="padding-small" width="200">--
>
<
!--<div id="spark-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div>--
>
<
!--</td>--
>
<
!--<td class="padding-small" style="text-align: right;">--
>
<
!--<button type="button" class="btn btn-text-default" id="spark-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button>--
>
<
!--</td>--
>
<
!--</tr>--
>
<
!--<tr>--
>
<
!--<td colspan=2 >--
>
<
!--<label class="header"><%= scope.textLocationRange %></label>--
>
<
!--</td>--
>
<
!--</tr>--
>
<
!--<tr>--
>
<
!--<td class="padding-large" width="200">--
>
<
!--<div id="spark-dlg-txt-location" class="input-row" style="margin-right: 10px;"></div>--
>
<
!--</td>--
>
<
!--<td class="padding-large" style="text-align: right;">--
>
<
!--<button type="button" class="btn btn-text-default" id="spark-dlg-btn-location-data" style="min-width: 100px;"><%= scope.textSelectData %></button>--
>
<
!--</td>--
>
<
!--</tr>--
>
<
!--<tr>--
>
<
!--<td colspan=2 class="padding-large"></td>--
>
<
!--</tr>--
>
<tr>
<td colspan=2 class="padding-small">
<label class="header"><%= scope.textEmptyCells %></label>
...
...
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file @
ceb5fb0a
...
...
@@ -844,7 +844,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
labelText: this.textSingle,
name: 'asc-radio-sparkline'
});
*/
this.txtSparkDataRange = new Common.UI.InputField({
el : $('#spark-dlg-txt-range'),
name : 'range',
...
...
@@ -872,6 +872,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
el: $('#spark-dlg-btn-location-data')
});
this.btnSelectLocationData.on('click', _.bind(this.onSelectLocationData, this));
*/
this
.
_arrEmptyCells
=
[
{
value
:
Asc
.
c_oAscEDispBlanksAs
.
Gap
,
displayValue
:
this
.
textGaps
},
...
...
@@ -1402,6 +1403,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this
.
spnSparkMinValue
.
setValue
((
props
.
asc_getManualMin
()
!==
null
)
?
props
.
asc_getManualMin
()
:
''
,
true
);
this
.
spnSparkMaxValue
.
setValue
((
props
.
asc_getManualMax
()
!==
null
)
?
props
.
asc_getManualMax
()
:
''
,
true
);
/*
var value = props.asc_getDataRanges();
if (value && value.length==2) {
this.txtSparkDataRange.setValue((value[0]) ? value[0] : '');
...
...
@@ -1425,6 +1427,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;
};
}
*/
this
.
_changedProps
=
new
Asc
.
sparklineGroup
();
this
.
_noApply
=
false
;
...
...
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @
ceb5fb0a
...
...
@@ -1551,10 +1551,10 @@ define([
{
id
:
'
menu-chart-group-hbar
'
,
caption
:
me
.
textBar
},
{
id
:
'
menu-chart-group-area
'
,
caption
:
me
.
textArea
,
inline
:
true
},
{
id
:
'
menu-chart-group-scatter
'
,
caption
:
me
.
textPoint
,
inline
:
true
},
{
id
:
'
menu-chart-group-stock
'
,
caption
:
me
.
textStock
,
inline
:
true
}
,
{
id
:
'
menu-chart-group-sparkcolumn
'
,
inline
:
true
,
headername
:
me
.
textSparks
},
{
id
:
'
menu-chart-group-sparkline
'
,
inline
:
true
},
{
id
:
'
menu-chart-group-sparkwin
'
,
inline
:
true
}
{
id
:
'
menu-chart-group-stock
'
,
caption
:
me
.
textStock
,
inline
:
true
}
// ,
{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks },
//
{ id: 'menu-chart-group-sparkline', inline: true },
//
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store
:
new
Common
.
UI
.
DataViewStore
([
{
group
:
'
menu-chart-group-bar
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
barNormal
,
allowSelected
:
true
,
iconCls
:
'
column-normal
'
,
selected
:
true
},
...
...
@@ -1581,10 +1581,10 @@ define([
{
group
:
'
menu-chart-group-area
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
areaStacked
,
allowSelected
:
true
,
iconCls
:
'
area-stack
'
},
{
group
:
'
menu-chart-group-area
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
areaStackedPer
,
allowSelected
:
true
,
iconCls
:
'
area-pstack
'
},
{
group
:
'
menu-chart-group-scatter
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
scatter
,
allowSelected
:
true
,
iconCls
:
'
point-normal
'
},
{
group
:
'
menu-chart-group-stock
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
stock
,
allowSelected
:
true
,
iconCls
:
'
stock-normal
'
}
,
{
group
:
'
menu-chart-group-sparkcolumn
'
,
type
:
Asc
.
c_oAscSparklineType
.
Column
,
allowSelected
:
true
,
iconCls
:
'
spark-column
'
,
tip
:
me
.
textColumnSpark
},
{
group
:
'
menu-chart-group-sparkline
'
,
type
:
Asc
.
c_oAscSparklineType
.
Line
,
allowSelected
:
true
,
iconCls
:
'
spark-line
'
,
tip
:
me
.
textLineSpark
},
{
group
:
'
menu-chart-group-sparkwin
'
,
type
:
Asc
.
c_oAscSparklineType
.
Stacked
,
allowSelected
:
true
,
iconCls
:
'
spark-win
'
,
tip
:
me
.
textWinLossSpark
}
{
group
:
'
menu-chart-group-stock
'
,
type
:
Asc
.
c_oAscChartTypeSettings
.
stock
,
allowSelected
:
true
,
iconCls
:
'
stock-normal
'
}
// ,
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
//
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
//
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate
:
_
.
template
(
'
<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>
'
)
});
...
...
Boris Kocherov
@bk
mentioned in commit
1e2d20ec
·
May 29, 2017
mentioned in commit
1e2d20ec
mentioned in commit 1e2d20ec71c6e179deb78e70a233fa1ce38e58af
Toggle commit list
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