Browse Source

Merge pull request #4955 from timvandermeij/rename-concatenate

Renames concatenateToArray to appendToArray
Yury Delendik 11 years ago
parent
commit
5a2e511cbd
  1. 4
      src/core/evaluator.js
  2. 2
      src/core/stream.js
  3. 5
      src/shared/util.js

4
src/core/evaluator.js

@ -1138,7 +1138,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var name = args[0].name; var name = args[0].name;
if (xobjsCache.key === name) { if (xobjsCache.key === name) {
if (xobjsCache.texts) { if (xobjsCache.texts) {
Util.concatenateToArray(bidiTexts, xobjsCache.texts.items); Util.appendToArray(bidiTexts, xobjsCache.texts.items);
Util.extendObj(textContent.styles, xobjsCache.texts.styles); Util.extendObj(textContent.styles, xobjsCache.texts.styles);
} }
break; break;
@ -1169,7 +1169,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return self.getTextContent(xobj, return self.getTextContent(xobj,
xobj.dict.get('Resources') || resources, stateManager). xobj.dict.get('Resources') || resources, stateManager).
then(function (formTextContent) { then(function (formTextContent) {
Util.concatenateToArray(bidiTexts, formTextContent.items); Util.appendToArray(bidiTexts, formTextContent.items);
Util.extendObj(textContent.styles, formTextContent.styles); Util.extendObj(textContent.styles, formTextContent.styles);
stateManager.restore(); stateManager.restore();

2
src/core/stream.js

@ -274,7 +274,7 @@ var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
for (var i = 0, ii = this.streams.length; i < ii; i++) { for (var i = 0, ii = this.streams.length; i < ii; i++) {
var stream = this.streams[i]; var stream = this.streams[i];
if (stream.getBaseStreams) { if (stream.getBaseStreams) {
Util.concatenateToArray(baseStreams, stream.getBaseStreams()); Util.appendToArray(baseStreams, stream.getBaseStreams());
} }
} }
return baseStreams; return baseStreams;

5
src/shared/util.js

@ -705,12 +705,11 @@ var Util = PDFJS.Util = (function UtilClosure() {
return num < 0 ? -1 : 1; return num < 0 ? -1 : 1;
}; };
// TODO(mack): Rename appendToArray Util.appendToArray = function Util_appendToArray(arr1, arr2) {
Util.concatenateToArray = function concatenateToArray(arr1, arr2) {
Array.prototype.push.apply(arr1, arr2); Array.prototype.push.apply(arr1, arr2);
}; };
Util.prependToArray = function concatenateToArray(arr1, arr2) { Util.prependToArray = function Util_prependToArray(arr1, arr2) {
Array.prototype.unshift.apply(arr1, arr2); Array.prototype.unshift.apply(arr1, arr2);
}; };

Loading…
Cancel
Save