Merge pull request #2853 from asturur/textboxspaces

Textboxspaces
fabricjs · Mar 27, 2016 · f1cd8bf · f1cd8bf
2 parents 7059e34 + e3e8984
commit f1cd8bf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/src/mixins/itext.svg_export.js b/src/mixins/itext.svg_export.js
@@ -9,7 +9,7 @@
      * @private
      */
     _setSVGTextLineText: function(lineIndex, textSpans, height, textLeftOffset, textTopOffset, textBgRects) {
-      if (!this.styles[lineIndex]) {
+      if (!this.hasStyleOnLine(lineIndex)) {
         fabric.Text.prototype._setSVGTextLineText.call(this,
           lineIndex, textSpans, height, textLeftOffset, textTopOffset);
       }

diff --git a/src/shapes/itext.class.js b/src/shapes/itext.class.js
@@ -865,6 +865,16 @@
       }
     },
 
+    /**
+     * This function is a TEMPORARY fix before restyling svg export
+     * and tspan generation
+     * @param {Number} lineIndex
+     * @private
+     */
+    hasStyleOnLine: function(lineIndex) {
+      return this.styles[lineIndex];
+    },
+
     /**
      * @param {Number} lineIndex
      * @param {Number} charIndex

diff --git a/src/shapes/textbox.class.js b/src/shapes/textbox.class.js
@@ -131,6 +131,23 @@
       return map;
     },
 
+    /**
+     * This function is a TEMPORARY fix before restyling svg export
+     * and tspan generation
+     * @param {Number} lineIndex
+     * @private
+     */
+    hasStyleOnLine: function(lineIndex) {
+      if (this._styleMap) {
+        var map = this._styleMap[lineIndex];
+        if (!map) {
+          return null;
+        }
+        lineIndex = map.line;
+      }
+      return this.styles[lineIndex];
+    },
+
     /**
      * @param {Number} lineIndex
      * @param {Number} charIndex