new commit per asturur

fabricjs · Mar 16, 2018 · a5c1cdc · a5c1cdc
1 parent 2ce99ee
commit a5c1cdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/shapes/text.class.js b/src/shapes/text.class.js
@@ -1203,12 +1203,16 @@
      */
     _getFontDeclaration: function(styleObject, forMeasuring) {
       var style = styleObject || this;
+      var fontFamily = style.fontFamily === undefined ||
+      style.fontFamily.includes('\'') ||
+      style.fontFamily.includes('"')
+        ? style.fontFamily : '"' + style.fontFamily + '"';
       return [
         // node-canvas needs "weight style", while browsers need "style weight"
         (fabric.isLikelyNode ? style.fontWeight : style.fontStyle),
         (fabric.isLikelyNode ? style.fontStyle : style.fontWeight),
         forMeasuring ? this.CACHE_FONT_SIZE + 'px' : style.fontSize + 'px',
-        (fabric.isLikelyNode ? ('"' + style.fontFamily + '"') : style.fontFamily)
+        fontFamily
       ].join(' ');
     },
 

diff --git a/test/unit/text.js b/test/unit/text.js
@@ -78,13 +78,11 @@
     assert.ok(typeof text._getFontDeclaration === 'function', 'has a private method _getFontDeclaration');
     var fontDecl = text._getFontDeclaration();
     assert.ok(typeof fontDecl == 'string', 'it returns a string');
-    if (fabric.isLikelyNode) {
-      assert.equal(fontDecl, 'normal normal 40px "Times New Roman"');
-    }
-    else {
-      assert.equal(fontDecl, 'normal normal 40px Times New Roman');
-    }
-
+    assert.equal(fontDecl, 'normal normal 40px "Times New Roman"');
+    text.fontFamily = '"Times New Roman"';
+    assert.equal(fontDecl, 'normal normal 40px "Times New Roman"');
+    text.fontFamily = '\'Times New Roman\'';
+    assert.equal(fontDecl, 'normal normal 40px \'Times New Roman\'');
   });
 
   QUnit.test('toObject', function(assert) {