diff --git a/CHANGES.md b/CHANGES.md index bf137678..e6828680 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,8 +13,9 @@ source without XSS risk (though params should already be XML-safe given `encodeURIComponent` and lack of a single quote attribute context) -- Known regression for 3.\*: Image libraries - [broken](https://github.com/SVG-Edit/svgedit/issues/274) +- Known regression: Remove Openclipart as its site's now setting of + `X-Frame-Options` to `"sameorigin"` makes it unusable on our end + for our cross-origin uses - Breaking change (minor): Change export to check `exportWindowName` for filename and change default from `download` to `svg.pdf` to distinguish from other downloads @@ -34,9 +35,14 @@ - Forward compatibility enhancement: Once IE9 support may be dropped, we may post messages as objects, so don't break if objects received (embedded API, xdomain, Imagelib) -- Imagelib backward compatibility enhancement: Allow `namespace-key` as - alternative to `namespace` so as not to break old SVG-Edit which fail - at *presence* of `namespace` (fixes #274) +- Forward compatibility enhancement: For IAN image library, add + `svgedit=3` param to URL so that it can keep using old API for + SVG-Edit versions before 3, while conditionally using new object-based + API now (and if we switch exclusively to the object-based API in the + future, this site will continue to work) +- Imagelib backward compatibility enhancement: Allow string based API + again so as not to break old SVG-Edit which fail at *presence* of + `namespace` (fixes #274) - Refactoring: Avoid passing unused arguments, setting unused variables, and making unnecessary checks; avoid useless call to `createSVGMatrix` - Refactoring: Avoid useless assignment (courtesty lgtm) diff --git a/dist/extensions/ext-imagelib.js b/dist/extensions/ext-imagelib.js index 950b40db..5bb5eeaf 100644 --- a/dist/extensions/ext-imagelib.js +++ b/dist/extensions/ext-imagelib.js @@ -120,9 +120,7 @@ var svgEditorExtension_imagelib = (function () { description = _ref6.description; $('
  • ').appendTo(libOpts).text(name).on('click touchend', function () { - frame.attr('src', - // Todo: Adopt some standard formatting library like `fluent.js` instead - url).show(); + frame.attr('src', url).show(); header.text(name); libOpts.hide(); back.show(); @@ -208,6 +206,7 @@ var svgEditorExtension_imagelib = (function () { url = _ref3.url, description = _ref3.description; + // Todo: Adopt some standard formatting library like `fluent.js` instead url = url.replace(/\{path\}/g, extIconsPath).replace(/\{modularVersion\}/g, modularVersion ? imagelibStrings.moduleEnding || '-es' : ''); return { name: name, url: url, description: description }; }); @@ -236,48 +235,60 @@ var svgEditorExtension_imagelib = (function () { // Do nothing return; } + var id = void 0; + var type = void 0; try { // Todo: This block can be removed (and the above check changed to // insist on an object) if embedAPI moves away from a string to // an object (if IE9 support not needed) response = (typeof response === 'undefined' ? 'undefined' : _typeof(response)) === 'object' ? response : JSON.parse(response); - if (response.namespace !== 'imagelib' && - // Allow this alternative per https://github.com/SVG-Edit/svgedit/issues/274 - // so that older libraries may post with `namespace-key` and not - // break older SVG-Edit versions which insisted on the *absence* - // of a `namespace` property - response['namespace-key'] !== 'imagelib') { + if (response.namespace !== 'imagelib') { return; } if (!allowedImageLibOrigins.includes('*') && !allowedImageLibOrigins.includes(origin)) { console.log('Origin ' + origin + ' not whitelisted for posting to ' + window.origin); return; } + var hasName = 'name' in response; + var hasHref = 'href' in response; + + if (!hasName && transferStopped) { + transferStopped = false; + return; + } + + if (hasHref) { + id = response.href; + response = response.data; + } + + // Hide possible transfer dialog box + $('#dialog_box').hide(); + type = hasName ? 'meta' : response.charAt(0); } catch (e) { + // This block is for backward compatibility (for IAN and Openclipart) + if (typeof response === 'string') { + var char1 = response.charAt(0); + + if (char1 !== '{' && transferStopped) { + transferStopped = false; + return; + } + + if (char1 === '|') { + var secondpos = response.indexOf('|', 1); + id = response.substr(1, secondpos - 1); + response = response.substr(secondpos + 1); + type = response.charAt(0); + } + } return; } - var hasName = 'name' in response; - var hasHref = 'href' in response; - - if (!hasName && transferStopped) { - transferStopped = false; - return; - } - - var id = void 0; - if (hasHref) { - id = response.href; - response = response.data; - } - - // Hide possible transfer dialog box - $('#dialog_box').hide(); var entry = void 0, curMeta = void 0, svgStr = void 0, imgStr = void 0; - var type = hasName ? 'meta' : response.charAt(0); switch (type) { case 'meta': { diff --git a/dist/extensions/ext-locale/imagelib/de.js b/dist/extensions/ext-locale/imagelib/de.js index c6837f1c..24451f1b 100644 --- a/dist/extensions/ext-locale/imagelib/de.js +++ b/dist/extensions/ext-locale/imagelib/de.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_de = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/en.js b/dist/extensions/ext-locale/imagelib/en.js index db752513..6845618a 100644 --- a/dist/extensions/ext-locale/imagelib/en.js +++ b/dist/extensions/ext-locale/imagelib/en.js @@ -16,12 +16,18 @@ var svgEditorExtensionLocale_imagelib_en = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* , + // Disabling until X-Frame-Options may be removed again (or allow cross-origin): + // Getting messages like this in console: + // Refused to display 'https://openclipart.org/detail/307176/sign-bike' in a frame + // because it set 'X-Frame-Options' to 'sameorigin'. + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/fr.js b/dist/extensions/ext-locale/imagelib/fr.js index 70f75002..83855638 100644 --- a/dist/extensions/ext-locale/imagelib/fr.js +++ b/dist/extensions/ext-locale/imagelib/fr.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_fr = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/pl.js b/dist/extensions/ext-locale/imagelib/pl.js index fa191624..5fae10ce 100644 --- a/dist/extensions/ext-locale/imagelib/pl.js +++ b/dist/extensions/ext-locale/imagelib/pl.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_pl = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/pt-BR.js b/dist/extensions/ext-locale/imagelib/pt-BR.js index 2d804444..c7ff9f16 100644 --- a/dist/extensions/ext-locale/imagelib/pt-BR.js +++ b/dist/extensions/ext-locale/imagelib/pt-BR.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_pt_BR = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/ro.js b/dist/extensions/ext-locale/imagelib/ro.js index 867ba0da..a99e6f48 100644 --- a/dist/extensions/ext-locale/imagelib/ro.js +++ b/dist/extensions/ext-locale/imagelib/ro.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_ro = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/sk.js b/dist/extensions/ext-locale/imagelib/sk.js index bf431d61..88c6e020 100644 --- a/dist/extensions/ext-locale/imagelib/sk.js +++ b/dist/extensions/ext-locale/imagelib/sk.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_sk = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/sl.js b/dist/extensions/ext-locale/imagelib/sl.js index a4100359..81d34e79 100644 --- a/dist/extensions/ext-locale/imagelib/sl.js +++ b/dist/extensions/ext-locale/imagelib/sl.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_sl = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/dist/extensions/ext-locale/imagelib/zh-CN.js b/dist/extensions/ext-locale/imagelib/zh-CN.js index 56318945..76a9f434 100644 --- a/dist/extensions/ext-locale/imagelib/zh-CN.js +++ b/dist/extensions/ext-locale/imagelib/zh-CN.js @@ -16,12 +16,17 @@ var svgEditorExtensionLocale_imagelib_zh_CN = (function () { description: 'Demonstration library for SVG-edit on this server' }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, { - name: 'Openclipart', - url: 'https://openclipart.org/svgedit', - description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + /* + // See message in "en" locale as to why disabling + , + { + name: 'Openclipart', + url: 'https://openclipart.org/svgedit', + description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' + } + */ }] }; diff --git a/docs/Contributing.md b/docs/Contributing.md index 49cac81f..5add5a19 100644 --- a/docs/Contributing.md +++ b/docs/Contributing.md @@ -7,6 +7,7 @@ - `Breaking change: ` - `Fix: ` - `Fix (): ` Component may be an extension, locale, etc. + - `Forward compatibility enhancement: ` - `Enhancement: ` - `Refactoring: ` - `Linting ():` - Linting by type, e.g., "ESLint" diff --git a/editor/extensions/ext-imagelib.js b/editor/extensions/ext-imagelib.js index 977edb68..c1824137 100644 --- a/editor/extensions/ext-imagelib.js +++ b/editor/extensions/ext-imagelib.js @@ -22,6 +22,7 @@ export default { const {uiStrings, canvas: svgCanvas, curConfig: {extIconsPath}} = svgEditor; imagelibStrings.imgLibs = imagelibStrings.imgLibs.map(({name, url, description}) => { + // Todo: Adopt some standard formatting library like `fluent.js` instead url = url .replace(/\{path\}/g, extIconsPath) .replace(/\{modularVersion\}/g, modularVersion @@ -72,48 +73,59 @@ export default { // Do nothing return; } + let id; + let type; try { // Todo: This block can be removed (and the above check changed to // insist on an object) if embedAPI moves away from a string to // an object (if IE9 support not needed) response = typeof response === 'object' ? response : JSON.parse(response); - if (response.namespace !== 'imagelib' && - // Allow this alternative per https://github.com/SVG-Edit/svgedit/issues/274 - // so that older libraries may post with `namespace-key` and not - // break older SVG-Edit versions which insisted on the *absence* - // of a `namespace` property - response['namespace-key'] !== 'imagelib' - ) { + if (response.namespace !== 'imagelib') { return; } if (!allowedImageLibOrigins.includes('*') && !allowedImageLibOrigins.includes(origin)) { console.log(`Origin ${origin} not whitelisted for posting to ${window.origin}`); return; } + const hasName = 'name' in response; + const hasHref = 'href' in response; + + if (!hasName && transferStopped) { + transferStopped = false; + return; + } + + if (hasHref) { + id = response.href; + response = response.data; + } + + // Hide possible transfer dialog box + $('#dialog_box').hide(); + type = hasName + ? 'meta' + : response.charAt(0); } catch (e) { + // This block is for backward compatibility (for IAN and Openclipart) + if (typeof response === 'string') { + const char1 = response.charAt(0); + + if (char1 !== '{' && transferStopped) { + transferStopped = false; + return; + } + + if (char1 === '|') { + const secondpos = response.indexOf('|', 1); + id = response.substr(1, secondpos - 1); + response = response.substr(secondpos + 1); + type = response.charAt(0); + } + } return; } - const hasName = 'name' in response; - const hasHref = 'href' in response; - - if (!hasName && transferStopped) { - transferStopped = false; - return; - } - - let id; - if (hasHref) { - id = response.href; - response = response.data; - } - - // Hide possible transfer dialog box - $('#dialog_box').hide(); let entry, curMeta, svgStr, imgStr; - const type = hasName - ? 'meta' - : response.charAt(0); switch (type) { case 'meta': { // Metadata @@ -379,7 +391,6 @@ export default { .on('click touchend', function () { frame.attr( 'src', - // Todo: Adopt some standard formatting library like `fluent.js` instead url ).show(); header.text(name); diff --git a/editor/extensions/ext-locale/imagelib/de.js b/editor/extensions/ext-locale/imagelib/de.js index 41c502ea..1ee9c51d 100644 --- a/editor/extensions/ext-locale/imagelib/de.js +++ b/editor/extensions/ext-locale/imagelib/de.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/en.js b/editor/extensions/ext-locale/imagelib/en.js index 008d2db4..55bbafa3 100644 --- a/editor/extensions/ext-locale/imagelib/en.js +++ b/editor/extensions/ext-locale/imagelib/en.js @@ -17,13 +17,18 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* , + // Disabling until X-Frame-Options may be removed again (or allow cross-origin): + // Getting messages like this in console: + // Refused to display 'https://openclipart.org/detail/307176/sign-bike' in a frame + // because it set 'X-Frame-Options' to 'sameorigin'. { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' - } + } */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/fr.js b/editor/extensions/ext-locale/imagelib/fr.js index e112cd5a..b17a6aae 100644 --- a/editor/extensions/ext-locale/imagelib/fr.js +++ b/editor/extensions/ext-locale/imagelib/fr.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/pl.js b/editor/extensions/ext-locale/imagelib/pl.js index 24c2b38b..00a88e57 100644 --- a/editor/extensions/ext-locale/imagelib/pl.js +++ b/editor/extensions/ext-locale/imagelib/pl.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/pt-BR.js b/editor/extensions/ext-locale/imagelib/pt-BR.js index 7d346b78..26597722 100644 --- a/editor/extensions/ext-locale/imagelib/pt-BR.js +++ b/editor/extensions/ext-locale/imagelib/pt-BR.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/ro.js b/editor/extensions/ext-locale/imagelib/ro.js index 7ef4e68c..29caf600 100644 --- a/editor/extensions/ext-locale/imagelib/ro.js +++ b/editor/extensions/ext-locale/imagelib/ro.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/sk.js b/editor/extensions/ext-locale/imagelib/sk.js index 52515a43..5966085d 100644 --- a/editor/extensions/ext-locale/imagelib/sk.js +++ b/editor/extensions/ext-locale/imagelib/sk.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/sl.js b/editor/extensions/ext-locale/imagelib/sl.js index 7a401486..f6abd284 100644 --- a/editor/extensions/ext-locale/imagelib/sl.js +++ b/editor/extensions/ext-locale/imagelib/sl.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] }; diff --git a/editor/extensions/ext-locale/imagelib/zh-CN.js b/editor/extensions/ext-locale/imagelib/zh-CN.js index f96f1363..058b88e9 100644 --- a/editor/extensions/ext-locale/imagelib/zh-CN.js +++ b/editor/extensions/ext-locale/imagelib/zh-CN.js @@ -17,13 +17,17 @@ export default { }, { name: 'IAN Symbol Libraries', - url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', + url: 'https://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php?svgedit=3', description: 'Free library of illustrations' - }, + } + /* + // See message in "en" locale as to why disabling + , { name: 'Openclipart', url: 'https://openclipart.org/svgedit', description: 'Share and Use Images. Over 50,000 Public Domain SVG Images and Growing.' } + */ ] };