Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-05 20:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix resolveNamespace and getKlass on node

Browse source
This commit is contained in:
kangax 2013-09-24 13:11:41 +02:00
parent 3e5abfcd6d
commit 83ca60e885
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/util/misc.js
View file

@ -1,4 +1,4 @@
(function() {
(function(global) {
var sqrt = Math.sqrt,
atan2 = Math.atan2;
@ -112,7 +112,9 @@
* @return {Object} klass "Class"
*/
function getKlass(type, namespace) {
return resolveNamespace(namespace)[fabric.util.string.camelize(fabric.util.string.capitalize(type))];
// capitalize first letter only
type = fabric.util.string.camelize(type.charAt(0).toUpperCase() + type.slice(1));
return resolveNamespace(namespace)[type];
}
/**
@ -126,7 +128,7 @@
var parts = namespace.split('.'),
len = parts.length,
obj = fabric.window;
obj = global || fabric.window;
for (var i = 0; i < len; ++i) {
obj = obj[parts[i]];
@ -533,4 +535,4 @@
fabric.util.getFunctionBody = getFunctionBody;
fabric.util.drawArc = drawArc;
})();
})(typeof exports !== 'undefined' ? exports : this);

13
test/unit/util.js
View file

@ -745,4 +745,17 @@
'\n if (1) { alert(12345) } ');
});
test('getKlass', function() {
equal(fabric.util.getKlass('circle'), fabric.Circle);
equal(fabric.util.getKlass('rect'), fabric.Rect);
equal(fabric.util.getKlass('RemoveWhite', 'fabric.Image.filters'), fabric.Image.filters.RemoveWhite);
equal(fabric.util.getKlass('Sepia2', 'fabric.Image.filters'), fabric.Image.filters.Sepia2);
});
test('resolveNamespace', function() {
equal(fabric.util.resolveNamespace('fabric'), fabric);
equal(fabric.util.resolveNamespace('fabric.Image'), fabric.Image);
equal(fabric.util.resolveNamespace('fabric.Image.filters'), fabric.Image.filters);
});
})();