Merge pull request #885 from erwinmombay/let

switch `var` to `let` or `const`

.eslintrc

@@ -50,6 +50,7 @@
     "no-unused-expressions": 0,
     "no-useless-call": 2,
     "no-useless-concat": 2,
+    "no-var": 2,
     "no-warning-comments": [2, { "terms": ["do not submit"], "location": "anywhere" }],
     "object-curly-spacing": [2, "never", {
       "objectsInObjects": false,

3p/integration.js

@@ -50,7 +50,7 @@ register('twitter', twitter);
  * @param {!Object} data
  */
 export function draw3p(win, data) {
-  var type = data.type;
+  const type = data.type;
   assert(window.context.location.originValidated != null,
       'Origin should have been validated');
   run(type, win, data);
@@ -65,8 +65,8 @@ export function draw3p(win, data) {
  */
 function masterSelection(type) {
   // The master has a special name.
-  var masterName = 'frame_' + type + '_master';
-  var master;
+  const masterName = 'frame_' + type + '_master';
+  let master;
   try {
     // Try to get the master from the parent. If it does not
     // exist yet we get a security exception that we catch
@@ -87,8 +87,8 @@ function masterSelection(type) {
  * Draws an optionally synchronously to the DOM.
  */
 window.draw3p = function() {
-  var fragment = location.hash;
-  var data = fragment ? JSON.parse(fragment.substr(1)) : {};
+  const fragment = location.hash;
+  const data = fragment ? JSON.parse(fragment.substr(1)) : {};
   window.context = data._context;
   window.context.location = parseUrl(data._context.location.href);
   validateParentOrigin(window, window.context.location);
@@ -120,7 +120,7 @@ function triggerDimensions(width, height) {
 }
 
 function nonSensitiveDataPostMessage(type, opt_object) {
-  var object = opt_object || {};
+  const object = opt_object || {};
   object.type = type;
   object.sentinel = 'amp-3p';
   window.parent./*OK*/postMessage(object,

3p/twitter.js

@@ -50,18 +50,18 @@ function getTwttr(global, cb) {
  * @param {!Object} data
  */
 export function twitter(global, data) {
-  var tweet = document.createElement('div');
+  const tweet = document.createElement('div');
   tweet.id = 'tweet';
-  var width = data.initialWindowWidth;
-  var height = data.initialWindowHeight;
+  const width = data.initialWindowWidth;
+  const height = data.initialWindowHeight;
   tweet.style.width = '100%';
   global.document.getElementById('c').appendChild(tweet);
   getTwttr(global, function(twttr) {
     // Dimensions are given by the parent frame.
     delete data.width;
     delete data.height;
     twttr.widgets.createTweet(data.tweetid, tweet, data)./*OK*/then(() => {
-      var iframe = global.document.querySelector('#c iframe');
+      const iframe = global.document.querySelector('#c iframe');
       // Unfortunately the tweet isn't really done at this time.
       // We listen for resize to learn when things are
       // really done.
@@ -74,8 +74,8 @@ export function twitter(global, data) {
 
 
   function render() {
-    var iframe = global.document.querySelector('#c iframe');
-    var body = iframe.contentWindow.document.body;
+    const iframe = global.document.querySelector('#c iframe');
+    const body = iframe.contentWindow.document.body;
     context.updateDimensions(
         body./*OK*/offsetWidth,
         body./*OK*/offsetHeight + /* margins */ 20);

ads/adreactor.js

@@ -21,7 +21,7 @@ import {writeScript} from '../src/3p';
  * @param {!Object} data
  */
 export function adreactor(global, data) {
-  var url = 'https://adserver.adreactor.com' +
+  const url = 'https://adserver.adreactor.com' +
       '/servlet/view/banner/javascript/zone?' +
       'zid=' + encodeURIComponent(data.zid) +
       '&pid=' + encodeURIComponent(data.pid) +

ads/adsense.js

@@ -23,11 +23,11 @@ import {writeScript} from '../src/3p';
 export function adsense(global, data) {
   /*eslint "google-camelcase/google-camelcase": 0*/
   global.google_page_url = global.context.canonicalUrl;
-  var s = document.createElement('script');
+  const s = document.createElement('script');
   s.src = 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js';
   global.document.body.appendChild(s);
 
-  var i = document.createElement('ins');
+  const i = document.createElement('ins');
   i.setAttribute('data-ad-client', data['adClient']);
   if (data['adSlot']) {
     i.setAttribute('data-ad-slot', data['adSlot']);

ads/adtech.js

@@ -21,7 +21,7 @@ import {writeScript, validateSrcPrefix, validateSrcContains} from '../src/3p';
  * @param {!Object} data
  */
 export function adtech(global, data) {
-  var src = data.src;
+  const src = data.src;
   validateSrcPrefix('https:', src);
   validateSrcContains('/addyn/', src);
   writeScript(global, src);

ads/doubleclick.js

@@ -23,18 +23,18 @@ import {loadScript} from '../src/3p';
 export function doubleclick(global, data) {
   loadScript(global, 'https://www.googletagservices.com/tag/js/gpt.js', () => {
     global.googletag.cmd.push(function() {
-      var dimensions = [[
+      const dimensions = [[
         parseInt(data.width, 10),
         parseInt(data.height, 10)
       ]];
-      var slot = googletag.defineSlot(data.slot, dimensions, 'c')
+      const slot = googletag.defineSlot(data.slot, dimensions, 'c')
           .addService(googletag.pubads());
       googletag.pubads().enableSingleRequest();
       googletag.pubads().set('page_url', context.canonicalUrl);
       googletag.enableServices();
 
       if (data.targeting) {
-        for (var key in data.targeting) {
+        for (const key in data.targeting) {
           slot.setTargeting(key, data.targeting[key]);
         }
       }

build-system/config.js

@@ -96,7 +96,11 @@ module.exports = {
   karma: karma,
   lintGlobs: [
     '**/*.js',
-    '!{node_modules,build,dist,dist.3p,third_party,build-system}/**/*.*'
+    '!{node_modules,build,dist,dist.3p,third_party,build-system}/**/*.*',
+    '!{testing,examples}/**/*.*',
+    '!gulpfile.js',
+    '!karma.conf.js',
+    '!**/local-amp-chrome-extension/background.js',
   ],
   presubmitGlobs: [
     '**/*.{css,js}',

builtins/amp-ad.js

@@ -371,7 +371,7 @@ export function installAd(win) {
       a.href = 'https://www.ampproject.org';
       a.target = '_blank';
       a.setAttribute('fallback', '');
-      var img = new Image();
+      const img = new Image();
       setStyles(img, {
         width: 'auto',
         height: '100%',

builtins/amp-img.js

@@ -28,9 +28,6 @@ import {registerElement} from '../src/custom-element';
  */
 export function installImg(win) {
 
-  /** @type {number} Count of images */
-  var count = 0;
-
   class AmpImg extends BaseElement {
 
     /** @override */

builtins/amp-pixel.js

@@ -122,16 +122,16 @@ export function installPixel(win) {
 
     /** @override */
     layoutCallback() {
-      var src = this.element.getAttribute('src');
+      let src = this.element.getAttribute('src');
       src = this.assertSource(src);
       src = src.replace(REPLACEMENT_EXPR, function(match, name) {
-        var val = REPLACEMENTS[name]();
+        let val = REPLACEMENTS[name]();
         if (!val && val !== 0) {
           val = '';
         }
         return encodeURIComponent(val);
       });
-      var image = new Image();
+      const image = new Image();
       image.src = src;
       image.width = 1;
       image.height = 1;

extensions/amp-audio/0.1/test/test-amp-audio.js

@@ -24,9 +24,9 @@ require('../amp-audio');
 adopt(window);
 
 describe('amp-audio', () => {
-  var iframe;
-  var ampAudio;
-  var sandbox;
+  let iframe;
+  let ampAudio;
+  let sandbox;
 
   beforeEach(() => {
     sandbox = sinon.sandbox.create();
@@ -43,7 +43,7 @@ describe('amp-audio', () => {
 
   function getAmpAudio(attributes, opt_childNodesAttrs) {
     ampAudio = iframe.doc.createElement('amp-audio');
-    for (var key in attributes) {
+    for (const key in attributes) {
       ampAudio.setAttribute(key, attributes[key]);
     }
     if (opt_childNodesAttrs) {
@@ -66,7 +66,7 @@ describe('amp-audio', () => {
   }
 
   function attachAndRun(attributes, opt_childNodesAttrs) {
-    var ampAudio = getAmpAudio(attributes, opt_childNodesAttrs);
+    const ampAudio = getAmpAudio(attributes, opt_childNodesAttrs);
     naturalDimensions_['AMP-AUDIO'] = {width: 300, height: 30};
     return iframe.addElement(ampAudio);
   }
@@ -75,7 +75,7 @@ describe('amp-audio', () => {
     return attachAndRun({
       src: 'https://origin.com/audio.mp3'
     }).then(a => {
-      var audio = a.querySelector('audio');
+      const audio = a.querySelector('audio');
       expect(audio).to.be.an.instanceof(Element);
       expect(audio.tagName).to.equal('AUDIO');
       expect(audio.getAttribute('src'))
@@ -99,7 +99,7 @@ describe('amp-audio', () => {
         {tag: 'source', src: 'https://origin.com/audio.ogg', type: 'audio/ogg'},
         {tag: 'text', text: 'Unsupported.'},
     ]).then(a => {
-      var audio = a.querySelector('audio');
+      const audio = a.querySelector('audio');
       expect(audio).to.be.an.instanceof(Element);
       expect(audio.tagName).to.equal('AUDIO');
       expect(a.getAttribute('width')).to.be.equal('503');
@@ -124,7 +124,7 @@ describe('amp-audio', () => {
 
   it('should set its dimensions to the browser natural', () => {
     return attachAndRun({}).then(a => {
-      var audio = a.querySelector('audio');
+      const audio = a.querySelector('audio');
       expect(a.style.width).to.be.equal('300px');
       expect(a.style.height).to.be.equal('30px');
       if (/Safari|Firefox/.test(navigator.userAgent)) {
@@ -141,7 +141,7 @@ describe('amp-audio', () => {
     return attachAndRun({
       'width': '500'
     }).then(a => {
-      var audio = a.querySelector('audio');
+      const audio = a.querySelector('audio');
       expect(a.style.width).to.be.equal('500px');
       expect(a.style.height).to.be.equal('30px');
     });

extensions/amp-carousel/0.1/carousel.js

@@ -78,9 +78,9 @@ export class AmpCarousel extends BaseCarousel {
 
   /** @override */
   goCallback(dir, animate) {
-    var newPos = this.nextPos_(this.pos_, dir);
+    const newPos = this.nextPos_(this.pos_, dir);
     if (newPos != this.pos_) {
-      var oldPos = this.pos_;
+      const oldPos = this.pos_;
       this.pos_ = newPos;
 
       if (!animate) {
@@ -160,7 +160,7 @@ export class AmpCarousel extends BaseCarousel {
    * @private
    */
   preloadNext_(pos, dir) {
-    var nextPos = this.nextPos_(pos, dir);
+    const nextPos = this.nextPos_(pos, dir);
     if (nextPos != pos) {
       this.withinWindow_(nextPos, cell => {
         this.schedulePreload(cell);

extensions/amp-carousel/0.1/slides.js

@@ -77,10 +77,10 @@ export class AmpSlides extends BaseCarousel {
 
   /** @override */
   goCallback(dir, animate) {
-    var newIndex = this.nextIndex_(dir);
+    const newIndex = this.nextIndex_(dir);
     if (newIndex != this.currentIndex_) {
-      var newSlide = this.slides_[newIndex];
-      var oldSlide = this.slides_[this.currentIndex_];
+      const newSlide = this.slides_[newIndex];
+      const oldSlide = this.slides_[this.currentIndex_];
       this.currentIndex_ = newIndex;
       this.prepareSlide_(newSlide, dir);
       if (!animate) {
@@ -158,7 +158,7 @@ export class AmpSlides extends BaseCarousel {
    * @param {number} dir
    */
   prepareSlide_(slide, dir) {
-    var containerWidth = this.element./*OK*/offsetWidth;
+    const containerWidth = this.element./*OK*/offsetWidth;
     st.setStyles(slide, {
       transform: st.translateX(dir * containerWidth),
       zIndex: 1,
@@ -175,7 +175,7 @@ export class AmpSlides extends BaseCarousel {
    * @return {!Transition}
    */
   createTransition_(oldSlide, newSlide, dir) {
-    var containerWidth = this.element./*OK*/offsetWidth;
+    const containerWidth = this.element./*OK*/offsetWidth;
     return tr.all([
       tr.setStyles(newSlide, {
         transform: tr.translateX(tr.numeric(dir * containerWidth, 0)),
@@ -233,7 +233,7 @@ export class AmpSlides extends BaseCarousel {
   preloadNext_(dir) {
     // TODO(dvoytenko): can we actually preload it here? There's no
     // guarantee of it has display!=none.
-    var nextIndex = this.nextIndex_(dir);
+    const nextIndex = this.nextIndex_(dir);
     if (nextIndex != this.currentIndex_) {
       this.schedulePreload(this.slides_[nextIndex]);
     }

extensions/amp-fit-text/0.1/amp-fit-text.js

@@ -36,7 +36,7 @@ class AmpFitText extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    var childNodes = this.getRealChildNodes();
+    const childNodes = this.getRealChildNodes();
 
     /** @private @const */
     this.content_ = document.createElement('div');

extensions/amp-fit-text/0.1/test/test-amp-fit-text.js

@@ -28,7 +28,7 @@ describe('amp-fit-text component', () => {
 
   function getFitText(text, opt_responsive) {
     return createIframePromise().then(iframe => {
-      var ft = iframe.doc.createElement('amp-fit-text');
+      const ft = iframe.doc.createElement('amp-fit-text');
       ft.setAttribute('width', '111');
       ft.setAttribute('height', '222');
       ft.style.fontFamily = 'Arial';
@@ -51,9 +51,9 @@ describe('amp-fit-text component', () => {
   }
 
   it('renders', () => {
-    var text = 'Lorem ipsum';
+    const text = 'Lorem ipsum';
     return getFitText(text).then(ft => {
-      var content = ft.querySelector('.-amp-fit-text-content');
+      const content = ft.querySelector('.-amp-fit-text-content');
       expect(content).to.not.equal(null);
       expect(content.textContent).to.equal(text);
     });