- Breaking change: Rename "svgutils.js" to "utilities.js" (make in conformity with JSDoc module naming convention) - Breaking change: Rename "svgedit.js" to "namespaces.js" (to make clear purpose and avoid confusing with editor) - Breaking change: Rename "jquery-svg.js" to "jQuery.attr.js" - Breaking change: Rename "jquery.contextMenu.js" to "jQuery.contextMenu.js" - Breaking change: Rename "jquery.jpicker.js" to "jQuery.jPicker.js" - Breaking change: Rename "JQuerySpinBtn.css" to "jQuery.SpinButton.css" - Breaking change: Rename "JQuerySpinBtn.js" to "jQuery.SpinButton.js" (to have file name more closely reflect name) - Breaking change: Rename "jquery.svgicons.js" to "jQuery.svgIcons.js" - Breaking change: Rename "jquery.jgraduate.js" to "jQuery.jGraduate.js" - Breaking change: Rename "pathseg.js" to "svgpathseg.js" (as it is a poyfill of SVGPathSeg) - Breaking change: Rename `addSvgElementFromJson()` to `addSVGElementFromJson` for consistency - Breaking change: Rename `changeSvgContent()` to `changeSVGContent()` for consistency - Breaking change: Have `exportPDF` resolve with `output` and `outputType` rather than `dataurlstring` (as type may vary) - Breaking change: Rename `extensions/mathjax/MathJax.js` to `extensions/mathjax/MathJax.min.js` - Breaking change: Avoid recent change to have editor ready callbacks return Promises (we're not using and advantageous to keep sequential) - Breaking change: Avoid recent addition of locale-side function in ext-imagelib for l10n - Breaking change: Change name of ext-arrows.js from `Arrows` to `arrows` for sake of file path (not localized anyways). - Breaking change: Change `addlangData` extension event to `addLangData` for consistency with method name - Breaking change: Have `readLang` return lang and data but do not call `setLang` - Fix: Have general locales load first so extensions may use - Fix: Provide `importLocale` to extensions `init` so it may delay adding of the extension until locale data loaded - Fix: Ensure call to `rasterExport` without `imgType` properly sets MIME type to PNG - Fix: Wrong name for moinsave - Update: Update WebAppFind per new API changes - Enhancement: Make `setStrings` public on editor for late setting (used by `ext-shapes.js`) - Enhancement: Add `extensions_added` event - Enhancement: Add `message` event (Relay messages including those which have been been received prior to extension load) - Enhancement: Allow SVGEdit to work out of the box--avoid need for copying sample config file. Should also help with Github-based file servers - Enhancement: Allow avoiding "name" in extension export (just extract out of file name) - Enhancement: Add stack blur to canvg by default (and refactoring it) - Enhancement: Return `Promise` for `embedImage` (as with some other loading methods) - Enhancement: Supply `importLocale` to `langReady` to facilitate extension locale loading - Enhancement: Recover if an extension fails to load (just log and otherwise ignore) - Enhancement: More i18n of extensions (also fixed issue with some console warnings about missing locale strings); i18nize Hello World too - Enhancement: Allowing importing of locales within `addLangData` - npm: Update devDeps - Docs: Migrate copies of all old wiki pages to docs/from-old-wiki folder; intended for a possible move to Markdown, so raw HTML (with formatting) was not preserved, though named links had their absolute URL links preserved - Docs: Begin deleting `SvgCanvas.md` as ensuring jsdoc has replacements - Docs: Add Edtior doc file for help to general users - Docs: Clarify/simplify install instructions - npm/Docs (JSDoc): Add script to check for overly generic types - Docs (JSDoc): For config/prefs and extension creating, link to tutorials (moved tutorials to own directory to avoid recursion problems by jsdoc) - Docs (JSDoc): Add modules (upper case for usual main entrance files or regular names) - Docs (JSDoc): Fill out missing areas; indicate return of `undefined`; consistency with `@returns` - Docs (JSDoc): Add our own layout template to support overflow - Docs (JSDoc): Use cleverLinks and disallow unknown tags - Docs (JSDoc): Insist on "pedantic" flag; put output directory in config - Docs (JSDoc): Use more precise Integer/Float over number, the specific type of array/function/object - Docs (JSDoc): Use `@throws`, `@enum`, `@event`/`@fires`/`@listens` - Docs: Generally update/improve docs (fixes #92) - Docs: Update links to `latest` path (Avoid needing to update such references upon each release) - Docs: 80 chars max - Refactoring: Drop code for extension as function (already requiring export to be an object) - Refactoring: Object destructuring, `Object.entries`, Object shorthand, array extras, more camelCase variable names - Refactoring: Add a `Command` base class - Refactoring: Simplify svgicons `callback` ready detection - Refactoring: Put `let` or `const` closer to scope - Refactoring: Remove unneeded `delimiter` from regex escaping utility - Refactoring: Clearer variable names - Refactoring: Use (non-deprecated) Event constructors - Testing: Use new Sinon
123 lines
3.6 KiB
JavaScript
123 lines
3.6 KiB
JavaScript
// MIT License
|
|
// From: https://github.com/uupaa/dynamic-import-polyfill/blob/master/importModule.js
|
|
|
|
/**
|
|
* @module importModule
|
|
*/
|
|
|
|
function toAbsoluteURL (url) {
|
|
const a = document.createElement('a');
|
|
a.setAttribute('href', url); // <a href="hoge.html">
|
|
return a.cloneNode(false).href; // -> "http://example.com/hoge.html"
|
|
}
|
|
|
|
function addScriptAtts (script, atts) {
|
|
['id', 'class', 'type'].forEach((prop) => {
|
|
if (prop in atts) {
|
|
script[prop] = atts[prop];
|
|
}
|
|
});
|
|
}
|
|
|
|
// Additions by Brett
|
|
/**
|
|
* @typedef {PlainObject} module:importModule.ImportConfig
|
|
* @property {string} global The variable name to set on `window` (when not using the modular version)
|
|
* @property {boolean} [returnDefault=false]
|
|
*/
|
|
/**
|
|
* @function module:importModule.importSetGlobalDefault
|
|
* @param {string} url
|
|
* @param {module:importModule.ImportConfig} config
|
|
* @returns {*} The return depends on the export of the targeted module.
|
|
*/
|
|
export async function importSetGlobalDefault (url, config) {
|
|
return importSetGlobal(url, {...config, returnDefault: true});
|
|
}
|
|
/**
|
|
* @function module:importModule.importSetGlobal
|
|
* @param {string} url
|
|
* @param {module:importModule.ImportConfig} config
|
|
* @returns {ArbitraryModule|*} The return depends on the export of the targeted module.
|
|
*/
|
|
export async function importSetGlobal (url, {global, returnDefault}) {
|
|
// Todo: Replace calls to this function with `import()` when supported
|
|
const modularVersion = !('svgEditor' in window) ||
|
|
!window.svgEditor ||
|
|
window.svgEditor.modules !== false;
|
|
if (modularVersion) {
|
|
return importModule(url, undefined, {returnDefault});
|
|
}
|
|
await importScript(url);
|
|
return window[global];
|
|
}
|
|
// Addition by Brett
|
|
export function importScript (url, atts = {}) {
|
|
if (Array.isArray(url)) {
|
|
return Promise.all(url.map((u) => {
|
|
return importScript(u, atts);
|
|
}));
|
|
}
|
|
return new Promise((resolve, reject) => {
|
|
const script = document.createElement('script');
|
|
const destructor = () => {
|
|
script.onerror = null;
|
|
script.onload = null;
|
|
script.remove();
|
|
script.src = '';
|
|
};
|
|
script.defer = 'defer';
|
|
addScriptAtts(script, atts);
|
|
script.onerror = () => {
|
|
reject(new Error(`Failed to import: ${url}`));
|
|
destructor();
|
|
};
|
|
script.onload = () => {
|
|
resolve();
|
|
destructor();
|
|
};
|
|
script.src = url;
|
|
|
|
document.head.append(script);
|
|
});
|
|
}
|
|
|
|
export function importModule (url, atts = {}, {returnDefault = false} = {}) {
|
|
if (Array.isArray(url)) {
|
|
return Promise.all(url.map((u) => {
|
|
return importModule(u, atts);
|
|
}));
|
|
}
|
|
return new Promise((resolve, reject) => {
|
|
const vector = '$importModule$' + Math.random().toString(32).slice(2);
|
|
const script = document.createElement('script');
|
|
const destructor = () => {
|
|
delete window[vector];
|
|
script.onerror = null;
|
|
script.onload = null;
|
|
script.remove();
|
|
URL.revokeObjectURL(script.src);
|
|
script.src = '';
|
|
};
|
|
addScriptAtts(script, atts);
|
|
script.defer = 'defer';
|
|
script.type = 'module';
|
|
script.onerror = () => {
|
|
reject(new Error(`Failed to import: ${url}`));
|
|
destructor();
|
|
};
|
|
script.onload = () => {
|
|
resolve(window[vector]);
|
|
destructor();
|
|
};
|
|
const absURL = toAbsoluteURL(url);
|
|
const loader = `import * as m from '${absURL.replace(/'/g, "\\'")}'; window.${vector} = ${returnDefault ? 'm.default || ' : ''}m;`; // export Module
|
|
const blob = new Blob([loader], { type: 'text/javascript' });
|
|
script.src = URL.createObjectURL(blob);
|
|
|
|
document.head.append(script);
|
|
});
|
|
}
|
|
|
|
export default importModule;
|