Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Update hints for inserting and editing chart/sparklines buttons.

Browse source 
[Common] Fix updating hints for buttons.
This commit is contained in:
Julia Radzhabova 2016-12-23 13:03:08 +03:00
parent 4178a2ee57
commit 705677a3e1
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/Button.js
View file

@ -467,8 +467,10 @@ define([
var cmpEl = this.cmpEl, var cmpEl = this.cmpEl,
modalParents = cmpEl.closest('.asc-window'); modalParents = cmpEl.closest('.asc-window');
if (cmpEl.data('bs.tooltip'))
cmpEl.removeData('bs.tooltip');
cmpEl.attr('data-toggle', 'tooltip'); cmpEl.attr('data-toggle', 'tooltip');
cmpEl.tooltip('destroy').tooltip({ cmpEl.tooltip({
title : hint, title : hint,
placement : this.options.hintAnchor || 'cursor' placement : this.options.hintAnchor || 'cursor'
}); });

2
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -150,6 +150,7 @@ define([
if (settingsType == Common.Utils.documentSettingsType.Image) { if (settingsType == Common.Utils.documentSettingsType.Image) {
if (value.asc_getChartProperties() !== null) { if (value.asc_getChartProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Chart; settingsType = Common.Utils.documentSettingsType.Chart;
this._settings[settingsType].btn.updateHint(this.rightmenu.txtChartSettings);
} else if (value.asc_getShapeProperties() !== null) { } else if (value.asc_getShapeProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Shape; settingsType = Common.Utils.documentSettingsType.Shape;
if (value.asc_getShapeProperties().asc_getTextArtProperties()) { if (value.asc_getShapeProperties().asc_getTextArtProperties()) {
@ -177,6 +178,7 @@ define([
this._settings[settingsType].props = sparkLineInfo; this._settings[settingsType].props = sparkLineInfo;
this._settings[settingsType].locked = isSparkLocked; this._settings[settingsType].locked = isSparkLocked;
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
this._settings[settingsType].btn.updateHint(this.rightmenu.txtSparklineSettings);
} }
var lastactive = -1, currentactive, priorityactive = -1, var lastactive = -1, currentactive, priorityactive = -1,

1
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file

@ -255,6 +255,7 @@ define([
txtShapeSettings: 'Shape Settings', txtShapeSettings: 'Shape Settings',
txtTextArtSettings: 'Text Art Settings', txtTextArtSettings: 'Text Art Settings',
txtChartSettings: 'Chart Settings', txtChartSettings: 'Chart Settings',
txtSparklineSettings: 'Sparkline Settings',
txtTableSettings: 'Table Settings' txtTableSettings: 'Table Settings'
}, SSE.Views.RightMenu || {})); }, SSE.Views.RightMenu || {}));
}); });

5
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1284,7 +1284,7 @@ define([
this.btnWrap.updateHint(this.tipWrap); this.btnWrap.updateHint(this.tipWrap);
this.btnTextOrient.updateHint(this.tipTextOrientation); this.btnTextOrient.updateHint(this.tipTextOrientation);
this.btnInsertImage.updateHint(this.tipInsertImage); this.btnInsertImage.updateHint(this.tipInsertImage);
this.btnInsertChart.updateHint(this.tipInsertChart); this.btnInsertChart.updateHint(this.tipInsertChartSpark);
this.btnInsertText.updateHint(this.tipInsertText); this.btnInsertText.updateHint(this.tipInsertText);
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
this.btnInsertShape.updateHint(this.tipInsertShape); this.btnInsertShape.updateHint(this.tipInsertShape);
@ -2102,6 +2102,7 @@ define([
textWinLossSpark: 'Win/Loss', textWinLossSpark: 'Win/Loss',
tipInsertEquation: 'Insert Equation', tipInsertEquation: 'Insert Equation',
textCharts: 'Charts', textCharts: 'Charts',
textSparks: 'Sparklines' textSparks: 'Sparklines',
tipInsertChartSpark: 'Insert Chart or Sparkline'
}, SSE.Views.Toolbar || {})); }, SSE.Views.Toolbar || {}));
}); });

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1252,6 +1252,7 @@
"SSE.Views.RightMenu.txtParagraphSettings": "Text Settings", "SSE.Views.RightMenu.txtParagraphSettings": "Text Settings",
"SSE.Views.RightMenu.txtSettings": "Common Settings", "SSE.Views.RightMenu.txtSettings": "Common Settings",
"SSE.Views.RightMenu.txtShapeSettings": "Shape Settings", "SSE.Views.RightMenu.txtShapeSettings": "Shape Settings",
"SSE.Views.RightMenu.txtSparklineSettings": "Sparkline Settings",
"SSE.Views.RightMenu.txtTableSettings": "Table Settings", "SSE.Views.RightMenu.txtTableSettings": "Table Settings",
"SSE.Views.RightMenu.txtTextArtSettings": "Text Art Settings", "SSE.Views.RightMenu.txtTextArtSettings": "Text Art Settings",
"SSE.Views.SetValueDialog.cancelButtonText": "Cancel", "SSE.Views.SetValueDialog.cancelButtonText": "Cancel",
@ -1536,6 +1537,7 @@
"SSE.Views.Toolbar.tipInsertOpt": "Insert Cells", "SSE.Views.Toolbar.tipInsertOpt": "Insert Cells",
"SSE.Views.Toolbar.tipInsertShape": "Insert Autoshape", "SSE.Views.Toolbar.tipInsertShape": "Insert Autoshape",
"SSE.Views.Toolbar.tipInsertText": "Insert Text", "SSE.Views.Toolbar.tipInsertText": "Insert Text",
"SSE.Views.Toolbar.tipInsertChartSpark": "Insert Chart or Sparkline",
"SSE.Views.Toolbar.tipMerge": "Merge", "SSE.Views.Toolbar.tipMerge": "Merge",
"SSE.Views.Toolbar.tipNewDocument": "New Document", "SSE.Views.Toolbar.tipNewDocument": "New Document",
"SSE.Views.Toolbar.tipNumFormat": "Number Format", "SSE.Views.Toolbar.tipNumFormat": "Number Format",