Fix fabric.Group#toObject not serializing children image objects. Fix

#260.
fabricjs · Oct 8, 2012 · 307c950 · 307c950
1 parent 999f7f5
commit 307c950
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/dist/all.js b/dist/all.js
@@ -8534,8 +8534,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
         G_vmlCanvasManager.initElement(el);
       }
 
-      this.setCoords();
-      el.width  = this.getBoundingRectWidth();
+      el.width = this.getBoundingRectWidth();
       el.height = this.getBoundingRectHeight();
 
       fabric.util.wrapElement(el, 'div');
@@ -11602,7 +11601,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
      */
     toObject: function() {
       return extend(this.callSuper('toObject'), {
-        objects: invoke(this.objects, 'clone')
+        objects: invoke(this.objects, 'toObject')
       });
     },
 

diff --git a/dist/all.min.js b/dist/all.min.js
diff --git a/dist/all.min.js.gz b/dist/all.min.js.gz
diff --git a/src/group.class.js b/src/group.class.js
@@ -193,7 +193,7 @@
      */
     toObject: function() {
       return extend(this.callSuper('toObject'), {
-        objects: invoke(this.objects, 'clone')
+        objects: invoke(this.objects, 'toObject')
       });
     },
 

diff --git a/src/object.class.js b/src/object.class.js
@@ -1023,8 +1023,7 @@
         G_vmlCanvasManager.initElement(el);
       }
 
-      this.setCoords();
-      el.width  = this.getBoundingRectWidth();
+      el.width = this.getBoundingRectWidth();
       el.height = this.getBoundingRectHeight();
 
       fabric.util.wrapElement(el, 'div');

diff --git a/test/unit/group.js b/test/unit/group.js
@@ -2,6 +2,10 @@
 
   var canvas = this.canvas = new fabric.Canvas();
 
+  function _createImageElement() {
+    return fabric.isLikelyNode ? new (require('canvas').Image) : fabric.document.createElement('img');
+  }
+
   function makeGroupWith2Objects() {
     var rect1 = new fabric.Rect({ top: 100, left: 100, width: 30, height: 10 }),
         rect2 = new fabric.Rect({ top: 120, left: 50, width: 10, height: 40 });
@@ -285,4 +289,30 @@
     equal(group.toSVG(), expectedSVG);
   });
 
+  asyncTest('clonining group with 2 objects', function() {
+    var group = makeGroupWith2Objects();
+    group.clone(function(clone) {
+
+      ok(clone !== group);
+      deepEqual(clone.toObject(), group.toObject());
+
+      start();
+    });
+  });
+
+  // asyncTest('cloning group with image', function() {
+  //   var rect = new fabric.Rect({ top: 100, left: 100, width: 30, height: 10 }),
+  //       img = new fabric.Image(_createImageElement()),
+  //       group = new fabric.Group([ rect, img ]);
+
+  //   img.src = 'foo.png';
+
+  //   group.clone(function(clone) {
+  //     ok(clone !== group);
+  //     deepEqual(clone.toObject(), group.toObject());
+
+  //     start();
+  //   });
+  // });
+
 })();