Skip to content

Commit

Permalink
Do not install extensions twice in multidoc (#33084)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dima Voytenko committed Mar 5, 2021
1 parent e0f71d2 commit 3406bf2
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions src/multidoc-manager.js
Expand Up @@ -238,8 +238,7 @@ export class MultidocManager {
opt_initParams,
(amp, shadowRoot, ampdoc) => {
// Install extensions.
const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
this.mergeShadowHead_(ampdoc, shadowRoot, doc);

// Append body.
if (doc.body) {
Expand Down Expand Up @@ -284,9 +283,7 @@ export class MultidocManager {
amp['writer'] = writer;
writer.onBody((doc) => {
// Install extensions.
const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
// Apply all doc extensions.
this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
this.mergeShadowHead_(ampdoc, shadowRoot, doc);

// Append shallow body.
const body = importShadowBody(
Expand Down Expand Up @@ -326,11 +323,9 @@ export class MultidocManager {
* @param {!./service/ampdoc-impl.AmpDoc} ampdoc
* @param {!ShadowRoot} shadowRoot
* @param {!Document} doc
* @return {!Array<string>}
* @private
*/
mergeShadowHead_(ampdoc, shadowRoot, doc) {
const extensionIds = [];
if (doc.head) {
shadowRoot.AMP.head = doc.head;
const parentLinks = {};
Expand Down Expand Up @@ -444,9 +439,6 @@ export class MultidocManager {
extensionId,
urlParts.extensionVersion
);
if (customElement) {
extensionIds.push(customElement);
}
} else if (!n.hasAttribute('data-amp-report-test')) {
user().error(TAG, '- unknown script: ', n, src);
}
Expand All @@ -471,7 +463,6 @@ export class MultidocManager {
}
}
}
return extensionIds;
}

/**
Expand Down

0 comments on commit 3406bf2

Please sign in to comment.