From 43d133d504594b4019f8a49be25a73ca02e78d1a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Mon, 3 Jun 2019 19:06:03 +0200
Subject: [PATCH] [FIX] *: correct some javascript errors

Oversight of previous forward-port.
---
 addons/payment/static/src/js/payment_processing.js            | 2 +-
 .../static/src/js/product_configurator_modal.js               | 4 ++--
 addons/web/static/tests/views/calendar_tests.js               | 2 +-
 addons/web/static/tests/views/form_tests.js                   | 2 +-
 addons/website_sale/static/src/js/website_sale.js             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/payment/static/src/js/payment_processing.js b/addons/payment/static/src/js/payment_processing.js
index 73af1a344bb..f419ca2f5fc 100644
--- a/addons/payment/static/src/js/payment_processing.js
+++ b/addons/payment/static/src/js/payment_processing.js
@@ -70,7 +70,7 @@ odoo.define('payment.processing', function (require) {
                 self.displayContent("payment.rpc_error", {});
                 self.startPolling();
             });
-        },g
+        },
         processPolledData: function (transactions) {
             var render_values = {
                 'tx_draft': [],
diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
index cac81164161..5b5530452fb 100644
--- a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
+++ b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js
@@ -170,7 +170,7 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
                 this._priceToStr(parseFloat(price))
             );
         }
-        ProductConfiguratorMixin.computePriceTotal.apply(this, arguments);
+        VariantMixin.computePriceTotal.apply(this, arguments);
     },
     /**
      * Returns the list of selected products.
@@ -517,4 +517,4 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, {
 
 return OptionalProductsModal;
 
-});
\ No newline at end of file
+});
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index fd7d3b8997d..e217e47f3d1 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -2608,7 +2608,7 @@ QUnit.module('Views', {
     QUnit.test('calendar sidebar toggle', async function (assert) {
         assert.expect(5);
 
-        var calendar = await createView({
+        var calendar = await createCalendarView({
             View: CalendarView,
             model: 'event',
             data: this.data,
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index b4e0f08e529..890c3d1e056 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -8133,7 +8133,7 @@ QUnit.module('Views', {
             form.$('.o_data_row').last(),
             {position: 'bottom'}
         );
-        assert.strictEqual(onchangeNum, 3, "one onchange happens when lines are resequenced")
+        assert.strictEqual(onchangeNum, 3, "one onchange happens when lines are resequenced");
         assert.strictEqual(form.$('[name="foo"]').val(), "1", "onchange worked there is 1 line");
 
         // Add a second line
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 31adbb8a8ee..7c7cfa54805 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -657,7 +657,7 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(VariantMixin, {
      * @override
      */
     _toggleDisable: function ($parent, isCombinationPossible) {
-        ProductConfiguratorMixin._toggleDisable.apply(this, arguments);
+        VariantMixin._toggleDisable.apply(this, arguments);
         $parent.find("#add_to_cart").toggleClass('disabled', !isCombinationPossible);
     },
     /**