Skip to content

Simplifying functional event handling #305

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

Closed
jakearchibald wants to merge 1 commit into from
Closed

Simplifying functional event handling #305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
158 changes: 85 additions & 73 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,33 +967,47 @@ <h2>
</li>
<li>If <var>registration</var> is not found, terminate these steps.
</li>
<li>Invoke the <a>handle functional event</a> algorithm with a
<a>ServiceWorkerRegistration</a> of <var>registration</var> and <var>
callbackSteps</var> set to the following steps:
<ol>
<li>Set <var>global</var> to the global object that was provided
as an argument.
</li>
<li>Create a <a>trusted event</a>, <var>e</var>, that uses the
<a>CanMakePaymentEvent</a> interface, with the event type
canmakepayment, which does not bubble, cannot be canceled, and
has no default action.
</li>
<li>Set the <a data-lt=
"PaymentRequestEvent.topOrigin">topOrigin</a>,
<a data-lt=
"PaymentRequestEvent.paymentRequestOrigin">paymentRequestOrigin</a>,
<a data-lt="PaymentRequestEvent.methodData">methodData</a>, and
<a data-lt="PaymentRequestEvent.modifiers">modifiers</a>
attributes of <var>e</var> the same way as when handling
<a>PaymentRequestEvent</a>.
</li>
<li>Dispatch <var>e</var> to <var>global</var>.
</li>
<li>Wait for all of the promises in the <a>extend lifetime
promises</a> of <var>e</var> to resolve.
</li>
</ol>
<li>
<p>
<a>Fire Functional Event</a> "<code>canmakepayment</code>" using
<a>CanMakePaymentEvent</a> on <var>registration</var> with the
following properties:
</p>
<dl>
<dt><a data-lt="PaymentRequestEvent.topOrigin">topOrigin</a></dt>
<dd><a data-cite=
"!HTML#ascii-serialisation-of-an-origin">the serialization of the
origin</a> of the top level payee web page.</dd>
<dt><a data-lt=
"PaymentRequestEvent.paymentRequestOrigin">paymentRequestOrigin</a>
</dt>
<dd><a data-cite=
"!HTML#ascii-serialisation-of-an-origin">the serialization of the
origin</a> of the context where PaymentRequest was initialized.
</dd>
<dt><a data-lt=
"PaymentRequestEvent.paymentRequestId">paymentRequestId</a></dt>
<dd>The [[\details]].<a>id</a> from the <a>PaymentRequest</a></dd>
Copy link
Copy Markdown
Collaborator

@rsolomakhin rsolomakhin Sep 7, 2018

Choose a reason for hiding this comment

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

Bad merge: please remove paymentRequestId from CanMakePaymentEvent.

<dt><a data-lt="PaymentRequestEvent.methodData">methodData</a>
</dt>
<dd>The result of executing the <a>MethodData Population
Algorithm</a></dd>
<dt><a data-lt="PaymentRequestEvent.modifiers">modifiers</a>
Copy link
Copy Markdown
Collaborator

@rsolomakhin rsolomakhin Sep 7, 2018

Choose a reason for hiding this comment

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

Bad merge: please remove modifiers from CanMakePaymentEvent.

</dt>
<dd>The result of executing the <a>Modifiers Population
Algorithm</a></dd>
<dt><a data-lt="PaymentRequestEvent.total">total</a>
Copy link
Copy Markdown
Collaborator

@rsolomakhin rsolomakhin Sep 7, 2018

Choose a reason for hiding this comment

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

Bad merge: please remove total from CanMakePaymentEvent.

</dt>
<dd>A <a>structured clone</a> of the total field on the
<a>PaymentDetailsInit</a> from the corresponding
<a>PaymentRequest</a>.</dd>
<dt><a data-lt=
Copy link
Copy Markdown
Collaborator

@rsolomakhin rsolomakhin Sep 7, 2018

Choose a reason for hiding this comment

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

Bad merge: please remove instrumentKey from CanMakePaymentEvent.

