-
+
- |
+ |
|
|
-
- |
-
-
+
|
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
index 40c9eff965..81871d9891 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
@@ -148,18 +148,15 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
]
});
- this.txtDataRange = new Common.UI.InputField({
+ this.txtDataRange = new Common.UI.InputFieldBtn({
el : $('#chart-dlg-txt-range'),
name : 'range',
style : 'width: 100%;',
+ btnHint : this.textSelectData,
allowBlank : true,
validateOnChange: true
});
-
- this.btnSelectData = new Common.UI.Button({
- el: $('#chart-dlg-btn-data')
- });
- this.btnSelectData.on('click', _.bind(this.onSelectData, this));
+ this.txtDataRange.on('button:click', _.bind(this.onSelectData, this));
this.cmbChartTitle = new Common.UI.ComboBox({
el : $('#chart-dlg-combo-chart-title'),
@@ -791,33 +788,27 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
name: 'asc-radio-sparkline'
});
- this.txtSparkDataRange = new Common.UI.InputField({
+ this.txtSparkDataRange = new Common.UI.InputFieldBtn({
el : $('#spark-dlg-txt-range'),
name : 'range',
style : 'width: 100%;',
+ btnHint : this.textSelectData,
allowBlank : true,
blankError : this.txtEmpty,
validateOnChange: true
});
+ this.txtSparkDataRange.on('button:click', _.bind(this.onSelectSparkData, this));
- this.btnSelectSparkData = new Common.UI.Button({
- el: $('#spark-dlg-btn-data')
- });
- this.btnSelectSparkData.on('click', _.bind(this.onSelectSparkData, this));
-
- this.txtSparkDataLocation = new Common.UI.InputField({
+ this.txtSparkDataLocation = new Common.UI.InputFieldBtn({
el : $('#spark-dlg-txt-location'),
name : 'range',
style : 'width: 100%;',
+ btnHint : this.textSelectData,
allowBlank : true,
blankError : this.txtEmpty,
validateOnChange: true
});
-
- this.btnSelectLocationData = new Common.UI.Button({
- el: $('#spark-dlg-btn-location-data')
- });
- this.btnSelectLocationData.on('click', _.bind(this.onSelectLocationData, this));
+ this.txtSparkDataLocation.on('button:click', _.bind(this.onSelectLocationData, this));
*/
this._arrEmptyCells = [
diff --git a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
index d8048ca655..8b4601aeba 100644
--- a/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/CreatePivotDialog.js
@@ -47,7 +47,7 @@ define([
SSE.Views.CreatePivotDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
- contentWidth: 330,
+ contentWidth: 310,
height: 250
},
@@ -68,8 +68,7 @@ define([
'',
'',
'| ',
- '',
- '',
+ '',
' | ',
'
',
'',
@@ -88,9 +87,8 @@ define([
'',
'
',
'',
- '| ',
- '',
- '',
+ ' | ',
+ '',
' | ',
'
',
'
',
@@ -122,34 +120,27 @@ define([
Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
var me = this;
- this.txtSourceRange = new Common.UI.InputField({
+ this.txtSourceRange = new Common.UI.InputFieldBtn({
el : $('#create-pivot-input-source'),
name : 'range',
style : 'width: 100%;',
+ btnHint : this.textSelectData,
allowBlank : true,
validateOnChange: true
});
+ this.txtSourceRange.on('button:click', _.bind(this.onSelectData, this, 'source'));
- this.btnSelectSource = new Common.UI.Button({
- el: $('#create-pivot-btn-source')
- });
- this.btnSelectSource.on('click', _.bind(this.onSelectData, this, 'source'));
-
- this.txtDestRange = new Common.UI.InputField({
+ this.txtDestRange = new Common.UI.InputFieldBtn({
el : $('#create-pivot-input-dest'),
name : 'range',
style : 'width: 100%;',
+ btnHint : this.textSelectData,
allowBlank : true,
validateOnChange: true,
validateOnBlur: false,
disabled: true
});
-
- this.btnSelectDest = new Common.UI.Button({
- el: $('#create-pivot-btn-dest'),
- disabled: true
- });
- this.btnSelectDest.on('click', _.bind(this.onSelectData, this, 'dest'));
+ this.txtDestRange.on('button:click', _.bind(this.onSelectData, this, 'dest'));
this.radioNew = new Common.UI.RadioBox({
el: $('#create-pivot-radio-new'),
@@ -158,7 +149,6 @@ define([
checked: true
}).on('change', function(field, newValue) {
me.txtDestRange.setDisabled(newValue);
- me.btnSelectDest.setDisabled(newValue);
me.txtDestRange.showError();
});
@@ -168,7 +158,6 @@ define([
name: 'asc-radio-pivot-dest'
}).on('change', function(field, newValue) {
me.txtDestRange.setDisabled(!newValue);
- me.btnSelectDest.setDisabled(!newValue);
me.txtDestRange.cmpEl.find('input').focus();
});
diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
index bdfc83d334..6cc6b2bb5e 100644
--- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -90,10 +90,7 @@ define([
'
',
'',
'
',
- '
',
+ '
',
'