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

- 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)
- 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
- 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)
- Docs: Add "Forward compatibility enhancement" to list
master
Brett Zamir 2018-09-25 10:13:29 +08:00
parent 83aa156353
commit 0034447d44
22 changed files with 234 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGES.md
View File

@ -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)

41
dist/extensions/ext-imagelib.js vendored
View File

@ -120,9 +120,7 @@ var svgEditorExtension_imagelib = (function () {
description = _ref6.description;
$('<li>').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,27 +235,20 @@ 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;
}
} catch (e) {
return;
}
var hasName = 'name' in response;
var hasHref = 'href' in response;
@ -265,7 +257,6 @@ var svgEditorExtension_imagelib = (function () {
return;
}
var id = void 0;
if (hasHref) {
id = response.href;
response = response.data;
@ -273,11 +264,31 @@ var svgEditorExtension_imagelib = (function () {
// 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 entry = void 0,
curMeta = void 0,
svgStr = void 0,
imgStr = void 0;
var type = hasName ? 'meta' : response.charAt(0);
switch (type) {
case 'meta':
{

9
dist/extensions/ext-locale/imagelib/de.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

10
dist/extensions/ext-locale/imagelib/en.js vendored
View File

@ -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'
}, {
/* ,
// 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.'
} */
}]
};

9
dist/extensions/ext-locale/imagelib/fr.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/pl.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/pt-BR.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/ro.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/sk.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/sl.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

9
dist/extensions/ext-locale/imagelib/zh-CN.js vendored
View File

@ -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'
}, {
/*
// 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.'
}
*/
}]
};

1
docs/Contributing.md
View File

@ -7,6 +7,7 @@
- `Breaking change: `
- `Fix: `
- `Fix (<component>): ` Component may be an extension, locale, etc.
- `Forward compatibility enhancement: `
- `Enhancement: `
- `Refactoring: `
- `Linting (<type>):` - Linting by type, e.g., "ESLint"

41
editor/extensions/ext-imagelib.js
View File

@ -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,28 +73,20 @@ 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;
}
} catch (e) {
return;
}
const hasName = 'name' in response;
const hasHref = 'href' in response;
@ -102,7 +95,6 @@ export default {
return;
}
let id;
if (hasHref) {
id = response.href;
response = response.data;
@ -110,10 +102,30 @@ export default {
// Hide possible transfer dialog box
$('#dialog_box').hide();
let entry, curMeta, svgStr, imgStr;
const type = hasName
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;
}
let entry, curMeta, svgStr, imgStr;
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);

8
editor/extensions/ext-locale/imagelib/de.js
View File

@ -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.'
}
*/
]
};

11
editor/extensions/ext-locale/imagelib/en.js
View File

@ -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.'
}
} */
]
};

8
editor/extensions/ext-locale/imagelib/fr.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/pl.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/pt-BR.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/ro.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/sk.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/sl.js
View File

@ -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.'
}
*/
]
};

8
editor/extensions/ext-locale/imagelib/zh-CN.js
View File

@ -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.'
}
*/
]
};