From f4282f98026f317312e7f7ada1eade17cf13d36c Mon Sep 17 00:00:00 2001 From: Vivien Nicolas <21@vingtetun.org> Date: Sun, 19 Jun 2011 02:35:28 +0200 Subject: [PATCH] Use strict mode for js files --- fonts.js | 5 ++++- glyphlist.js | 2 ++ pdf.js | 17 ++++++++++------- utils/fonts_utils.js | 1 + viewer.js | 8 +++++--- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/fonts.js b/fonts.js index 219ada8ca..576e35cb9 100644 --- a/fonts.js +++ b/fonts.js @@ -1,6 +1,8 @@ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- / /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ +"use strict"; + /** * Maximum file size of the font. */ @@ -1092,7 +1094,8 @@ var Type1Parser = function() { this.extractFontProgram = function t1_extractFontProgram(aStream) { var eexecString = decrypt(aStream, kEexecEncryptionKey, 4); var subrs = [], glyphs = []; - var inSubrs = inGlyphs = false; + var inSubrs = false; + var inGlyphs = false; var glyph = ""; var token = ""; diff --git a/glyphlist.js b/glyphlist.js index 1a0190133..f638ff888 100644 --- a/glyphlist.js +++ b/glyphlist.js @@ -1,3 +1,5 @@ +"use strict"; + var GlyphsUnicode = { A: 0x0041, AE: 0x00C6, diff --git a/pdf.js b/pdf.js index 9c4344fab..02159f94b 100644 --- a/pdf.js +++ b/pdf.js @@ -1,6 +1,8 @@ /* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- / /* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */ +"use strict"; + var ERRORS = 0, WARNINGS = 1, TODOS = 5; var verbosity = WARNINGS; @@ -246,7 +248,7 @@ var FlateStream = (function() { this.eof = false; this.codeSize = 0; this.codeBuf = 0; - + this.pos = 0; this.bufferLength = 0; } @@ -432,6 +434,11 @@ var FlateStream = (function() { litCodeTable = fixedLitCodeTab; distCodeTable = fixedDistCodeTab; } else if (hdr == 2) { // compressed block, dynamic codes + var repeat = function repeat(stream, array, len, offset, what) { + var repeat = stream.getBits(len) + offset; + while (repeat-- > 0) + array[i++] = what; + } var numLitCodes = this.getBits(5) + 257; var numDistCodes = this.getBits(5) + 1; var numCodeLenCodes = this.getBits(4) + 4; @@ -449,11 +456,6 @@ var FlateStream = (function() { var codes = numLitCodes + numDistCodes; var codeLengths = new Array(codes); while (i < codes) { - function repeat(stream, array, len, offset, what) { - var repeat = stream.getBits(len) + offset; - while (repeat-- > 0) - array[i++] = what; - } var code = this.getCode(codeLenCodeTab); if (code == 16) { repeat(this, codeLengths, 2, 3, len); @@ -725,6 +727,7 @@ var Lexer = (function() { var done = false; var str = ""; var stream = this.stream; + var ch = null; do { switch (ch = stream.getChar()) { case undefined: @@ -1429,7 +1432,7 @@ var Catalog = (function() { return shadow(this, "toplevelPagesDict", obj); }, get numPages() { - obj = this.toplevelPagesDict.get("Count"); + var obj = this.toplevelPagesDict.get("Count"); assertWellFormed(IsInt(obj), "page count in top level pages object is not an integer"); // shadow the prototype getter diff --git a/utils/fonts_utils.js b/utils/fonts_utils.js index 086648fe2..45f92a28b 100644 --- a/utils/fonts_utils.js +++ b/utils/fonts_utils.js @@ -7,6 +7,7 @@ * CharString or to understand the structure of the CFF format. */ +"use strict"; /** * Build a charset by assigning the glyph name and the human readable form diff --git a/viewer.js b/viewer.js index a8e7ae6e1..41aaf354c 100644 --- a/viewer.js +++ b/viewer.js @@ -1,12 +1,14 @@ /* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- / /* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */ -var pdfDocument, canvas, pageDisplay, pageNum, pageInterval; +"use strict"; + +var pdfDocument, canvas, pageDisplay, pageNum, numPages, pageInterval; function load(userInput) { canvas = document.getElementById("canvas"); canvas.mozOpaque = true; pageNum = parseInt(queryParams().page) || 1; - fileName = userInput; + var fileName = userInput; if (!userInput) { fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf"; } @@ -26,7 +28,7 @@ function queryParams() { function open(url) { document.title = url; - req = new XMLHttpRequest(); + var req = new XMLHttpRequest(); req.open("GET", url); req.mozResponseType = req.responseType = "arraybuffer"; req.expected = (document.URL.indexOf("file:") == 0) ? 0 : 200;