Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Defer building system layer until pages have been initialized #11878

Merged
merged 8 commits into from
Nov 1, 2017
Merged

Defer building system layer until pages have been initialized #11878

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0500899
Change progress bar to not handle active page, since active page upda…
newmuis Oct 19, 2017
5731def
Revert "Change progress bar to not handle active page, since active p…
newmuis Oct 19, 2017
f0cfd92
Merge branch 'master' of github.com:ampproject/amphtml
newmuis Oct 20, 2017
58a18bd
Merge branch 'master' of github.com:ampproject/amphtml
newmuis Oct 26, 2017
12b2edc
Merge branch 'master' of github.com:ampproject/amphtml
newmuis Oct 26, 2017
52b815b
Merge branch 'master' of github.com:ampproject/amphtml
newmuis Oct 30, 2017
7a5b811
Merge branch 'master' of github.com:ampproject/amphtml
newmuis Oct 31, 2017
67c7965
Defer building system layer until pages have been initialized.
newmuis Oct 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions extensions/amp-story/0.1/amp-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,6 @@ export class AmpStory extends AMP.BaseElement {
this.lockBody_();
}

this.element.appendChild(
this.systemLayer_.build(this.getRealChildren().length));

this.initializeListeners_();
this.initializeListenersForDev_();

Expand All @@ -193,6 +190,16 @@ export class AmpStory extends AMP.BaseElement {
}


/**
* Builds the system layer DOM. This is dependent on the pages_ array having
* been initialized, so it cannot happen at build time.
* @private
*/
buildSystemLayer_() {
this.element.appendChild(this.systemLayer_.build(this.getPageCount()));
}


/** @private */
initializeListeners_() {
this.element.addEventListener(EventType.EXIT_FULLSCREEN, () => {
Expand Down Expand Up @@ -350,6 +357,7 @@ export class AmpStory extends AMP.BaseElement {
'Story must have at least one page.');

return this.initializePages_()
.then(() => this.buildSystemLayer_())
.then(() => {
this.pages_.forEach(page => {
page.setActive(false);
Expand Down