From c9e8105b7092ced8fa27663770d7201d2a60cf72 Mon Sep 17 00:00:00 2001 From: Dmitry Fedyuk Date: Mon, 16 Oct 2017 19:15:38 +0300 Subject: [PATCH] 2.0.3 --- composer.json | 2 +- view/frontend/web/main.js | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c12312b..ccf2d79 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "mage2pro/square" - ,"version": "2.0.2" + ,"version": "2.0.3" ,"description": "The «Square» payment extension for Magento 2." ,"type": "magento2-module" ,"homepage": "https://mage2.pro/c/extensions/square" diff --git a/view/frontend/web/main.js b/view/frontend/web/main.js index 7e5912f..31f3680 100644 --- a/view/frontend/web/main.js +++ b/view/frontend/web/main.js @@ -57,9 +57,17 @@ return parent.extend({ });}, /** * 2016-09-28 https://mage2.pro/t/1936 + * 2017-10-16 + * Magento <= 2.1.0 calls an `afterRender` handler outside of the `this` context. + * It passes `this` to an `afterRender` handler as the second argument: + * https://github.com/magento/magento2/blob/2.0.9/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/after-render.js#L19 + * Magento >= 2.1.0 calls an `afterRender` handler within the `this` context: + * https://github.com/magento/magento2/blob/2.1.0/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/after-render.js#L20 * @used-by Dfe_Square/atTheEnd.html + * @param {HTMLElement} element + * @param {Object} _this */ - dfOnRender: _.after(2, function() { + dfOnRender: _.after(2, function(element, _this) {$.proxy(function() { // 2017-10-06 // `SqPaymentForm` parameters: // https://docs.connect.squareup.com/articles/adding-payment-form#sqpaymentformparameters @@ -243,7 +251,7 @@ return parent.extend({ */ ,paymentFormLoaded: $.proxy(function() { /** @type {?String} */ var postalCode = null; - /** @type {?Object} */ var a; + /** @type {?Object} */ var a; if (a = dfc.addressB()) { postalCode = a.postcode; } @@ -377,7 +385,7 @@ return parent.extend({ * https://docs.connect.squareup.com/articles/adding-payment-form#generatingpaymentform */ this.square.build(); - }), + }, _this)()}), /** * 2016-09-28 * 2017-02-05 The bank card network codes: https://mage2.pro/t/2647