From 7c03c115aca5d497413e6ba37bc83ebd9368b6f7 Mon Sep 17 00:00:00 2001 From: kangax Date: Thu, 21 Jul 2011 16:49:43 -0400 Subject: [PATCH] Fix bug with `extend` not being defined. --- dist/all.js | 4 ++-- src/canvas.serialization.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/all.js b/dist/all.js index c96498b5..14b866ea 100644 --- a/dist/all.js +++ b/dist/all.js @@ -1,6 +1,6 @@ /*! Fabric.js Copyright 2008-2011, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */ -var fabric = fabric || { version: "0.4.3" }; +var fabric = fabric || { version: "0.4.4" }; (function(){ var view = document.defaultView; @@ -6127,7 +6127,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, { object.setSourcePath(path); if (!(object instanceof fabric.PathGroup)) { - extend(object, obj); + fabric.util.object.extend(object, obj); if (typeof obj.angle !== 'undefined') { object.setAngle(obj.angle); } diff --git a/src/canvas.serialization.js b/src/canvas.serialization.js index af970b5c..1f0bf18d 100644 --- a/src/canvas.serialization.js +++ b/src/canvas.serialization.js @@ -125,7 +125,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, { // copy parameters from serialied json to object (left, top, scaleX, scaleY, etc.) // skip this step if an object is a PathGroup, since we already passed it options object before if (!(object instanceof fabric.PathGroup)) { - extend(object, obj); + fabric.util.object.extend(object, obj); if (typeof obj.angle !== 'undefined') { object.setAngle(obj.angle); }