"PaymentRequestEvent.instrumentKey">instrumentKey</a>
</dt>
<dd>The <a>instrumentKey</a> of the selected
<a>PaymentInstrument</a>, or the empty string if none was
selected.</dd>
</dl>
</li>
</ol>
</section>
Expand Down Expand Up @@ -1500,56 +1514,54 @@ <h2>
"<a>InvalidStateError</a>" <a>DOMException</a> and terminate these
steps.
</li>
<li>Invoke the <a>handle functional event</a> algorithm with a
<a>ServiceWorkerRegistration</a> of <var>registration</var> and <var>
callbackSteps</var> set to the following steps:
<ol>
<li>Set <var>global</var> to the global object that was provided
as an argument.
</li>
<li>Create a <a>trusted event</a>, <var>e</var>, that uses the
<a>PaymentRequestEvent</a> interface, with the event type
<a>paymentrequest</a>, which does not bubble, cannot be canceled,
and has no default action.
</li>
<li>Set the <a data-lt=
"PaymentRequestEvent.topOrigin">topOrigin</a> attribute
of <var>e</var> to <a data-cite=
<li>
<p>
<a>Fire Functional Event</a> "<code>paymentrequest</code>" using
<a>PaymentRequestEvent</a> on <var>registration</var> with the
following properties:
</p>
<dl>
<dt><a data-lt="PaymentRequestEvent.topOrigin">topOrigin</a></dt>
<dd><a data-cite=
"!HTML#ascii-serialisation-of-an-origin">the serialization of the
origin</a> of the top level payee web page.
</li>
<li>Set the <a data-lt=
origin</a> of the top level payee web page.</dd>
<dt><a data-lt=
"PaymentRequestEvent.paymentRequestOrigin">paymentRequestOrigin</a>
attribute of <var>e</var> to <a data-cite=
</dt>
<dd><a data-cite=
"!HTML#ascii-serialisation-of-an-origin">the serialization of the
origin</a> of the context where PaymentRequest was initialized.
</li>
<li>Set the <a data-lt=
"PaymentRequestEvent.paymentRequestId">paymentRequestId</a>
attribute of <var>e</var> to the [[\details]].<a>id</a> from the
<a>PaymentRequest</a>.
</li>
<li>Set the <a data-lt=
"PaymentRequestEvent.methodData">methodData</a> and <a data-lt=
"PaymentRequestEvent.modifiers">modifiers</a> attributes of <var>
e</var> by executing the <a>MethodData Population Algorithm</a>
and <a>Modifiers Population Algorithm</a> respectively.
</li>
<li>Set the <a data-lt="PaymentRequestEvent.total">total</a>
attribute of <var>e</var> to a <a>structured clone</a> of the
total field on the <a>PaymentDetailsInit</a> from the
corresponding <a>PaymentRequest</a>.
</li>
<li>Set the <a data-lt=
"PaymentRequestEvent.instrumentKey">instrumentKey</a> attribute
of <var>e</var> to the <a>instrumentKey</a> of the selected
</dd>
<dt><a data-lt=
"PaymentRequestEvent.paymentRequestId">paymentRequestId</a></dt>
<dd>The [[\details]].<a>id</a> from the <a>PaymentRequest</a></dd>
<dt><a data-lt="PaymentRequestEvent.methodData">methodData</a>
</dt>
<dd>The result of executing the <a>MethodData Population
Algorithm</a></dd>
<dt><a data-lt="PaymentRequestEvent.modifiers">modifiers</a>
</dt>
<dd>The result of executing the <a>Modifiers Population
Algorithm</a></dd>
<dt><a data-lt="PaymentRequestEvent.total">total</a>
</dt>
<dd>A <a>structured clone</a> of the total field on the
<a>PaymentDetailsInit</a> from the corresponding
<a>PaymentRequest</a>.</dd>
<dt><a data-lt=
"PaymentRequestEvent.instrumentKey">instrumentKey</a>
</dt>
<dd>The <a>instrumentKey</a> of the selected
<a>PaymentInstrument</a>, or the empty string if none was
selected.
</li>
<li>Dispatch <var>e</var> to <var>global</var>.
</li>
selected.</dd>
</dl>
<p>
Then run the following steps in parallel, with
<var>dispatchedEvent</var>:
</p>
<ol>
<li>Wait for all of the promises in the <a>extend lifetime
promises</a> of <var>e</var> to resolve.
promises</a> of <var>dispatchedEvent</var> to resolve.
</li>
<li>If the <a>payment handler</a> has not provided a
<a>PaymentHandlerResponse</a>, reject the <a>Promise</a> that was
Expand Down Expand Up @@ -2268,8 +2280,8 @@ <h2>
<code><dfn data-cite=
"!SERVICE-WORKERS#service-worker-global-scope">ServiceWorkerGlobalScope</dfn></code>,
<dfn data-cite=
"!SERVICE-WORKERS#handle-functional-event-algorithm">handle
functional event</dfn>, <dfn data-cite=
"!SERVICE-WORKERS#fire-functional-event-algorithm">fire functional
event</dfn>, <dfn data-cite=
"!SERVICE-WORKERS#dfn-extend-lifetime-promises">extend lifetime
promises</dfn>,<dfn data-cite=
"!SERVICE-WORKERS#dfn-pending-promises-count">pending promises
Expand Down