reject promise when layoutCallback throw

ampproject · May 17, 2018 · 3e49c31 · 3e49c31
1 parent e398a42
commit 3e49c31
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/custom-element.js b/src/custom-element.js
@@ -45,6 +45,7 @@ import {isExperimentOn} from './experiments';
 import {parseSizeList} from './size-list';
 import {setStyle} from './style';
 import {toWin} from './types';
+import {tryResolve} from '../../../src/utils/promise';
 
 const TAG = 'CustomElement';
 
@@ -1041,9 +1042,11 @@ function createBaseCustomElementClass(win) {
       if (this.perfOn_) {
         this.getLayoutDelayMeter_().startLayout();
       }
-      const promise = this.implementation_.layoutCallback();
+
+      const promise = tryResolve(() => this.implementation_.layoutCallback());
       this.preconnect(/* onLayout */true);
       this.classList.add('i-amphtml-layout');
+
       return promise.then(() => {
         if (isLoadEvent) {
           this.signals_.signal(CommonSignals.LOAD_END);