Skip to content

Commit 5d57a4e

Browse files
author
Cristiano Betta
committed
Merge remote-tracking branch 'upstream/master' into fix_sandbox_url
Conflicts: dist/paypal-button-minicart.js dist/paypal-button-minicart.min.js dist/paypal-button.js dist/paypal-button.min.js
2 parents 41a4a1d + a53a64e commit 5d57a4e

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

‎dist/paypal-button-minicart.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* PayPalJSButtons
33
* JavaScript integration for PayPal's payment buttons
4-
* @version 1.0.1 - 2013-04-28
4+
* @version 1.0.1 - 2013-05-07
55
* @author Jeff Harrell <https://github.com/jeffharrell/>
66
*/
77
/*!
@@ -2013,8 +2013,10 @@ PAYPAL.apps = PAYPAL.apps || {};
20132013
* @return {HTMLElement}
20142014
*/
20152015
function buildQR(data, size) {
2016+
var baseUrl = paypalURL.replace('{env}', data.items.env.value);
2017+
20162018
var img = document.createElement('img'),
2017-
url = paypalURL + '?',
2019+
url = baseUrl + '?',
20182020
pattern = 13,
20192021
items = data.items,
20202022
item, key;
@@ -2029,7 +2031,6 @@ PAYPAL.apps = PAYPAL.apps || {};
20292031

20302032
url = encodeURIComponent(url);
20312033
img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
2032-
20332034
return img;
20342035
}
20352036

‎dist/paypal-button-minicart.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/paypal-button.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* PayPalJSButtons
33
* JavaScript integration for PayPal's payment buttons
4-
* @version 1.0.1 - 2013-04-28
4+
* @version 1.0.1 - 2013-05-07
55
* @author Jeff Harrell <https://github.com/jeffharrell/>
66
*/
77
if (typeof PAYPAL === 'undefined' || !PAYPAL) {
@@ -280,8 +280,10 @@ PAYPAL.apps = PAYPAL.apps || {};
280280
* @return {HTMLElement}
281281
*/
282282
function buildQR(data, size) {
283+
var baseUrl = paypalURL.replace('{env}', data.items.env.value);
284+
283285
var img = document.createElement('img'),
284-
url = paypalURL + '?',
286+
url = baseUrl + '?',
285287
pattern = 13,
286288
items = data.items,
287289
item, key;
@@ -296,7 +298,6 @@ PAYPAL.apps = PAYPAL.apps || {};
296298

297299
url = encodeURIComponent(url);
298300
img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
299-
300301
return img;
301302
}
302303

0 commit comments

Comments
 (0)