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

fixed color picking

Browse Source
This commit is contained in:
nikita_bartoshuk
2025-12-25 01:36:32 +03:00
parent e2d060f762
commit 18bf2c105b
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/spreadsheeteditor/main/app/controller/SparklineTab.js
View File

@ -191,10 +191,16 @@ define([
Common.NotificationCenter.trigger('edit:complete', this);
},
onSelectSparklineColorMenu: function (menu, item) {
if (item.value === 1 && this.mnuSparklineColorPicker) {
this.mnuSparklineColorPicker.addNewColor();
};
onSelectSparklineColorMenu: function (menu, item, picker, sparkColor) {
if (!sparkColor) {
if (item.value === 1 && picker) {
picker.addNewColor();
};
} else {
if (item.value === 1 && this.mnuSparklineColorPicker) {
this.mnuSparklineColorPicker.addNewColor();
};
}
},
onSelectSparkType: function (type) {
@ -308,7 +314,7 @@ define([
var type1 = typeof(this.SparkColor),
type2 = typeof(this._state.SparkColor);
if ( (type1 !== type2) || (type1=='object' && (this.SparkColor.effectValue!==this._state.SparkColor.effectValue || this._state.SparkColor.color.indexOf(this.SparkColor.color)<0)) ||
(type1!='object' && (this._state.SparkColor.indexOf(this.SparkColor)<0 || typeof(this.btnSparkColor.color)=='object'))) {
(type1!='object' && (this._state.SparkColor.indexOf(this.SparkColor)<0))) {
Common.Utils.ThemeColor.selectPickerColorByEffect(this.SparkColor, this.mnuSparklineColorPicker);
this._state.SparkColor = this.SparkColor;

8
apps/spreadsheeteditor/main/app/view/SparklineTab.js
View File

@ -133,7 +133,7 @@ define([
me.fireEvent('sparkline:type', [2]);
});
this.btnSparklineColor.menu.on('item:click', function (menu, item) {
me.fireEvent('sparkline:addnewcolor', [menu, item])
me.fireEvent('sparkline:addnewcolor', [menu, item, null, true])
});
this.btnClear.menu.on('item:click', function (menu, item, e) {
me.fireEvent('sparkline:clear', [menu, item, e])
@ -519,15 +519,15 @@ define([
]
});
subMenu.on('item:click', function (menu, color) {
me.fireEvent('sparkline:addnewcolor', [menu, color])
})
item.setMenu(subMenu);
var colorsMenu = new Common.UI.ThemeColorPalette({
el: $(`#sparkline-markers-menu-picker${index}`),
outerMenu: {menu: item.menu, index: 0}
});
subMenu.on('item:click', function (menu, color) {
me.fireEvent('sparkline:addnewcolor', [menu, color, colorsMenu])
})
item.menu.setInnerMenu([{menu: colorsMenu, index: 0}]);
colorsMenu.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
colorsMenu.on('select', function (item, color) {