Adopt ClickHandler for FIE (ampproject#8864)

* Adopt ClickHandler for FIE * restrict parseUrlWithA * fixed types * whitelist presubmits
mrjoro · Apr 28, 2017 · 46bc9e7 · 46bc9e7
1 parent 78e5164
commit 46bc9e7
Show file tree

Hide file tree

Showing 9 changed files with 706 additions and 593 deletions.
diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -283,6 +283,14 @@ var forbiddenTerms = {
       'tools/experiments/experiments.js',
     ],
   },
+  'parseUrlWithA': {
+    message: 'Use parseUrl instead.',
+    whitelist: [
+      'src/url.js',
+      'src/service/document-click.js',
+      'dist.3p/current/integration.js',
+    ],
+  },
   '\\.sendMessage\\(': {
     message: 'Usages must be reviewed.',
     whitelist: [

diff --git a/src/amp.js b/src/amp.js
@@ -27,7 +27,6 @@ import {
   performanceFor,
 } from './service/performance-impl';
 import {installPullToRefreshBlocker} from './pull-to-refresh';
-import {installGlobalClickListenerForDoc} from './document-click';
 import {installStyles, makeBodyVisible} from './style-installer';
 import {installErrorReporting} from './error';
 import {installDocService} from './service/ampdoc-impl';
@@ -97,7 +96,6 @@ startupChunk(self.document, function initial() {
     });
     startupChunk(self.document, function final() {
       installPullToRefreshBlocker(self);
-      installGlobalClickListenerForDoc(ampdoc);
 
       maybeValidate(self);
       makeBodyVisible(self.document, /* waitForServices */ true);

diff --git a/src/document-click.js b/src/document-click.js
diff --git a/src/inabox/amp-inabox.js b/src/inabox/amp-inabox.js
@@ -28,7 +28,6 @@ import {
   performanceFor,
 } from '../service/performance-impl';
 import {installPullToRefreshBlocker} from '../pull-to-refresh';
-import {installGlobalClickListenerForDoc} from '../document-click';
 import {installStyles, makeBodyVisible} from '../style-installer';
 import {installErrorReporting} from '../error';
 import {installDocService} from '../service/ampdoc-impl';
@@ -111,7 +110,6 @@ startupChunk(self.document, function initial() {
     });
     startupChunk(self.document, function final() {
       installPullToRefreshBlocker(self);
-      installGlobalClickListenerForDoc(ampdoc);
       installAnchorClickInterceptor(ampdoc, self);
 
       maybeValidate(self);

diff --git a/src/runtime.js b/src/runtime.js
@@ -51,6 +51,7 @@ import {
 import {installActionServiceForDoc} from './service/action-impl';
 import {installCryptoService} from './service/crypto-impl';
 import {installDocumentInfoServiceForDoc} from './service/document-info-impl';
+import {installGlobalClickListenerForDoc} from './service/document-click';
 import {installGlobalSubmitListenerForDoc} from './document-submit';
 import {extensionsFor} from './services';
 import {installHistoryServiceForDoc} from './service/history-impl';
@@ -145,6 +146,7 @@ export function installAmpdocServices(ampdoc, opt_initParams) {
   installActionServiceForDoc(ampdoc);
   installStandardActionsForDoc(ampdoc);
   installStorageServiceForDoc(ampdoc);
+  installGlobalClickListenerForDoc(ampdoc);
   installGlobalSubmitListenerForDoc(ampdoc);
 }