Change getFontDeclaration (#3191)

* Change getFontDeclaration
fabricjs · Aug 22, 2016 · 702126e · 702126e
1 parent 181cdec
commit 702126e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/shapes/text.class.js b/src/shapes/text.class.js
@@ -844,15 +844,16 @@
     },
 
     /**
-     * @private
+     * return font declaration string for canvas context
+     * @returns {String} font declaration formatted for canvas context.
      */
     _getFontDeclaration: function() {
       return [
         // node-canvas needs "weight style", while browsers need "style weight"
         (fabric.isLikelyNode ? this.fontWeight : this.fontStyle),
         (fabric.isLikelyNode ? this.fontStyle : this.fontWeight),
         this.fontSize + 'px',
-        (fabric.isLikelyNode ? ('"' + this.fontFamily + '"') : this.fontFamily)
+        '"' + this.fontFamily + '"'
       ].join(' ');
     },
 

diff --git a/test/unit/text.js b/test/unit/text.js
@@ -71,6 +71,14 @@
     equal(text.toString(), '#<fabric.Text (1): { "text": "x", "fontFamily": "Times New Roman" }>');
   });
 
+  test('_getFontDeclaration', function() {
+    var text = createTextObject();
+    ok(typeof text._getFontDeclaration == 'function', 'has a private method _getFontDeclaration');
+    var fontDecl = text._getFontDeclaration();
+    ok(typeof fontDecl == 'string', 'it returns a string');
+    equal(fontDecl, 'normal  40px "Times New Roman"');
+  });
+
   test('toObject', function() {
     var text = createTextObject();
     ok(typeof text.toObject == 'function');