Merge branch 'onetap' of github.com:kongguibin/amphtml into onetap

ampproject · Aug 7, 2020 · 3606578 · 3606578
2 parents f83b5c5 + 4f64474
commit 3606578
Show file tree

Hide file tree

Showing 4 changed files with 3,021 additions and 11 deletions.
diff --git a/amp.iml b/amp.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
diff --git a/extensions/amp-onetap-google/0.1/amp-onetap-google.css b/extensions/amp-onetap-google/0.1/amp-onetap-google.css
@@ -15,7 +15,6 @@
  */
 
 amp-onetap-google.intermediate-iframe-card-mode {
- margin: 0;
  position: fixed;
  right: 20px;
  top: 20px;

diff --git a/extensions/amp-onetap-google/0.1/amp-onetap-google.js b/extensions/amp-onetap-google/0.1/amp-onetap-google.js
@@ -133,11 +133,11 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
  toWin(this.element.ownerDocument.defaultView)
  );
 
- /** @private {boolean=} */
- this.isBottomSheetUiMode_ = undefined;
+ /** @private {?boolean} */
+ this.isBottomSheetUiMode_ = null;
 
- /** @private {!Element=} */
- this.intermediateIframe_;
+ /** @private {?Element} */
+ this.intermediateIframe_ = null;
 
  /** @private {boolean} */
  this.isIntermediateIframeVisible_ = false;
@@ -185,9 +185,17 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
  this.handleIntermediateIframeMessage_(event);
  }
  });
- this.win.addEventListener('load', () => {
- this.loadIntermediateIframe_();
- });
+ if (document.readyState === 'complete') {
+ // window Load event has already been fired. Use set timeout to defer
+ // the call.
+ setTimeout(() => {
+ this.loadIntermediateIframe_();
+ }, 200);
+ } else {
+ this.win.addEventListener('load', function () {
+ this.loadIntermediateIframe_();
+ });
+ }
  }
 
  /**
@@ -256,7 +264,7 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
  });
  break;
  case ACTIONS.SET_UI_MODE:
- if (this.isBottomSheetUiMode_ !== undefined) {
+ if (this.isBottomSheetUiMode_ !== null) {
  return;
  }
  const uiMode = event.data['mode'];
@@ -331,7 +339,6 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
  this.element.appendChild(this.intermediateIframe_);
  this.doc_.addEventListener('click', this.onClickOutside_, false);
  this.setCardUiMode_();
- console.log('Intermediate Iframe loaded.');
  return true;
  }
  return false;
@@ -343,7 +350,6 @@ export class AmpOnetapGoogle extends AMP.BaseElement {
  this.hideAmpElement_();
  this.element.removeChild(this.intermediateIframe_);
  this.intermediateIframe_ = null;
- console.log('Intermediate Iframe unloaded.');
  }
  }