commit ecb1c44d14263152750de433e86f161accd57694
author airnan <hernantorrisi@gmail.com> Mon Oct 08 20:33:29 2018 -0400
committer airnan <hernantorrisi@gmail.com> Mon Oct 08 20:33:29 2018 -0400
tree 5b06b3560f00d1b491f12e8b8dd533719dfdaf74
parent 176a1c09b9719ce8243e43901b77b5876c43fd74

adding support for charCode 3 End Of Text

player/js/elements/svgElements/SVGTextElement.js

diff --git a/player/js/elements/svgElements/SVGTextElement.js b/player/js/elements/svgElements/SVGTextElement.js
index 22a7b4a..547eaac 100644
--- a/player/js/elements/svgElements/SVGTextElement.js
+++ b/player/js/elements/svgElements/SVGTextElement.js
@@ -17,7 +17,7 @@
     var i = 0, len = textArray.length;
     var textContents = [], currentTextContent = '';
     while (i < len) {
-        if(textArray[i] === String.fromCharCode(13)) {
+        if(textArray[i] === String.fromCharCode(13) || textArray[i] === String.fromCharCode(3)) {
             textContents.push(currentTextContent);
             currentTextContent = '';
         } else {
@@ -55,7 +55,7 @@
     }
 
     var letters = documentData.l || [];
-    var usesGlyphs = this.globalData.fontManager.chars;
+    var usesGlyphs = !!this.globalData.fontManager.chars;
     len = letters.length;
 
     var tSpan;

player/js/utils/text/TextProperty.js

diff --git a/player/js/utils/text/TextProperty.js b/player/js/utils/text/TextProperty.js
index de840f6..c4eca39 100644
--- a/player/js/utils/text/TextProperty.js
+++ b/player/js/utils/text/TextProperty.js
@@ -201,6 +201,7 @@
     documentData.finalText = this.buildFinalText(documentData.t);
     documentData.finalLineHeight = documentData.lh;
     var trackingOffset = documentData.tr/1000*documentData.finalSize;
+    var charCode;
     if(documentData.sz){
         var flag = true;
         var boxWidth = documentData.sz[0];
@@ -208,6 +209,7 @@
         var currentHeight, finalText;
         while(flag) {
             finalText = this.buildFinalText(documentData.t);
+            charCode = finalText[i].charCodeAt(0);
             currentHeight = 0;
             lineWidth = 0;
             len = finalText.length;
@@ -217,7 +219,7 @@
                 newLineFlag = false;
                 if(finalText[i] === ' '){
                     lastSpaceIndex = i;
-                }else if(finalText[i].charCodeAt(0) === 13){
+                }else if(charCode === 13 || charCode === 3){
                     lineWidth = 0;
                     newLineFlag = true;
                     currentHeight += documentData.finalLineHeight || documentData.finalSize*1.2;
@@ -264,9 +266,10 @@
     for (i = 0;i < len ;i += 1) {
         newLineFlag = false;
         currentChar = documentData.finalText[i];
-        if(currentChar === ' '){
+        charCode = currentChar.charCodeAt(0);
+        if (currentChar === ' '){
             val = '\u00A0';
-        }else if(currentChar.charCodeAt(0) === 13){
+        } else if (charCode === 13 || charCode === 3) {
             uncollapsedSpaces = 0;
             lineWidths.push(lineWidth);
             maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;