Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 12:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 969564 - Fix payments webapprt regression. r=ferjm

Browse Source
This commit is contained in:
Marco Castelluccio 2014-02-10 08:48:55 -05:00
parent d7d60b44e6
commit 106bbee041
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/components/PaymentsUI.js
View File

@ -80,13 +80,13 @@ PaymentUI.prototype = {
// If there's only one payment provider that will work, just move on without prompting the user.
if (aRequests.length == 1) {
aSuccessCb.onresult(aRequestId, aRequests[0].wrappedJSObject.type);
aSuccessCb.onresult(aRequestId, aRequests[0].type);
return;
}
// Otherwise, let the user select a payment provider from a list.
for (let i = 0; i < aRequests.length; i++) {
let request = aRequests[i].wrappedJSObject;
let request = aRequests[i];
let requestText = request.providerName;
if (request.productPrice) {
requestText += " (" + request.productPrice[0].amount + " " +
@ -100,7 +100,7 @@ PaymentUI.prototype = {
title: this.bundle.GetStringFromName("payments.providerdialog.title"),
}).setSingleChoiceItems(listItems).show(function(data) {
if (data.button > -1 && aSuccessCb) {
aSuccessCb.onresult(aRequestId, aRequests[data.button].wrappedJSObject.type);
aSuccessCb.onresult(aRequestId, aRequests[data.button].type);
} else {
_error(aRequestId, "USER_CANCELED");
}

6
webapprt/PaymentUIGlue.js
View File

@ -52,7 +52,7 @@ PaymentUI.prototype = {
// If there's only one payment provider that will work, just move on
// without prompting the user.
if (aRequests.length == 1) {
aSuccessCb.onresult(aRequestId, aRequests[0].wrappedJSObject.type);
aSuccessCb.onresult(aRequestId, aRequests[0].type);
return;
}
@ -60,7 +60,7 @@ PaymentUI.prototype = {
// Otherwise, let the user select a payment provider from a list.
for (let i = 0; i < aRequests.length; i++) {
let request = aRequests[i].wrappedJSObject;
let request = aRequests[i];
let requestText = request.providerName;
if (request.productPrice && Array.isArray(request.productPrice)) {
// We should guess the user currency and use that instead.
@ -80,7 +80,7 @@ PaymentUI.prototype = {
items.length, items, selected);
if (result) {
aSuccessCb.onresult(aRequestId,
aRequests[selected.value].wrappedJSObject.type);
aRequests[selected.value].type);
} else {
aErrorCb.onresult(aRequestId, "USER_CANCELLED");
}