give getSrc a better role in this class.

fabricjs · Aug 22, 2016 · 2015e3e · 2015e3e
1 parent 3938c83
commit 2015e3e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/shapes/image.class.js b/src/shapes/image.class.js
@@ -224,7 +224,7 @@
       });
 
       var object = extend(this.callSuper('toObject', propertiesToInclude), {
-        src: element ? element.src || element._src : '',
+        src: this.getSrc(),
         filters: filters,
         resizeFilters: resizeFilters,
         crossOrigin: this.crossOrigin,
@@ -297,8 +297,12 @@
      * @return {String} Source of an image
      */
     getSrc: function() {
-      if (this.getElement()) {
-        return this.getElement().src || this.getElement()._src;
+      var element = this.getElement();
+      if (element) {
+        return element.src || element._src;
+      }
+      else {
+        return this.src || '';
       }
     },
 

diff --git a/test/unit/image.js b/test/unit/image.js
@@ -35,7 +35,7 @@
     'flipX':                    false,
     'flipY':                    false,
     'opacity':                  1,
-    'src':                      fabric.isLikelyNode ? undefined : IMG_SRC,
+    'src':                      fabric.isLikelyNode ? '' : IMG_SRC,
     'shadow':                   null,
     'visible':                  true,
     'backgroundColor':          '',
@@ -212,15 +212,15 @@
   asyncTest('toString', function() {
     createImageObject(function(image) {
       ok(typeof image.toString == 'function');
-      equal(image.toString(), '#<fabric.Image: { src: "' + (fabric.isLikelyNode ? undefined : IMG_SRC) + '" }>');
+      equal(image.toString(), '#<fabric.Image: { src: "' + (fabric.isLikelyNode ? '' : IMG_SRC) + '" }>');
       start();
     });
   });
 
   asyncTest('getSrc', function() {
     createImageObject(function(image) {
       ok(typeof image.getSrc == 'function');
-      equal(image.getSrc(), fabric.isLikelyNode ? undefined : IMG_SRC);
+      equal(image.getSrc(), fabric.isLikelyNode ? '' : IMG_SRC);
       start();
     });
   });