mirror of
https://github.com/Hopiu/fabric.js.git
synced 2026-04-28 17:24:42 +00:00
Support reviver in Node's version of loadSVGFromURL and loadSVGFromString
This commit is contained in:
parent
abcfe52fef
commit
bbe83dad0f
4 changed files with 11 additions and 11 deletions
10
dist/all.js
vendored
10
dist/all.js
vendored
|
|
@ -17819,25 +17819,25 @@ fabric.util.object.extend(fabric.Text.prototype, {
|
|||
}
|
||||
};
|
||||
|
||||
fabric.loadSVGFromURL = function(url, callback) {
|
||||
fabric.loadSVGFromURL = function(url, callback, reviver) {
|
||||
url = url.replace(/^\n\s*/, '').replace(/\?.*$/, '').trim();
|
||||
if (url.indexOf('http') !== 0) {
|
||||
request_fs(url, function(body) {
|
||||
fabric.loadSVGFromString(body, callback);
|
||||
fabric.loadSVGFromString(body, callback, reviver);
|
||||
});
|
||||
}
|
||||
else {
|
||||
request(url, '', function(body) {
|
||||
fabric.loadSVGFromString(body, callback);
|
||||
fabric.loadSVGFromString(body, callback, reviver);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
fabric.loadSVGFromString = function(string, callback) {
|
||||
fabric.loadSVGFromString = function(string, callback, reviver) {
|
||||
var doc = new DOMParser().parseFromString(string);
|
||||
fabric.parseSVGDocument(doc.documentElement, function(results, options) {
|
||||
callback(results, options);
|
||||
});
|
||||
}, reviver);
|
||||
};
|
||||
|
||||
fabric.util.getScript = function(url, callback) {
|
||||
|
|
|
|||
2
dist/all.min.js
vendored
2
dist/all.min.js
vendored
File diff suppressed because one or more lines are too long
BIN
dist/all.min.js.gz
vendored
BIN
dist/all.min.js.gz
vendored
Binary file not shown.
10
src/node.js
10
src/node.js
|
|
@ -89,25 +89,25 @@
|
|||
}
|
||||
};
|
||||
|
||||
fabric.loadSVGFromURL = function(url, callback) {
|
||||
fabric.loadSVGFromURL = function(url, callback, reviver) {
|
||||
url = url.replace(/^\n\s*/, '').replace(/\?.*$/, '').trim();
|
||||
if (url.indexOf('http') !== 0) {
|
||||
request_fs(url, function(body) {
|
||||
fabric.loadSVGFromString(body, callback);
|
||||
fabric.loadSVGFromString(body, callback, reviver);
|
||||
});
|
||||
}
|
||||
else {
|
||||
request(url, '', function(body) {
|
||||
fabric.loadSVGFromString(body, callback);
|
||||
fabric.loadSVGFromString(body, callback, reviver);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
fabric.loadSVGFromString = function(string, callback) {
|
||||
fabric.loadSVGFromString = function(string, callback, reviver) {
|
||||
var doc = new DOMParser().parseFromString(string);
|
||||
fabric.parseSVGDocument(doc.documentElement, function(results, options) {
|
||||
callback(results, options);
|
||||
});
|
||||
}, reviver);
|
||||
};
|
||||
|
||||
fabric.util.getScript = function(url, callback) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue