diff --git a/zundler/assets/inject_pre.js b/zundler/assets/inject_pre.js index 8cb4779..77ceb12 100644 --- a/zundler/assets/inject_pre.js +++ b/zundler/assets/inject_pre.js @@ -118,7 +118,7 @@ action: "retrieveFile", var embedImgFromParent = function(img) { function setSrc(img, file) { - if (mime_type == 'image/svg+xml') { + if (file.mime_type == 'image/svg+xml') { img.setAttribute('src', "data:image/svg+xml;charset=utf-8;base64, " + btoa(file.data)); } else { img.setAttribute('src', `data:${file.mime_type};base64, ${file.data}`); diff --git a/zundler/assets/zundler_common.js b/zundler/assets/zundler_common.js index 671d2c7..c33f90e 100644 --- a/zundler/assets/zundler_common.js +++ b/zundler/assets/zundler_common.js @@ -63,6 +63,10 @@ var normalizePath = function(path) { var result = window.globalContext.current_path; result = result.split('/'); result.pop(); + // path can be a request object + if (!(typeof path === 'string' || path instanceof String)) { + path = path.href; + }; result = result.concat(path.split('/')); // resolve relative directories