From a353d6fc89c5cff2fd4554bbc02c84361d1ce557 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Tue, 29 May 2018 13:47:32 +0800 Subject: [PATCH] - npm: Update devDeps - Fix: Enforce stylesheet ordering sequence - Fix: Ensure SVG-edit hidden until stylesheets loaded - Fix: Avoid abandoning stylesheet loading if one load fails --- editor/external/load-stylesheets/index-es.js | 8 ++++- editor/svg-editor-es.html | 4 +++ editor/svg-editor.html | 4 +++ editor/svg-editor.js | 32 ++++++++++++++++++-- package-lock.json | 24 +++++++-------- package.json | 8 ++--- 6 files changed, 61 insertions(+), 19 deletions(-) diff --git a/editor/external/load-stylesheets/index-es.js b/editor/external/load-stylesheets/index-es.js index 1f619f8c..733ebf5a 100644 --- a/editor/external/load-stylesheets/index-es.js +++ b/editor/external/load-stylesheets/index-es.js @@ -1,6 +1,7 @@ function loadStylesheets(stylesheets, { before: beforeDefault, after: afterDefault, favicon: faviconDefault, - canvas: canvasDefault, image: imageDefault = true + canvas: canvasDefault, image: imageDefault = true, + acceptErrors } = {}) { stylesheets = Array.isArray(stylesheets) ? stylesheets : [stylesheets]; @@ -28,6 +29,11 @@ function loadStylesheets(stylesheets, { const link = document.createElement('link'); return new Promise((resolve, reject) => { + if (acceptErrors) { + reject = typeof acceptErrors === 'function' ? error => { + acceptErrors({ error, stylesheetURL, options, resolve, reject }); + } : resolve; + } if (stylesheetURL.endsWith('.css')) { favicon = false; } else if (stylesheetURL.endsWith('.ico')) { diff --git a/editor/svg-editor-es.html b/editor/svg-editor-es.html index e747d438..e879ecba 100644 --- a/editor/svg-editor-es.html +++ b/editor/svg-editor-es.html @@ -38,6 +38,8 @@ SVG-edit + +