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

[SSE] Fix color select for header/footer

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-12 12:13:45 +03:00
parent d52a2c6774
commit 2419a7d612
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,7 +286,6 @@ define([
{displayValue: this.textPageCount, value: Asc.c_oAscHeaderFooterField.pageCount}, {displayValue: this.textPageCount, value: Asc.c_oAscHeaderFooterField.pageCount},
{displayValue: this.textDate, value: Asc.c_oAscHeaderFooterField.date}, {displayValue: this.textDate, value: Asc.c_oAscHeaderFooterField.date},
{displayValue: this.textTime, value: Asc.c_oAscHeaderFooterField.time}, {displayValue: this.textTime, value: Asc.c_oAscHeaderFooterField.time},
{displayValue: this.textFilePath, value: Asc.c_oAscHeaderFooterField.filePath},
{displayValue: this.textFileName, value: Asc.c_oAscHeaderFooterField.fileName}, {displayValue: this.textFileName, value: Asc.c_oAscHeaderFooterField.fileName},
{displayValue: this.textSheet, value: Asc.c_oAscHeaderFooterField.sheetName} {displayValue: this.textSheet, value: Asc.c_oAscHeaderFooterField.sheetName}
]; ];
@ -520,12 +519,14 @@ define([
var initNewColor = function(btn, picker_el) { var initNewColor = function(btn, picker_el) {
if (btn && btn.cmpEl) { if (btn && btn.cmpEl) {
btn.currentColor = '#000000';
var colorVal = $('<div class="btn-color-value-line"></div>'); var colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', btn.cmpEl).append(colorVal); $('button:first-child', btn.cmpEl).append(colorVal);
colorVal.css('background-color', btn.currentColor || '#000000'); colorVal.css('background-color', btn.currentColor);
var picker = new Common.UI.ThemeColorPalette({ var picker = new Common.UI.ThemeColorPalette({
el: $(picker_el) el: $(picker_el)
}); });
picker.currentColor = btn.currentColor;
} }
btn.menu.cmpEl.on('click', picker_el+'-new', _.bind(function() { btn.menu.cmpEl.on('click', picker_el+'-new', _.bind(function() {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color); picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
@ -711,7 +712,7 @@ define([
offset = parent.offset(); offset = parent.offset();
this.HFObject.click(id, event.pageX*Common.Utils.zoom() - offset.left, event.pageY*Common.Utils.zoom() - offset.top + parent.scrollTop()); this.HFObject.click(id, event.pageX*Common.Utils.zoom() - offset.left, event.pageY*Common.Utils.zoom() - offset.top + parent.scrollTop());
} else } else
this.HFObject.click(id, 0, 0); this.HFObject.click(id);
this.scrollerUpdate(); this.scrollerUpdate();
}, },
@ -897,7 +898,6 @@ define([
textPageCount: 'Page count', textPageCount: 'Page count',
textDate: 'Date', textDate: 'Date',
textTime: 'Time', textTime: 'Time',
textFilePath: 'File path',
textFileName: 'File name', textFileName: 'File name',
textSheet: 'Sheet name', textSheet: 'Sheet name',
textColor: 'Text color', textColor: 'Text color',