Disallow use of 'var'.

This also fixes some usages of 'var' that didn't get caught by the
previous CLs.

Change-Id: I4ce53d62d24e53e121d7eced70590836c1d26523

.eslintrc.js

@@ -35,12 +35,6 @@ module.exports = {
 
         // Things we should probably fix, but in stages in multiple commits: {{{
 
-        // In many cases, we should change scoped var to let.
-        "block-scoped-var": "off",
-        "no-inner-declarations": "off",
-        "no-redeclare": "off",
-        "no-shadow": "off",
-
         // These could catch real bugs
         "consistent-return": "off",
         "default-case": "off",
@@ -53,6 +47,7 @@ module.exports = {
         "complexity": "off",
         "dot-location": "off",
         "no-negated-condition": "off",
+        "no-shadow": "off",
         // }}}
 
         // Temporary Google style overrides while we get in compliance with the latest style guide {{{
@@ -65,7 +60,6 @@ module.exports = {
         "new-cap": "off",
         "no-multi-spaces": "off",
         "no-multiple-empty-lines": "off",
-        "no-var": "off",
         "object-curly-spacing": "off",
         "one-var": "off",
         "padded-blocks": "off",
@@ -75,7 +69,7 @@ module.exports = {
         // }}}
 
         // "Possible error" rules in "eslint:recommended" that need options: {{{
-	"no-empty": ["error", {"allowEmptyCatch": true}],
+        "no-empty": ["error", {"allowEmptyCatch": true}],
         // }}}
 
         // "Possible error" rules we should be able to pass, but are not part of "eslint:recommended": {{{
@@ -142,5 +136,20 @@ module.exports = {
         // Style rules that don't seem to be in the Google style config: {{{
         "array-bracket-newline": ["error", "consistent"],
         // }}}
-    }
+    },
+    "overrides": [
+        {
+            "files": [
+                // Closure requires using var in externs.
+                "externs/**/*.js",
+                "test/test/externs/*.js",
+                // Use var in load.js so it works in old browsers.  We'll use
+                // compiled mode for the main library and the demo.
+                "demo/load.js",
+            ],
+            "rules": {
+                "no-var": "off",
+            },
+        },
+    ],
 };

demo/asset_section.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private {!Array.<HTMLOptGroupElement>} */

demo/configuration_section.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private */

demo/info_section.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private */

demo/load.js

@@ -107,7 +107,7 @@
 
   // The application must define its list of compiled and uncompiled sources
   // before including this loader.  The URLs should be relative to the page.
-  for (var i = 0; i < scripts.length; ++i) {
-    loadRelativeScript(scripts[i]);
+  for (var j = 0; j < scripts.length; ++j) {
+    loadRelativeScript(scripts[j]);
   }
 })();  // anonymous namespace

demo/log_section.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private {!Object.<string, Function>} */

demo/main.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private {shaka.cast.CastProxy} */

demo/offline_section.js

@@ -24,7 +24,7 @@
 
 
 /** @suppress {duplicate} */
-var shakaDemo = shakaDemo || {};
+var shakaDemo = shakaDemo || {};  // eslint-disable-line no-var
 
 
 /** @private {?HTMLOptGroupElement} */

test/net/http_plugin_unit.js

@@ -201,14 +201,14 @@ function httpPluginTests(usingFetch) {
   });
 
   it('fails if non-2xx status', function(done) {
-    var uri = 'https://foo.bar/404';
+    const uri = 'https://foo.bar/404';
     testFails(uri, done, undefined, shaka.util.Error.Code.BAD_HTTP_STATUS,
         [uri, 404, 'ABC', { 'foo': 'BAR' }, requestType]);
     PromiseMock.flush();
   });
 
   it('fails on timeout', function(done) {
-    var uri = 'https://foo.bar/timeout';
+    const uri = 'https://foo.bar/timeout';
     testFails(uri, done, shaka.util.Error.Severity.RECOVERABLE,
         shaka.util.Error.Code.TIMEOUT, [uri, requestType]);
 
@@ -220,7 +220,7 @@ function httpPluginTests(usingFetch) {
   });
 
   it('fails on error', function(done) {
-    var uri = 'https://foo.bar/error';
+    const uri = 'https://foo.bar/error';
     testFails(uri, done, shaka.util.Error.Severity.RECOVERABLE,
         shaka.util.Error.Code.HTTP_ERROR,
         [uri, jasmine.any(Object), requestType]);

test/test/util/manifest_generator.js

@@ -195,7 +195,7 @@ shaka.test.ManifestGenerator.prototype.bandwidth = function(bandwidth) {
  * @return {!shaka.test.ManifestGenerator}
  */
 shaka.test.ManifestGenerator.prototype.disallowByApplication = function() {
-  var variant = this.currentVariant_();
+  let variant = this.currentVariant_();
   variant.allowedByApplication = false;
   return this;
 };
@@ -207,7 +207,7 @@ shaka.test.ManifestGenerator.prototype.disallowByApplication = function() {
  * @return {!shaka.test.ManifestGenerator}
  */
 shaka.test.ManifestGenerator.prototype.disallowByKeySystem = function() {
-  var variant = this.currentVariant_();
+  let variant = this.currentVariant_();
   variant.allowedByKeySystem = false;
   return this;
 };
@@ -562,7 +562,7 @@ shaka.test.ManifestGenerator.prototype.textStream = function(uri) {
  * @return {!shaka.test.ManifestGenerator}
  */
 shaka.test.ManifestGenerator.prototype.anyInitSegment = function() {
-  var stream = this.currentStream_();
+  let stream = this.currentStream_();
   stream.initSegmentReference =
       /** @type {shaka.media.InitSegmentReference} */ (
           jasmine.any(this.shaka_.media.InitSegmentReference));
@@ -576,7 +576,7 @@ shaka.test.ManifestGenerator.prototype.anyInitSegment = function() {
  * @return {!shaka.test.ManifestGenerator}
  */
 shaka.test.ManifestGenerator.prototype.nullInitSegment = function() {
-  var stream = this.currentStream_();
+  let stream = this.currentStream_();
   stream.initSegmentReference = null;
   return this;
 };
@@ -635,7 +635,7 @@ shaka.test.ManifestGenerator.prototype.mime = function(mime, opt_codecs) {
  * @return {!shaka.test.ManifestGenerator}
  */
 shaka.test.ManifestGenerator.prototype.frameRate = function(frameRate) {
-  var stream = this.currentStream_();
+  let stream = this.currentStream_();
   stream.frameRate = frameRate;
   return this;
 };