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

[SSE] Tooltips for cell styles.

Browse source
This commit is contained in:
Julia Radzhabova 2017-06-27 12:52:29 +03:00
parent 0492d169c8
commit bccc2b7187
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -105,6 +105,7 @@ define([
var me = this; var me = this;
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false}; this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
this.translationTable = [];
if (!Common.Utils.isBrowserSupported()){ if (!Common.Utils.isBrowserSupported()){
Common.Utils.showBrowserRestriction(); Common.Utils.showBrowserRestriction();
@ -129,16 +130,16 @@ define([
'Your text here': this.txtArt 'Your text here': this.txtArt
}; };
styleNames.forEach(function(item){ styleNames.forEach(function(item){
translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
}); });
translate['Currency [0]'] = me.txtStyle_Currency + ' [0]'; translate['Currency [0]'] = me.translationTable['Currency [0]'] = me.txtStyle_Currency + ' [0]';
translate['Comma [0]'] = me.txtStyle_Comma + ' [0]'; translate['Comma [0]'] = me.translationTable['Comma [0]'] = me.txtStyle_Comma + ' [0]';
for (var i=1; i<7; i++) { for (var i=1; i<7; i++) {
translate['Accent'+i] = me.txtAccent + i; translate['Accent'+i] = me.translationTable['Accent'+i] = me.txtAccent + i;
translate['20% - Accent'+i] = '20% - ' + me.txtAccent + i; translate['20% - Accent'+i] = me.translationTable['20% - Accent'+i] = '20% - ' + me.txtAccent + i;
translate['40% - Accent'+i] = '40% - ' + me.txtAccent + i; translate['40% - Accent'+i] = me.translationTable['40% - Accent'+i] = '40% - ' + me.txtAccent + i;
translate['60% - Accent'+i] = '60% - ' + me.txtAccent + i; translate['60% - Accent'+i] = me.translationTable['60% - Accent'+i] = '60% - ' + me.txtAccent + i;
} }
this.api = new Asc.spreadsheet_api({ this.api = new Asc.spreadsheet_api({

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

@ -1538,11 +1538,13 @@ define([
listStyles.menuPicker.store.reset([]); // remove all listStyles.menuPicker.store.reset([]); // remove all
var mainController = this.getApplication().getController('Main');
var merged_array = styles.asc_getDefaultStyles().concat(styles.asc_getDocStyles()); var merged_array = styles.asc_getDefaultStyles().concat(styles.asc_getDocStyles());
_.each(merged_array, function(style){ _.each(merged_array, function(style){
listStyles.menuPicker.store.add({ listStyles.menuPicker.store.add({
imageUrl: style.asc_getImage(), imageUrl: style.asc_getImage(),
name : style.asc_getName(), name : style.asc_getName(),
tip : mainController.translationTable[style.get_Name()] || style.get_Name(),
uid : Common.UI.getId() uid : Common.UI.getId()
}); });
}); });

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

@ -727,7 +727,6 @@ define([
enableKeyEvents : true, enableKeyEvents : true,
itemWidth : 112, itemWidth : 112,
itemHeight : 38, itemHeight : 38,
hint : this.tipCellStyle,
menuMaxHeight : 226, menuMaxHeight : 226,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
beforeOpenHandler: function(e) { beforeOpenHandler: function(e) {