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
2d7f7737
Commit
2d7f7737
authored
Nov 30, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Added data and location ranges for sparklines.
parent
2600efb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
31 deletions
+37
-31
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
+8
-2
No files found.
apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
View file @
2d7f7737
...
...
@@ -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 @
2d7f7737
...
...
@@ -840,7 +840,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
'
,
...
...
@@ -868,7 +868,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
el
:
$
(
'
#spark-dlg-btn-data
'
)
});
// this.btnSelectLocationData.on('click', _.bind(this.onSelectData, this));
*/
this
.
_arrEmptyCells
=
[
{
value
:
Asc
.
c_oAscEDispBlanksAs
.
Gap
,
displayValue
:
this
.
textGaps
},
...
...
@@ -1373,6 +1373,12 @@ 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
]
:
''
);
this
.
txtSparkDataLocation
.
setValue
((
value
[
1
])
?
value
[
1
]
:
''
);
}
this
.
_changedProps
=
new
Asc
.
sparklineGroup
();
this
.
_noApply
=
false
;
}
...
...
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