github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
jfh
2020-11-12 23:43:11 +01:00
parent d74a86875a b0886c7b82
commit b2a075f799
20 changed files with 67 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/editor/svgedit.js
View File

@@ -2057,16 +2057,8 @@ editor.init = () => {
if (tagName === 'text') {
$('#text_panel').css('display', 'inline');
$('#tool_font_size').css('display', 'inline');
if (svgCanvas.getItalic()) {
$('#tool_italic').addClass('push_button_pressed').removeClass('tool_button');
} else {
$('#tool_italic').removeClass('push_button_pressed').addClass('tool_button');
}
if (svgCanvas.getBold()) {
$('#tool_bold').addClass('push_button_pressed').removeClass('tool_button');
} else {
$('#tool_bold').removeClass('push_button_pressed').addClass('tool_button');
}
$id('tool_italic').pressed = svgCanvas.getItalic();
$id('tool_bold').pressed = svgCanvas.getBold();
$('#font_family').val(elem.getAttribute('font-family'));
$('#font_size').val(elem.getAttribute('font-size'));
$('#text').val(elem.textContent);
@@ -4910,6 +4902,9 @@ editor.init = () => {
$id('layer_down').addEventListener('click', () => moveLayer(1));
$id('layer_rename').addEventListener('click', layerRename);
$id('tool_bold').addEventListener('click', clickBold);
$id('tool_italic').addEventListener('click', clickItalic);
const toolButtons = [
{sel: '#tool_clear', fn: clickClear, evt: 'mouseup', key: ['N', true]},
{sel: '#tool_save', fn () {
@@ -4946,8 +4941,6 @@ editor.init = () => {
{sel: '#tool_node_link', fn: linkControlPoints, evt: 'click'},
{sel: '#tool_ungroup', fn: clickGroup, evt: 'click'},
{sel: '#tool_unlink_use', fn: clickGroup, evt: 'click'},
{sel: '#tool_bold', fn: clickBold, evt: 'mousedown'},
{sel: '#tool_italic', fn: clickItalic, evt: 'mousedown'},
{sel: '#sidepanel_handle', fn: toggleSidePanel, key: ['X']},
{sel: '#copy_save_done', fn: cancelOverlays, evt: 'click'},