Merge remote-tracking branch 'upstream/master' into fix_sandbox_url · dpinder/JavaScriptButtons@5d57a4e · GitHub

dpinder / JavaScriptButtons Public

forked from jbillimoria/JavaScriptButtons

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 5d57a4e

Browse filesBrowse the repository at this point in the historyBrowse files

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
Copy full SHA for 5d57a4e

5 files changed

+15-12Lines changed: 15 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• dist
  • paypal-button-minicart.js
  • paypal-button-minicart.min.js
  • paypal-button.js
  • paypal-button.min.js
• src
  • paypal-button.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎dist/paypal-button-minicart.js‎

Copy file name to clipboardExpand all lines: dist/paypal-button-minicart.js

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -1,7 +1,7 @@
1	1	/*!
2	2	* PayPalJSButtons
3	3	* JavaScript integration for PayPal's payment buttons
4		- * @version 1.0.1 - 2013-04-28
	4	+ * @version 1.0.1 - 2013-05-07
5	5	* @author Jeff Harrell <https://github.com/jeffharrell/>
6	6	*/
7	7	/*!
@@ -2013,8 +2013,10 @@ PAYPAL.apps = PAYPAL.apps || {};
2013	2013	* @return {HTMLElement}
2014	2014	*/
2015	2015	function buildQR(data, size) {
	2016	+ var baseUrl = paypalURL.replace('{env}', data.items.env.value);
	2017	+
2016	2018	var img = document.createElement('img'),
2017		- url = paypalURL + '?',
	2019	+ url = baseUrl + '?',
2018	2020	pattern = 13,
2019	2021	items = data.items,
2020	2022	item, key;
@@ -2029,7 +2031,6 @@ PAYPAL.apps = PAYPAL.apps || {};
2029	2031
2030	2032	url = encodeURIComponent(url);
2031	2033	img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
2032		-
2033	2034	return img;
2034	2035	}
2035	2036

Collapse file

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

Copy file name to clipboardExpand all lines: dist/paypal-button-minicart.min.js

+2-2Lines changed: 2 additions & 2 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

‎dist/paypal-button.js‎

Copy file name to clipboardExpand all lines: dist/paypal-button.js

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -1,7 +1,7 @@
1	1	/*!
2	2	* PayPalJSButtons
3	3	* JavaScript integration for PayPal's payment buttons
4		- * @version 1.0.1 - 2013-04-28
	4	+ * @version 1.0.1 - 2013-05-07
5	5	* @author Jeff Harrell <https://github.com/jeffharrell/>
6	6	*/
7	7	if (typeof PAYPAL === 'undefined' || !PAYPAL) {
@@ -280,8 +280,10 @@ PAYPAL.apps = PAYPAL.apps || {};
280	280	* @return {HTMLElement}
281	281	*/
282	282	function buildQR(data, size) {
	283	+ var baseUrl = paypalURL.replace('{env}', data.items.env.value);
	284	+
283	285	var img = document.createElement('img'),
284		- url = paypalURL + '?',
	286	+ url = baseUrl + '?',
285	287	pattern = 13,
286	288	items = data.items,
287	289	item, key;
@@ -296,7 +298,6 @@ PAYPAL.apps = PAYPAL.apps || {};
296	298
297	299	url = encodeURIComponent(url);
298	300	img.src = qrCodeURL.replace('{env}', data.items.env.value).replace('{url}', url).replace('{pattern}', pattern).replace('{size}', size);
299		-
300	301	return img;
301	302	}
302	303

0 commit comments

Comments

0 (0)