Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Masq: add modal while activating Masq #201

Merged
merged 2 commits into from
May 15, 2019
Merged

Conversation

sujeebant
Copy link
Contributor

No description provided.

@sujeebant sujeebant force-pushed the masq-activation-modal branch from fec4149 to a0a275c Compare May 14, 2019 14:31
@sujeebant sujeebant requested a review from amatissart May 15, 2019 09:12

this.modal = new Modal(this, MasqActivatingModalView, false)

this.opened = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this flag is not used. And as this.activating is true by default, the modal and the video are present in DOM at app start. (Chromium at least tries to load the .mp4 before it is visible)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed !
removed opened flag and made activating false by default

<div class="modal__masq_activating__body">
{{? this.activating}}
<div class="modal__masq_activating__animation">
<video autoplay loop src="{{= window.location.origin }}/statics/images/masq/gifs/masq_loading.mp4"></video>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using "origin" is incorrect here: the "baseUrl" ( /maps/...) is missing.
Actually an absolute path can directly be used in templates, since a <base> tag is defined in the html head:

Suggested change
<video autoplay loop src="{{= window.location.origin }}/statics/images/masq/gifs/masq_loading.mp4"></video>
<video autoplay loop src="/statics/images/masq/gifs/masq_loading.mp4"></video>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@sujeebant sujeebant force-pushed the masq-activation-modal branch from a0a275c to 4018f0b Compare May 15, 2019 10:06
@sujeebant sujeebant force-pushed the masq-activation-modal branch from 4018f0b to 3fb5a2d Compare May 15, 2019 10:14
@sujeebant sujeebant requested a review from amatissart May 15, 2019 10:17
@amatissart amatissart merged commit c96d937 into master May 15, 2019
@amatissart amatissart deleted the masq-activation-modal branch May 23, 2019 12:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants