amp-ad linter fix (#15549)

ampproject · May 24, 2018 · 01b29df · 01b29df
1 parent ac4319b
commit 01b29df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
@@ -78,9 +78,6 @@ export class AmpAdXOriginIframeHandler {
     /** @private {boolean} */
     this.isInaboxPositionApiInit_ = false;
 
-    /** @private {?SubscriptionApi} */
-    this.inaboxRequestPositionApi_ = null;
-
     /** @private {!Array<!Function>} functions to unregister listeners */
     this.unlisteners_ = [];
 

diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js
@@ -31,7 +31,7 @@ import {user} from '../../../src/log';
  * will be handled by the extension loader.
  *
  * @param {string} type
- * @return !string
+ * @return {string}
  * @private
  */
 function networkImplementationTag(type) {

diff --git a/extensions/amp-ad/0.1/concurrent-load.js b/extensions/amp-ad/0.1/concurrent-load.js
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+import {Deferred} from '../../../src/utils/promise';
 import {Services} from '../../../src/services';
 import {user} from '../../../src/log';
 
@@ -75,8 +76,13 @@ export function incrementLoadingAds(win, opt_loadingPromise) {
     win[LOADING_ADS_WIN_ID_] = 0;
   }
   win[LOADING_ADS_WIN_ID_]++;
-  throttlePromise_ = throttlePromise_ ||
-      new Promise(resolver => throttlePromiseResolver_ = resolver);
+
+  if (!throttlePromise_) {
+    const deferred = new Deferred();
+    throttlePromise_ = deferred.promise;
+    throttlePromiseResolver_ = deferred.resolve;
+  }
+
   Services.timerFor(win)
       .timeoutPromise(1000, opt_loadingPromise)
       .catch(() => {})

diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-custom.js b/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
@@ -38,6 +38,7 @@ describe('Amp custom ad', () => {
    * Get a custom amp-ad element
    * @param {string} url The url of the ad server
    * @param {string} slot The alphanumeric slot Id (optional)
+   * @param {HTMLElement} body
    * @return {Element} The completed amp-ad element, which has been added to
    *    the current document body.
    */