pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 01:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '[DE] Fix bug 66717' (#855) from fix/bug-66717 into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2025-11-27 11:14:34 +00:00
parent 45bae1cce5 8fc2e1ede7
commit e660504bed
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/DocumentHolderExt.js
View File

@ -242,6 +242,8 @@ define([], function () {
view.menuTableCellAlign.menu.on('item:click', _.bind(me.tableCellsVAlign, me));
view.menuTableAdvanced.on('click', _.bind(me.advancedTableClick, me));
view.menuParagraphAdvancedInTable.on('click', _.bind(me.advancedParagraphClick, me));
view.menuStyleSaveInTable.on('click', _.bind(me.onMenuSaveStyle, me));
view.menuStyleUpdateInTable.on('click', _.bind(me.onMenuUpdateStyle, me));
view.menuParagraphAdvanced.on('click', _.bind(me.advancedParagraphClick, me));
view.menuEditHyperlinkTable.on('click', _.bind(me.editHyperlink, me));
view.menuEditHyperlinkPara.on('click', _.bind(me.editHyperlink, me));

27
apps/documenteditor/main/app/view/DocumentHolderExt.js
View File

@ -1110,6 +1110,22 @@ define([], function () {
caption : me.advancedParagraphText
});
me.menuStyleInTable = new Common.UI.MenuItem({
caption: me.styleText,
menu: new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
me.menuStyleSaveInTable = new Common.UI.MenuItem({
caption: me.saveStyleText
}),
me.menuStyleUpdateInTable = new Common.UI.MenuItem({
caption: me.updateStyleText.replace('%1', window.currentStyleName)
})
]
})
});
var menuHyperlinkSeparator = new Common.UI.MenuItem({
caption : '--'
});
@ -1651,6 +1667,14 @@ define([], function () {
me.menuToDictionaryTable.setVisible(me.mode.isDesktopApp);
menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
const isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
const editStyle = me.mode.canEditStyles && !isInChart && !(value.imgProps && value.imgProps.isSmartArtInternal);
me.menuStyleInTable.setVisible(editStyle);
if (editStyle) {
me.menuStyleUpdateInTable.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
me.menuStyleSaveInTable.setDisabled(!window.styles_loaded);
}
me.langTableMenu.setDisabled(disabled);
if (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) {
me.addWordVariants(false);
@ -1774,7 +1798,8 @@ define([], function () {
menuTableControl,
me.menuTableTOC,
me.menuParagraphAdvancedInTable,
me.menuTableEquation
me.menuTableEquation,
me.menuStyleInTable
]
}).on('hide:after', function(menu, e, isFromInputControl) {
me.clearCustomItems(menu);