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

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

Browse source
This commit is contained in:
JuliaSvinareva 2020-05-07 21:11:20 +03:00
parent fe17bdab26 aa03022115
commit 3b6a11dd53
5 changed files with 1208 additions and 1193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1525,6 +1525,16 @@ define([
me.onCustomNumberFormat(); me.onCustomNumberFormat();
} }
return false;
},
'shift+f3': function(e) {
if (me.editMode && !me.toolbar.btnInsertFormula.isDisabled()) {
var controller = me.getApplication().getController('FormulaDialog');
if (controller) {
controller.showDialog();
}
}
return false; return false;
} }
} }

13
apps/spreadsheeteditor/main/app/view/FormulaTab.js
View file

@ -190,7 +190,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-autosum', iconCls: 'toolbar__icon btn-autosum',
caption: this.txtAutosum, caption: this.txtAutosum,
hint: [this.txtAutosumTip + Common.Utils.String.platformKey('Alt+='), this.txtFormulaTip], hint: [this.txtAutosumTip + Common.Utils.String.platformKey('Alt+='), this.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3')],
split: true, split: true,
disabled: true, disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth], lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth],
@ -204,7 +204,8 @@ define([
{caption: '--'}, {caption: '--'},
{ {
caption: me.txtAdditional, caption: me.txtAdditional,
value: 'more' value: 'more',
hint: me.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3')
} }
] ]
}) })
@ -217,7 +218,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ins-formula', iconCls: 'toolbar__icon btn-ins-formula',
caption: this.txtFormula, caption: this.txtFormula,
hint: this.txtFormulaTip, hint: this.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3'),
disabled: true, disabled: true,
lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth] lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
}); });
@ -394,7 +395,8 @@ define([
{ caption: '--' }, { caption: '--' },
{ {
caption: me.txtAdditional, caption: me.txtAdditional,
value: 'more' value: 'more',
hint: me.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3')
} }
] ]
})); }));
@ -456,7 +458,8 @@ define([
{ caption: '--' }, { caption: '--' },
{ {
caption: me.txtAdditional, caption: me.txtAdditional,
value: 'more' value: 'more',
hint: me.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3')
} }
] ]
}) })

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

@ -221,7 +221,8 @@ define([
{caption: '--'}, {caption: '--'},
{ {
caption: me.txtAdditional, caption: me.txtAdditional,
value: 'more' value: 'more',
hint: me.txtFormula + Common.Utils.String.platformKey('Shift+F3')
} }
] ]
}) })
@ -888,7 +889,8 @@ define([
{caption: '--'}, {caption: '--'},
{ {
caption: me.txtAdditional, caption: me.txtAdditional,
value: 'more' value: 'more',
hint: me.txtFormula + Common.Utils.String.platformKey('Shift+F3')
} }
] ]
}) })
@ -1665,7 +1667,7 @@ define([
_updateHint(this.btnCurrencyStyle, this.tipDigStyleAccounting); _updateHint(this.btnCurrencyStyle, this.tipDigStyleAccounting);
_updateHint(this.btnDecDecimal, this.tipDecDecimal); _updateHint(this.btnDecDecimal, this.tipDecDecimal);
_updateHint(this.btnIncDecimal, this.tipIncDecimal); _updateHint(this.btnIncDecimal, this.tipIncDecimal);
_updateHint(this.btnInsertFormula, [this.txtAutosumTip + Common.Utils.String.platformKey('Alt+='), this.txtFormula]); _updateHint(this.btnInsertFormula, [this.txtAutosumTip + Common.Utils.String.platformKey('Alt+='), this.txtFormula + Common.Utils.String.platformKey('Shift+F3')]);
_updateHint(this.btnNamedRange, this.txtNamedRange); _updateHint(this.btnNamedRange, this.txtNamedRange);
_updateHint(this.btnClearStyle, this.tipClearStyle); _updateHint(this.btnClearStyle, this.tipClearStyle);
_updateHint(this.btnCopyStyle, this.tipCopyStyle); _updateHint(this.btnCopyStyle, this.tipCopyStyle);

4
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -39,11 +39,11 @@
"SSE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "SSE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.AddOther.textEmptyImgUrl": "You need to specify image URL.", "SSE.Controllers.AddOther.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "SSE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
"SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?",
"SSE.Controllers.AddOther.textCancel": "Cancel", "SSE.Controllers.AddOther.textCancel": "Cancel",
"SSE.Controllers.AddOther.textContinue": "Continue", "SSE.Controllers.AddOther.textContinue": "Continue",
"SSE.Controllers.AddOther.textDelete": "Delete", "SSE.Controllers.AddOther.textDelete": "Delete",
"SSE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
"SSE.Controllers.DocumentHolder.menuAddLink": "Add Link", "SSE.Controllers.DocumentHolder.menuAddLink": "Add Link",
"SSE.Controllers.DocumentHolder.menuCell": "Cell", "SSE.Controllers.DocumentHolder.menuCell": "Cell",
"SSE.Controllers.DocumentHolder.menuCopy": "Copy", "SSE.Controllers.DocumentHolder.menuCopy": "Copy",
@ -372,10 +372,10 @@
"SSE.Views.AddOther.textInsertImage": "Insert Image", "SSE.Views.AddOther.textInsertImage": "Insert Image",
"SSE.Views.AddOther.textLink": "Link", "SSE.Views.AddOther.textLink": "Link",
"SSE.Views.AddOther.textLinkSettings": "Link Settings", "SSE.Views.AddOther.textLinkSettings": "Link Settings",
"SSE.Views.AddOther.textSort": "Sort and Filter",
"SSE.Views.AddOther.textComment": "Comment", "SSE.Views.AddOther.textComment": "Comment",
"SSE.Views.AddOther.textAddComment": "Add Comment", "SSE.Views.AddOther.textAddComment": "Add Comment",
"SSE.Views.AddOther.textDone": "Done", "SSE.Views.AddOther.textDone": "Done",
"SSE.Views.AddOther.textSort": "Sort and Filter",
"SSE.Views.EditCell.textAccounting": "Accounting", "SSE.Views.EditCell.textAccounting": "Accounting",
"SSE.Views.EditCell.textAddCustomColor": "Add Custom Color", "SSE.Views.EditCell.textAddCustomColor": "Add Custom Color",
"SSE.Views.EditCell.textAlignBottom": "Align Bottom", "SSE.Views.EditCell.textAlignBottom": "Align Bottom",