Fix few Prototype dependencies.

This commit is contained in:
kangax 2010-07-26 18:00:02 -04:00
parent 6593983196
commit a535b004e6
2 changed files with 9 additions and 13 deletions

12
dist/all.js vendored
View file

@ -1,4 +1,4 @@
/*! Fabric.js Copyright 2008-2010, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
/*! Fabric.js Copyright 2010, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
if (typeof console == 'undefined') {
var console = {
@ -2066,9 +2066,7 @@ fabric.util.animate = animate;
window = global.window,
document = window.document,
capitalize = fabric.util.string.capitalize,
camelize = fabric.util.string.camelize,
Canvas = global.Canvas || (global.Canvas = { });
camelize = fabric.util.string.camelize;
if (fabric.Element) {
console.warn('fabric.Element is already defined.');
@ -3572,12 +3570,12 @@ fabric.util.animate = animate;
switch (obj.type) {
case 'image':
case 'text':
Canvas[obj.type.capitalize()].fromObject(obj, function (o) {
Canvas[capitalize(obj.type)].fromObject(obj, function (o) {
onObjectLoaded(o, index);
});
break;
default:
var klass = Canvas[obj.type.capitalize().camelize()];
var klass = Canvas[camelize(capitalize(obj.type))];
if (klass && klass.fromObject) {
onObjectLoaded(klass.fromObject(obj), index);
}
@ -3739,7 +3737,7 @@ fabric.util.animate = animate;
var options = cachedObject.options;
objects = objects.map(function (o) {
return Canvas[o.type.capitalize()].fromObject(o);
return fabric[capitalize(o.type)].fromObject(o);
});
return ({ objects: objects, options: options });

View file

@ -4,9 +4,7 @@
window = global.window,
document = window.document,
capitalize = fabric.util.string.capitalize,
camelize = fabric.util.string.camelize,
Canvas = global.Canvas || (global.Canvas = { });
camelize = fabric.util.string.camelize;
if (fabric.Element) {
console.warn('fabric.Element is already defined.');
@ -1570,12 +1568,12 @@
switch (obj.type) {
case 'image':
case 'text':
Canvas[obj.type.capitalize()].fromObject(obj, function (o) {
Canvas[capitalize(obj.type)].fromObject(obj, function (o) {
onObjectLoaded(o, index);
});
break;
default:
var klass = Canvas[obj.type.capitalize().camelize()];
var klass = Canvas[camelize(capitalize(obj.type))];
if (klass && klass.fromObject) {
onObjectLoaded(klass.fromObject(obj), index);
}
@ -1744,7 +1742,7 @@
var options = cachedObject.options;
objects = objects.map(function (o) {
return Canvas[o.type.capitalize()].fromObject(o);
return fabric[capitalize(o.type)].fromObject(o);
});
return ({ objects: objects, options: options });