Fix coding style in src/core/chunked_stream.js

This commit is contained in:
Jonas Jenwald 2014-03-22 20:21:22 +01:00
parent 8355b5185d
commit 53bbdcb0a1

View File

@ -55,7 +55,7 @@ var ChunkedStream = (function ChunkedStreamClosure() {
return this.numChunksLoaded === this.numChunks; return this.numChunksLoaded === this.numChunks;
}, },
onReceiveData: function(begin, chunk) { onReceiveData: function ChunkedStream_onReceiveData(begin, chunk) {
var end = begin + chunk.byteLength; var end = begin + chunk.byteLength;
assert(begin % this.chunkSize === 0, 'Bad begin offset: ' + begin); assert(begin % this.chunkSize === 0, 'Bad begin offset: ' + begin);
@ -63,7 +63,7 @@ var ChunkedStream = (function ChunkedStreamClosure() {
// See ChunkedStream.moveStart() // See ChunkedStream.moveStart()
var length = this.bytes.length; var length = this.bytes.length;
assert(end % this.chunkSize === 0 || end === length, assert(end % this.chunkSize === 0 || end === length,
'Bad end offset: ' + end); 'Bad end offset: ' + end);
this.bytes.set(new Uint8Array(chunk), begin); this.bytes.set(new Uint8Array(chunk), begin);
var chunkSize = this.chunkSize; var chunkSize = this.chunkSize;
@ -78,11 +78,11 @@ var ChunkedStream = (function ChunkedStreamClosure() {
} }
}, },
onReceiveInitialData: function (data) { onReceiveInitialData: function ChunkedStream_onReceiveInitialData(data) {
this.bytes.set(data); this.bytes.set(data);
this.initialDataLength = data.length; this.initialDataLength = data.length;
var endChunk = this.end === data.length ? var endChunk = (this.end === data.length ?
this.numChunks : Math.floor(data.length / this.chunkSize); this.numChunks : Math.floor(data.length / this.chunkSize));
for (var i = 0; i < endChunk; i++) { for (var i = 0; i < endChunk; i++) {
this.loadedChunks[i] = true; this.loadedChunks[i] = true;
++this.numChunksLoaded; ++this.numChunksLoaded;
@ -167,8 +167,9 @@ var ChunkedStream = (function ChunkedStreamClosure() {
} }
var end = pos + length; var end = pos + length;
if (end > strEnd) if (end > strEnd) {
end = strEnd; end = strEnd;
}
this.ensureRange(pos, end); this.ensureRange(pos, end);
this.pos = end; this.pos = end;
@ -187,8 +188,9 @@ var ChunkedStream = (function ChunkedStreamClosure() {
}, },
skip: function ChunkedStream_skip(n) { skip: function ChunkedStream_skip(n) {
if (!n) if (!n) {
n = 1; n = 1;
}
this.pos += n; this.pos += n;
}, },
@ -406,13 +408,13 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
} }
if (prevChunk >= 0 && prevChunk + 1 !== chunk) { if (prevChunk >= 0 && prevChunk + 1 !== chunk) {
groupedChunks.push({ groupedChunks.push({ beginChunk: beginChunk,
beginChunk: beginChunk, endChunk: prevChunk + 1}); endChunk: prevChunk + 1 });
beginChunk = chunk; beginChunk = chunk;
} }
if (i + 1 === chunks.length) { if (i + 1 === chunks.length) {
groupedChunks.push({ groupedChunks.push({ beginChunk: beginChunk,
beginChunk: beginChunk, endChunk: chunk + 1}); endChunk: chunk + 1 });
} }
prevChunk = chunk; prevChunk = chunk;
@ -421,8 +423,8 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
}, },
onProgress: function ChunkedStreamManager_onProgress(args) { onProgress: function ChunkedStreamManager_onProgress(args) {
var bytesLoaded = this.stream.numChunksLoaded * this.chunkSize + var bytesLoaded = (this.stream.numChunksLoaded * this.chunkSize +
args.loaded; args.loaded);
this.msgHandler.send('DocProgress', { this.msgHandler.send('DocProgress', {
loaded: bytesLoaded, loaded: bytesLoaded,
total: this.length total: this.length