Merge pull request mozilla#3239 from brendandahl/scope-fix

yurydelendik · yurydelendik · commit 67eb3bbc68a2 · 2013-05-10T10:18:34.000-07:00
Bind chunk promises to avoid scope problems.
diff --git a/src/evaluator.js b/src/evaluator.js
@@ -884,7 +884,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
                 case 'TJ':
                   var chunkPromise = new Promise();
                   chunkPromises.push(chunkPromise);
-                  fontPromise.then(function(items, font) {
+                  fontPromise.then(function(items, chunkPromise, font) {
                     var chunk = '';
                     for (var j = 0, jj = items.length; j < jj; j++) {
                       if (typeof items[j] === 'string') {
@@ -901,41 +901,40 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
                         }
                       }
                     }
-
                     chunkPromise.resolve(
                         getBidiText(chunk, -1, font.vertical));
-                  }.bind(null, args[0]));
+                  }.bind(null, args[0], chunkPromise));
                   break;
                 case 'Tj':
                   var chunkPromise = new Promise();
                   chunkPromises.push(chunkPromise);
-                  fontPromise.then(function(charCodes, font) {
+                  fontPromise.then(function(charCodes, chunkPromise, font) {
                     var chunk = fontCharsToUnicode(charCodes, font);
                     chunkPromise.resolve(
                         getBidiText(chunk, -1, font.vertical));
-                  }.bind(null, args[0]));
+                  }.bind(null, args[0], chunkPromise));
                   break;
                 case '\'':
                   // For search, adding a extra white space for line breaks
                   // would be better here, but that causes too much spaces in
                   // the text-selection divs.
                   var chunkPromise = new Promise();
                   chunkPromises.push(chunkPromise);
-                  fontPromise.then(function(charCodes, font) {
+                  fontPromise.then(function(charCodes, chunkPromise, font) {
                     var chunk = fontCharsToUnicode(charCodes, font);
                     chunkPromise.resolve(
                         getBidiText(chunk, -1, font.vertical));
-                  }.bind(null, args[0]));
+                  }.bind(null, args[0], chunkPromise));
                   break;
                 case '"':
                   // Note comment in "'"
                   var chunkPromise = new Promise();
                   chunkPromises.push(chunkPromise);
-                  fontPromise.then(function(charCodes, font) {
+                  fontPromise.then(function(charCodes, chunkPromise, font) {
                     var chunk = fontCharsToUnicode(charCodes, font);
                     chunkPromise.resolve(
                         getBidiText(chunk, -1, font.vertical));
-                  }.bind(null, args[2]));
+                  }.bind(null, args[2], chunkPromise));
                   break;
                 case 'Do':
                   if (args[0].code) {
