From 8d6565d1a8cc6c0d797db4363e831677a6caecbb Mon Sep 17 00:00:00 2001 From: Julian Viereck Date: Fri, 14 Sep 2012 15:03:27 -0700 Subject: [PATCH] Change the format of the BidiResult object. --- src/bidi.js | 20 ++++++++++---------- web/viewer.js | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bidi.js b/src/bidi.js index 0c6eea9c2..5eb66bfd9 100644 --- a/src/bidi.js +++ b/src/bidi.js @@ -138,16 +138,16 @@ var bidi = PDFJS.bidi = (function bidiClosure() { } } - function bidiResult(content, direction) { - this.content = content; - this.direction = direction; + function BidiResult(str, isLTR) { + this.str = str; + this.ltr = isLTR; } function bidi(str, startLevel) { - var direction = ''; + var isLTR = true; var strLength = str.length; if (strLength == 0) - return new bidiResult(str, direction); + return new BidiResult(str, ltr); // get types, fill arrays @@ -181,16 +181,16 @@ var bidi = PDFJS.bidi = (function bidiClosure() { // if less than 30% chars are rtl then string is primarily ltr // if more than 30% chars are rtl then string is primarily rtl if (numBidi == 0) { - direction = 'ltr'; - return new bidiResult(str, direction); + isLTR = true; + return new BidiResult(str, isLTR); } if (startLevel == -1) { if ((strLength / numBidi) < 0.3) { - direction = 'ltr'; + isLTR = true; startLevel = 0; } else { - direction = 'rtl'; + isLTR = false; startLevel = 1; } } @@ -444,7 +444,7 @@ var bidi = PDFJS.bidi = (function bidiClosure() { result += ch; } - return new bidiResult(result, direction); + return new BidiResult(result, isLTR); } return bidi; diff --git a/web/viewer.js b/web/viewer.js index 09c5c4fe7..2764a3648 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1935,8 +1935,8 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) { var textDiv = textDivs[i]; var bidiText = PDFJS.bidi(textContent[i], -1); - textDiv.textContent = bidiText.content; - textDiv.dir = bidiText.direction; + textDiv.textContent = bidiText.str; + textDiv.dir = bidiText.ltr ? 'ltr' : 'rtl'; } this.setupRenderLayoutTimer();