From 668c2867d473ff95e3f7124215e57ade489eec2d Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Tue, 11 Sep 2012 16:14:18 -0700
Subject: [PATCH] Change the format of textContent to be an array

---
 src/evaluator.js | 18 +++---------------
 web/viewer.js    |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/evaluator.js b/src/evaluator.js
index 1ac32f781..6afcccea8 100644
--- a/src/evaluator.js
+++ b/src/evaluator.js
@@ -507,10 +507,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
     getTextContent: function partialEvaluatorGetIRQueue(stream, resources, state) {
       if (!state) {
-        state = {
-          text: '',
-          mapping: []
-        };
+        state = [];
       }
 
       var self = this;
@@ -528,9 +525,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       var res = resources;
       var args = [], obj;
 
-      var text = state.text;
       var chunk = '';
-      var commandOffset = state.mapping;
       var font = null;
       while (!isEOF(obj = parser.getObj())) {
         if (isCmd(obj)) {
@@ -594,20 +589,16 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
               // Add some spacing between the text here and the text of the
               // xForm.
-              text = text + ' ';
 
-              state.text = text;
               state = this.getTextContent(
                 xobj,
                 xobj.dict.get('Resources') || resources,
                 state
               );
-              text = state.text;
               break;
           } // switch
           if (chunk !== '') {
-            commandOffset.push(text.length);
-            text += chunk;
+            state.push(chunk);
             chunk = '';
           }
 
@@ -618,10 +609,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         }
       }
 
-      return {
-        text: text,
-        mapping: commandOffset
-      };
+      return state;
     },
 
     extractDataStructures: function
diff --git a/web/viewer.js b/web/viewer.js
index 8d7c51f24..12ca1aa35 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1043,7 +1043,7 @@ var PDFView = {
     function extractPageText(pageIndex) {
       self.pages[pageIndex].pdfPage.getTextContent().then(
         function textContentResolved(textContent) {
-          self.pageText[pageIndex] = textContent.text;
+          self.pageText[pageIndex] = textContent.join('');
           self.search();
           if ((pageIndex + 1) < self.pages.length)
             extractPageText(pageIndex + 1);