summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-10-23 13:12:19 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-10-23 13:12:19 +0200
commitce642426bbdf32bde728f1daa36ef2c4ecf5d94d (patch)
treea8aa94405c394e1f6de8d7d1bee07ea29a4757d4
parent7bd7330afaf05a3ff535dbf0437d6f3ae321373a (diff)
downloadmerchant-ce642426bbdf32bde728f1daa36ef2c4ecf5d94d.tar.gz
merchant-ce642426bbdf32bde728f1daa36ef2c4ecf5d94d.tar.bz2
merchant-ce642426bbdf32bde728f1daa36ef2c4ecf5d94d.zip
renaming events matching the revised API
-rw-r--r--src/frontend/checkout.php25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/frontend/checkout.php b/src/frontend/checkout.php
index 0e06922a..9b64b109 100644
--- a/src/frontend/checkout.php
+++ b/src/frontend/checkout.php
@@ -146,11 +146,6 @@ function has_taler_wallet_cb(aEvent)
var tbutton = document.getElementById("taler-radio-button-id");
tbutton.removeAttribute("disabled");
- if (aEvent.type == "taler-wallet-wfirst"){
- var eve = new Event('taler-payment-wfirst');
- document.body.dispatchEvent(eve);
- }
-
};
/* Function called when the Taler extension was unloaded,
@@ -164,11 +159,11 @@ function taler_wallet_unload_cb(aEvent)
/* The merchant signals its taler-friendlyness to the client */
function signal_me()
{
- var eve = new Event('taler-payment-mfirst');
+ var eve = new Event('taler-checkout-probe');
document.body.dispatchEvent(eve);
+ //alert("signaling");
};
-
function test_without_wallet(){
var tbutton = document.getElementById("taler-radio-button-id");
tbutton.removeAttribute("disabled");
@@ -178,13 +173,15 @@ test_without_wallet();
// Register event to be triggered by the wallet as a response to our
// first event
-document.body.addEventListener("taler-wallet-mfirst", has_taler_wallet_cb, false);
+document.body.addEventListener("taler-wallet-present",
+ has_taler_wallet_cb,
+ false);
// The following callback is used to allow the button to change its
// color whenever the user navigates away from this page
-document.body.addEventListener("taler-shutdown",
+document.body.addEventListener("taler-navigating-away",
function(){
- var unloadEvent = new Event('taler-unload');
+ var unloadEvent = new Event('taler-checkout-away');
document.body.dispatchEvent(unloadEvent);
},
false);
@@ -196,10 +193,14 @@ document.body.addEventListener("taler-shutdown",
// Register event to be triggered by the wallet when it gets enabled while
// the user is on the payment page
-document.body.addEventListener("taler-wallet-wfirst", has_taler_wallet_cb, false);
+document.body.addEventListener("taler-load",
+ signal_me,
+ false);
// Register event to be triggered by the wallet when it is unloaded
-document.body.addEventListener("taler-unload", taler_wallet_unload_cb, false);
+document.body.addEventListener("taler-unload",
+ taler_wallet_unload_cb,
+ false);
</script>
</body>