🐛 Fix LGTM alerts in AMP codebase (#22488)

Author: rsimha

3p/embedly.js

@@ -60,12 +60,12 @@ export const CardOptions = {
  * Loads embedly card SDK that is consumed by this 3p integration.
  *
  * @param {!Window} global
- * @param {function(!Object)} callback
+ * @param {function()} callback
  * @visibleForTesting
  */
 function getEmbedly(global, callback) {
   loadScript(global, EMBEDLY_SDK_URL, function() {
-    callback(global);
+    callback();
   });
 }
 

3p/github.js

@@ -26,11 +26,11 @@ import {writeScript} from './3p';
  *
  * @param {!Window} global
  * @param {string} scriptSource The source of the script, different for post and comment embeds.
- * @param {function(*)} cb
+ * @param {function()} cb
  */
 function getGistJs(global, scriptSource, cb) {
   writeScript(global, scriptSource, function() {
-    cb(global.gist);
+    cb();
   });
 }
 

3p/nameframe.max.html

@@ -5,14 +5,14 @@
   <script>
     try {
       var name_data = JSON.parse(window.name);
-      if (!name_data || !name_data['creative']) {
+      if (!name_data || !name_data.creative) {
         throw new Error('Missing or incorrectly formatted JSON ' +
             'input to nameframe');
       }
       document.open();
-      document.write(name_data['creative']);
+      document.write(name_data.creative);
       document.close();
-      delete name_data['creative'];
+      delete name_data.creative;
       window.name = JSON.stringify(name_data);
     } catch (err) {
       window.parent.postMessage({type: 'no-content', error: err.message}, '*');

build-system/tasks/presubmit-checks.js

@@ -896,6 +896,7 @@ const forbiddenTermsSrcInclusive = {
       'build-system/amp4test.js',
       'dist.3p/current/integration.js',
       'extensions/amp-iframe/0.1/amp-iframe.js',
+      'src/3p-frame.js',
       'src/config.js',
       'testing/local-amp-chrome-extension/background.js',
       'tools/errortracker/errortracker.go',

extensions/amp-vimeo/0.1/amp-vimeo.js

@@ -207,7 +207,7 @@ class AmpVimeo extends AMP.BaseElement {
       !originMatches(
         event,
         this.iframe_,
-        /^(https?:)?\/\/((player|www).)?vimeo.com(?=$|\/)/
+        /^(https?:)?\/\/((player|www)\.)?vimeo.com(?=$|\/)/
       )
     ) {
       return;

src/3p-frame.js

@@ -291,7 +291,7 @@ export function getDevelopmentBootstrapBaseUrl(parentWindow, srcFileBasename) {
  */
 function getAdsLocalhost(win) {
   let adsUrl = urls.thirdParty; // local dev with a non-localhost server
-  if (adsUrl.indexOf('ampproject.net') > -1) {
+  if (adsUrl == 'https://3p.ampproject.net') {
     adsUrl = 'http://ads.localhost'; // local dev with a localhost server
   }
   return adsUrl + ':' + (win.location.port || win.parent.location.port);

validator/build.py

@@ -22,10 +22,8 @@
 import os
 import platform
 import re
-import shutil
 import subprocess
 import sys
-import tempfile
 
 
 def Die(msg):

validator/engine/json-testutil.js

@@ -98,7 +98,7 @@ function objToJsonSegments(obj, out, cmpFn) {
         // We hack the non-standard "'" into place here because the
         // Javascript style guide prefers them (and git5 lint reports
         // double quotes as errors).
-        out.push('\'' + candidate.slice(1, -1).replace('\'', '\\\'') + '\'');
+        out.push('\'' + candidate.slice(1, -1).replace(/\'/g, '\\\'') + '\'');
       } else {
         out.push(candidate);
       }

validator/webui/build.py

@@ -22,7 +22,6 @@
 # Polymer project, and unlike for the parent directory there's no
 # particular benefit to using Python.
 
-import glob
 import logging
 import os
 import platform
@@ -158,7 +157,7 @@ def Main():
   logging.basicConfig(
       format='[[%(filename)s %(funcName)s]] - %(message)s',
       level=(logging.ERROR if os.environ.get('TRAVIS') else logging.INFO))
-  nodejs_cmd = GetNodeJsCmd()
+  GetNodeJsCmd()
   CheckPrereqs()
   InstallNodeDependencies()
   SetupOutDir(out_dir='dist')