commit 1058e4e670dd1e305eac29f440a24b9644624574
parent c1159ff547afffd135cde78c026dd35817d2f927
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 6 Nov 2015 00:55:15 +0100
Merge branch 'fix4013'
Conflicts:
src/frontend/index.html
Diffstat:
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/frontend/checkout.php b/src/frontend/checkout.php
@@ -11,7 +11,8 @@
The JavaScript code in this page is free software: you can
redistribute it and/or modify it under the terms of the GNU
- Lesser General Public License (GNU LGPL) as published by the Free Software
+ Lesser General Public License (GNU LGPL) as published by the
+ Free Software
Foundation, either version 3 of the License, or (at your option)
any later version. The code is distributed WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/frontend/index.html b/src/frontend/index.html
@@ -29,7 +29,7 @@
*/
</script>
</head>
-<body id="css-zen-garden">
+<body id="css-zen-garden" onload="signal_me()">
<div class="supporting" id="welcome" role="main">
<div class="explanation" id="zen-explanation" role="article">
<h1>Welcome to the Taler "Toy" Shop</h1>
@@ -143,15 +143,29 @@
b.style.display = 'none';
};
+ /* The merchant signals its taler-friendlyness to the client */
+ function signal_me()
+ {
+ var eve = new Event('taler-checkout-probe');
+ document.body.dispatchEvent(eve);
+ //alert("signaling");
+ };
+
+
+ function test_without_wallet(){
+ wallet_installed_cb();
+ }
+
/* Set up a listener to be called whenever a Wallet gets installed
so that the user is led towards the demo's steps progressively */
- document.body.addEventListener("taler-wallet-installed",
- wallet_installed_cb,
+ document.body.addEventListener("taler-wallet-present",
+ wallet_installed_cb,
false, false);
- /* Setup callback to be called whenever the wallet is uninstalled */
- document.body.addEventListener("taler-unload",
- wallet_uninstalled_cb,
+ /* Setup callback to be called whenever the wallet is loaded/enabled
+ while the browser is already on this page */
+ document.body.addEventListener("taler-load",
+ signal_me,
false);
</script>
</body>
