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

Merge branch 'master' into refactor-svgcanvas

Browse Source
This commit is contained in:
JFH
2021-12-25 17:28:41 -03:00
parent 11ee55067c 279bdc778b
commit c786faf328
8 changed files with 2334 additions and 1192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/editor/components/jgraduate/Util.js
View File

@@ -104,10 +104,7 @@ export function getClosest(elem, selector) {
*/
export function getParents(elem, selector) {
const parents = [];
let firstChar;
if ( selector ) {
firstChar = selector.charAt(0);
}
const firstChar = selector?.charAt(0);
// Get matches
for ( ; elem && elem !== document; elem = elem.parentNode ) {
if ( selector ) {
@@ -138,23 +135,13 @@ export function getParents(elem, selector) {
}
}
// Return parents if any exist
if ( parents.length === 0 ) {
return null;
} else {
return parents;
}
return parents.length? parents : null;
}
export function getParentsUntil(elem, parent, selector) {
const parents = [];
let parentType;
let selectorType;
if ( parent ) {
parentType = parent.charAt(0);
}
if ( selector ) {
selectorType = selector.charAt(0);
}
const parentType = parent?.charAt(0);
const selectorType = selector?.selector.charAt(0);
// Get matches
for ( ; elem && elem !== document; elem = elem.parentNode ) {
// Check if parent has been reached
@@ -210,9 +197,5 @@ export function getParentsUntil(elem, parent, selector) {
}
}
// Return parents if any exist
if ( parents.length === 0 ) {
return null;
} else {
return parents;
}
return parents.length? parents : null;
}

2
src/editor/panels/TopPanel.html
View File

@@ -133,7 +133,7 @@
<se-button id="tool_italic" title="properties.italic" src="italic.svg" shortcut="I"></se-button>
<se-select id="tool_font_family" label="properties.font_family_label"
options="properties.serif,properties.sans_serif,properties.cursive,properties.fantasy,properties.monospace,properties.courier,properties.helvetica,properties.times"
values="Serif::Sans-serif::Cursive::Fantasy::Monospace::Courier::Helvetica::Times"></select>
values="Serif::Sans-serif::Cursive::Fantasy::Monospace::Courier::Helvetica::Times"></se-select>
<se-spin-input size="2" id="font_size" min=1 max=1000 step=1 title="properties.font_size"
src="fontsize.svg"></se-spin-input>
</div>