strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

jsdialog: unify clear formatting icon

Browse source 
There is no reason for custom handler.
Thanks to that we don't need special css.

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I9b576d4a6ef5668ec281c4e1348335d3b93bbac0
This commit is contained in:
Szymon Kłos 2022-08-16 16:11:16 +02:00 committed by Szymon Kłos
parent 4e3b34d6dd
commit 9dea7201b2
2 changed files with 1 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
browser/src/control/Control.JSDialogBuilder.js
View file

@ -132,8 +132,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:FrameLineColor'] = this._colorControl;
this._toolitemHandlers['.uno:Color'] = this._colorControl;
this._toolitemHandlers['.uno:FillColor'] = this._colorControl;
this._toolitemHandlers['.uno:ResetAttributes'] = this._formattingControl;
this._toolitemHandlers['.uno:SetDefault'] = this._formattingControl;
this._toolitemHandlers['.uno:InsertFormula'] = function () {};
this._toolitemHandlers['.uno:SetBorderStyle'] = function () {};
@ -2933,56 +2931,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
return selectedColor;
},
_formattingControl: function(parentContainer, data, builder) {
var iconPath = builder._createIconURL(data.command);
var sectionTitle = L.DomUtil.create('div', 'ui-header ' + builder.options.cssClass + ' level-' + builder._currentDepth + ' mobile-wizard-widebutton ui-widget', parentContainer);
sectionTitle.id = 'clearFormatting';
$(sectionTitle).css('justify-content', 'space-between');
if (data && data.id)
sectionTitle.id = data.id;
var leftDiv = L.DomUtil.create('div', 'ui-header-left', sectionTitle);
var titleClass = '';
if (iconPath) {
var icon = L.DomUtil.create('img', 'menu-entry-icon', leftDiv);
icon.src = iconPath;
icon.alt = '';
titleClass = 'menu-entry-with-icon';
}
sectionTitle.title = data.text;
builder.map.uiManager.enableTooltip(sectionTitle);
var updateFunction = function() {
var items = builder.map['stateChangeHandler'];
var state = items.getItemValue(data.command);
if (state && state === 'disabled')
$(sectionTitle).addClass('disabled');
else
$(sectionTitle).removeClass('disabled');
};
updateFunction();
builder.map.on('commandstatechanged', function(e) {
if (e.commandName === data.command)
updateFunction();
}, this);
if (builder.options.noLabelsForUnoButtons !== true) {
var titleSpan = L.DomUtil.create('span', titleClass, leftDiv);
titleSpan.textContent = builder._cleanText(_UNO(data.command));
}
$(sectionTitle).click(function () {
builder.callback('toolbutton', 'click', sectionTitle, data.command, builder);
});
builder._preventDocumentLosingFocusOnClick(sectionTitle);
return false;
},
_getCurrentBorderNumber: function(builder) {
var outer = builder.map['stateChangeHandler'].getItemValue('.uno:BorderOuter');
var inner = builder.map['stateChangeHandler'].getItemValue('.uno:BorderInner');

2
cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js
View file

@ -197,7 +197,7 @@ describe('Apply font on selected shape.', function() {
// Remove direct formatting
mobileHelper.openTextPropertiesPanel();
helper.clickOnIdle('#defaultattr #clearFormatting');
helper.clickOnIdle('#defaultattr .unoSetDefault');
triggerNewSVG();