Support reviver in Node's version of loadSVGFromURL and loadSVGFromString

This commit is contained in:
kangax 2013-08-06 16:11:31 +02:00
parent abcfe52fef
commit bbe83dad0f
4 changed files with 11 additions and 11 deletions

10
dist/all.js vendored
View file

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

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored

Binary file not shown.

View file

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