braintree-web-drop-in
Advanced tools
Comparing version 1.0.1 to 1.0.2
CHANGELOG | ||
========= | ||
1.0.2 | ||
----- | ||
- Add timeout for async dependencies in PayPal | ||
- Record Drop-in version in metadata | ||
1.0.1 | ||
@@ -5,0 +10,0 @@ ----- |
@@ -20,3 +20,3 @@ 'use strict'; | ||
var DEFAULT_CHECKOUTJS_LOG_LEVEL = 'warn'; | ||
var VERSION = "1.0.1"; | ||
var VERSION = "1.0.2"; | ||
@@ -64,5 +64,7 @@ function Dropin(options) { | ||
// Backfill with `en` | ||
strings = assign({}, translations.en); | ||
if (this._merchantConfiguration.locale) { | ||
localizedStrings = translations[this._merchantConfiguration.locale] || translations[this._merchantConfiguration.locale.split('_')[0]]; | ||
// Fill `strings` with `localizedStrings` that may exist | ||
strings = assign(strings, localizedStrings); | ||
@@ -69,0 +71,0 @@ } |
@@ -10,3 +10,3 @@ 'use strict'; | ||
var VERSION = "1.0.1"; | ||
var VERSION = "1.0.2"; | ||
@@ -56,2 +56,3 @@ function create(options, callback) { | ||
configuration.analyticsMetadata.integrationType = constants.INTEGRATION; | ||
configuration.analyticsMetadata.dropinVersion = VERSION; | ||
@@ -58,0 +59,0 @@ clientInstance.getConfiguration = function () { |
{ | ||
"name": "braintree-web-drop-in", | ||
"version": "1.0.1", | ||
"version": "1.0.2", | ||
"main": "index.js", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -19,3 +19,3 @@ # Braintree Web Drop-in | ||
```html | ||
<script src="https://js.braintreegateway.com/web/dropin/1.0.1/js/dropin.min.js"></script> | ||
<script src="https://js.braintreegateway.com/web/dropin/1.0.2/js/dropin.min.js"></script> | ||
``` | ||
@@ -117,3 +117,3 @@ | ||
<script src="https://js.braintreegateway.com/web/dropin/1.0.1/js/dropin.min.js"></script> | ||
<script src="https://js.braintreegateway.com/web/dropin/1.0.2/js/dropin.min.js"></script> | ||
@@ -154,3 +154,3 @@ <script> | ||
de_DE | ||
en | ||
en_US | ||
en_AU | ||
@@ -157,0 +157,0 @@ en_GB |
@@ -7,3 +7,3 @@ /* eslint-disable camelcase */ | ||
de: require('./de_DE'), | ||
en: require('./en'), | ||
en: require('./en_US'), | ||
en_AU: require('./en_AU'), | ||
@@ -10,0 +10,0 @@ en_GB: require('./en_GB'), |
'use strict'; | ||
var assign = require('../../lib/assign').assign; | ||
var BaseView = require('../base-view'); | ||
var assign = require('../../lib/assign').assign; | ||
var btPaypal = require('braintree-web/paypal-checkout'); | ||
var DropinError = require('../../lib/dropin-error'); | ||
var ASYNC_DEPENDENCY_TIMEOUT = 30000; | ||
function BasePayPalView() { | ||
@@ -14,2 +17,3 @@ BaseView.apply(this, arguments); | ||
BasePayPalView.prototype._initialize = function (isCredit) { | ||
var asyncDependencyTimeoutHandler; | ||
var self = this; | ||
@@ -21,2 +25,8 @@ var paypalConfiguration = isCredit ? this.model.merchantConfiguration.paypalCredit : this.model.merchantConfiguration.paypal; | ||
this.model.asyncDependencyStarting(); | ||
asyncDependencyTimeoutHandler = setTimeout(function () { | ||
self.model.asyncDependencyFailed({ | ||
view: self.ID, | ||
error: new DropinError('There was an error connecting to PayPal.') | ||
}); | ||
}, ASYNC_DEPENDENCY_TIMEOUT); | ||
@@ -65,2 +75,3 @@ btPaypal.create({client: this.client}, function (err, paypalInstance) { | ||
self.model.asyncDependencyReady(); | ||
clearTimeout(asyncDependencyTimeoutHandler); | ||
}); | ||
@@ -67,0 +78,0 @@ }); |
172557
2803