Merge pull request #862 from erwinmombay/fix-race-pt2

fix: make sure to do the dom mutation inside a `deferMutate`
ampproject · Nov 4, 2015 · 36cc8af · 36cc8af
2 parents 8b21956 + 75eb290
commit 36cc8af
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/builtins/amp-ad.js b/builtins/amp-ad.js
@@ -245,7 +245,7 @@ export function installAd(win) {
 
         // Triggered by context.noContentAvailable() inside the ad iframe.
         const unlisten = listen(this.iframe_, 'no-content', () => {
-          this.noContentHandler_();
+          this.deferMutate(this.noContentHandler_.bind(this));
           unlisten();
         });
       }
@@ -257,7 +257,6 @@ export function installAd(win) {
         this.setDefaultFallback_();
         this.element.appendChild(this.fallback_);
       }
-
       this.element.removeChild(this.iframe_);
       this.toggleFallback(true);
     }

diff --git a/src/base-element.js b/src/base-element.js
@@ -389,7 +389,8 @@ export class BaseElement {
   }
 
   /**
-   * Hides or shows the fallback, if available.
+   * Hides or shows the fallback, if available. This function must only
+   * be called inside a mutate context.
    * @param {boolean} state
    * @protected @final
    */

diff --git a/src/custom-element.js b/src/custom-element.js
@@ -803,7 +803,8 @@ export function createAmpElementProto(win, name, implementationClass) {
   };
 
   /**
-   * Hides or shows the fallback, if available.
+   * Hides or shows the fallback, if available. This function must only
+   * be called inside a mutate context.
    * @param {boolean} state
    * @package @final
    */