Merge pull request #4955 from timvandermeij/rename-concatenate

Renames concatenateToArray to appendToArray
This commit is contained in:
Yury Delendik 2014-06-17 08:21:47 -05:00
commit 5a2e511cbd
3 changed files with 5 additions and 6 deletions

View File

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

View File

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

View File

@ -705,12 +705,11 @@ var Util = PDFJS.Util = (function UtilClosure() {
return num < 0 ? -1 : 1;
};
// TODO(mack): Rename appendToArray
Util.concatenateToArray = function concatenateToArray(arr1, arr2) {
Util.appendToArray = function Util_appendToArray(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);
};