Add unlayout function and fix tests

ampproject · Jun 29, 2018 · f0b81d1 · f0b81d1
1 parent 8380ae2
commit f0b81d1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/builtins/amp-img.js b/builtins/amp-img.js
@@ -42,6 +42,11 @@ export class AmpImg extends BaseElement {
     /** @private {?Element} */
     this.img_ = null;
 
+    /** @private {?UnlistenDef} */
+    this.unlistenLoad_ = null;
+
+    /** @private {?UnlistenDef} */
+    this.unlistenError_ = null;
   }
 
   /** @override */
@@ -140,14 +145,27 @@ export class AmpImg extends BaseElement {
   layoutCallback() {
     this.initialize_();
     const img = dev().assertElement(this.img_);
-    listen(img, 'load', () => this.hideFallbackImg_());
-    listen(img, 'error', () => this.onImgLoadingError_());
+    this.unlistenLoad_ = listen(img, 'load', () => this.hideFallbackImg_());
+    this.unlistenError_ = listen(img, 'error', () => this.onImgLoadingError_());
     if (this.getLayoutWidth() <= 0) {
       return Promise.resolve();
     }
     return this.loadPromise(img);
   }
 
+  /** @override */
+  unlayoutCallback() {
+    if (this.unlistenError_) {
+      this.unlistenError_();
+      this.unlistenError_ = null;
+    }
+    if (this.unlistenLoad_) {
+      this.unlistenLoad_();
+      this.unlistenLoad_ = null;
+    }
+    return true;
+  }
+
   /**
    * Sets the img src to the first url in the srcset if srcset is defined but
    * src is not.

diff --git a/test/functional/test-amp-img.js b/test/functional/test-amp-img.js
@@ -231,6 +231,10 @@ describe('amp-img', () => {
       };
     });
 
+    afterEach(() => {
+      impl.unlayoutCallback();
+    });
+
     it('should not display fallback if loading succeeds', () => {
       impl.buildCallback();
       expect(errorSpy).to.have.not.been.called;
@@ -367,5 +371,7 @@ describe('amp-img', () => {
     expect(img.getAttribute('aria-label')).to.equal('Hello');
     expect(img.getAttribute('aria-labelledby')).to.equal('id2');
     expect(img.getAttribute('aria-describedby')).to.equal('id3');
+    impl.unlayoutCallback();
   });
+
 });