pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/btnChart' (#764) from fix/btnChart into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/764
This commit is contained in:
Oleg Korshul
2025-10-08 09:56:53 +00:00
parent 1766f554fc f8068259ac
commit 6ee41d6382
4 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1243,6 +1243,25 @@ define([], function () {
me.isRtlSheet = me.api ? Common.UI.isRTL() : false;
if (me.chartProps) {
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me._XY = undefined;
me.checkEditorOffsets();
var x = asc_CRect.asc_getX(),
@ -1298,23 +1317,6 @@ define([], function () {
Common.UI.TooltipManager.applyPlacement('chartElements');
}, 100);
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me.disableChartElementButton();
} else {
chartContainer.hide();

34
apps/pdfeditor/main/app/controller/DocumentHolderExt.js
View File

@ -3058,6 +3058,24 @@ define([], function () {
me.isRtlSheet = me.api ? Common.UI.isRTL() : false;
if (me.chartProps) {
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
});
}
me._XY = undefined;
me.checkEditorOffsets();
var x = asc_CRect.asc_getX(),
@ -3107,22 +3125,6 @@ define([], function () {
top: btnTop + 'px'
}).show();
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
});
}
me.disableChartElementButton();
} else {
chartContainer.hide();

36
apps/presentationeditor/main/app/controller/DocumentHolderExt.js
View File

@ -1201,6 +1201,25 @@ define([], function () {
me.isRtlSheet = me.api ? Common.UI.isRTL() : false;
if (me.chartProps) {
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me._XY = undefined;
me.checkEditorOffsets();
var x = asc_CRect.asc_getX(),
@ -1257,23 +1276,6 @@ define([], function () {
Common.UI.TooltipManager.applyPlacement('chartElements');
}, 100);
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me.disableChartElementButton();
} else {
chartContainer.hide();

36
apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js
View File

@ -3881,6 +3881,25 @@ define([], function () {
me.isRtlSheet = me.api.asc_getSheetViewSettings().asc_getRightToLeft();
if (me.chartProps) {
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me.tooltips.coauth.XY = undefined
me.onDocumentResize();
var x = asc_CRect.asc_getX(),
@ -3947,23 +3966,6 @@ define([], function () {
Common.UI.TooltipManager.applyPlacement('chartElements');
}, 100);
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-chart-elements',
hint: me.documentHolder.btnChart,
menu: me.documentHolder.menuChartElement.menu
});
me.btnChartElement.on('click', function() {
me.chartProps = me.getCurrentChartProps();
if (me.chartProps) {
me.updateChartElementMenu(me.documentHolder.menuChartElement.menu, me.chartProps);
}
Common.UI.TooltipManager.closeTip('chartElements');
});
}
me.disableChartElementButton();
} else {
chartContainer.hide();