Merge pull request #7774 from timvandermeij/lint

Improve lint coverage and correct code style violations

.jshintignore

@@ -3,16 +3,13 @@ l10n/
 docs/
 node_modules/
 examples/
+external/bcmaps/
 external/webL10n/
-external/shelljs/
-external/jpgjs/
-external/jasmine/
 external/cmapscompress/
-external/importL10n/
 external/builder/fixtures_esprima/
-shared/
 test/tmp/
 test/features/
+test/pdfs/
 test/resources/
 test/font/*_spec.js
 *~/

external/importL10n/locales.js

@@ -66,7 +66,7 @@ function downloadLanguageFiles(root, langCode, callback) {
     var request = https.get(url, function(response) {
       var content = '';
       response.setEncoding('utf8');
-      response.on("data", function(chunk) {
+      response.on('data', function(chunk) {
         content += chunk;
       });
       response.on('end', function() {
@@ -75,7 +75,7 @@ function downloadLanguageFiles(root, langCode, callback) {
         if (downloadsLeft === 0) {
           callback();
         }
-      })
+      });
     });
   });
 }

src/core/crypto.js

@@ -498,8 +498,7 @@ var calculateSHA512 = (function calculateSHA512Closure() {
       h5 = new Word64(0x9b05688c, 0x2b3e6c1f);
       h6 = new Word64(0x1f83d9ab, 0xfb41bd6b);
       h7 = new Word64(0x5be0cd19, 0x137e2179);
-    }
+    } else {
-    else {
       // SHA384 is exactly the same
       // except with different starting values and a trimmed result
       h0 = new Word64(0xcbbb9d5d, 0xc1059ed8);
@@ -618,8 +617,7 @@ var calculateSHA512 = (function calculateSHA512Closure() {
       h5.copyTo(result,40);
       h6.copyTo(result,48);
       h7.copyTo(result,56);
-    }
+    } else {
-    else {
       result = new Uint8Array(48);
       h0.copyTo(result,0);
       h1.copyTo(result,8);
@@ -1651,11 +1649,9 @@ var PDF20 = (function PDF20Closure() {
       }
       if (remainder === 0) {
         k = calculateSHA256(e, 0, e.length);
-      }
+      } else if (remainder === 1) {
-      else if (remainder === 1) {
         k = calculateSHA384(e, 0, e.length);
-      }
+      } else if (remainder === 2) {
-      else if (remainder === 2) {
         k = calculateSHA512(e, 0, e.length);
       }
       i++;
@@ -1977,8 +1973,7 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
       encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
                                      ownerPassword, userPassword, flags,
                                      revision, keyLength, encryptMetadata);
-    }
+    } else {
-    else {
       var ownerValidationSalt = stringToBytes(dict.get('O')).subarray(32, 40);
       var ownerKeySalt = stringToBytes(dict.get('O')).subarray(40, 48);
       var uBytes = stringToBytes(dict.get('U')).subarray(0, 48);

src/core/murmurhash3.js

@@ -65,8 +65,7 @@ var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) {
           var code = input.charCodeAt(i);
           if (code <= 0xff) {
             data[length++] = code;
-          }
+          } else {
-          else {
             data[length++] = code >>> 8;
             data[length++] = code & 0xff;
           }

test/unit/crypto_spec.js

@@ -317,8 +317,7 @@ describe('crypto', function() {
       alg = new PDF17();
       password = new Uint8Array([117, 115, 101, 114]);
       userValidation = new Uint8Array([117, 169, 4, 32, 159, 101, 22, 220]);
-      userPassword = new Uint8Array([
+      userPassword = new Uint8Array([131, 242, 143, 160, 87, 2, 138, 134, 79,
-                                      131, 242, 143, 160, 87, 2, 138, 134, 79,
                                      253, 189, 173, 224, 73, 144, 241, 190, 81,
                                      197, 15, 249, 105, 145, 151, 15, 194, 65,
                                      3, 1, 126, 187, 221]);