From f17564d49fb8d6d3c938cf8cbd4a25ed7659f64b Mon Sep 17 00:00:00 2001
From: Gusti Tammam <gustitammam@gmail.com>
Date: Fri, 19 Oct 2018 08:00:16 +0700
Subject: [PATCH] [MIG] web_m2x_options: Migration to 12.0

---
 web_m2x_options/README.rst            | 10 +++++-----
 web_m2x_options/__manifest__.py       |  7 +++++--
 web_m2x_options/static/src/js/form.js |  5 ++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/web_m2x_options/README.rst b/web_m2x_options/README.rst
index a0e129d4..04ba43db 100644
--- a/web_m2x_options/README.rst
+++ b/web_m2x_options/README.rst
@@ -14,13 +14,13 @@ web_m2x_options
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
-    :target: https://github.com/OCA/web/tree/11.0/web_m2x_options
+    :target: https://github.com/OCA/web/tree/12.0/web_m2x_options
     :alt: OCA/web
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_m2x_options
+    :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_m2x_options
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/162/11.0
+    :target: https://runbot.odoo-community.org/runbot/162/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -149,7 +149,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_m2x_options%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_m2x_options%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -191,6 +191,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/web <https://github.com/OCA/web/tree/11.0/web_m2x_options>`_ project on GitHub.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/12.0/web_m2x_options>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/web_m2x_options/__manifest__.py b/web_m2x_options/__manifest__.py
index 04b0986e..a9e0e5cc 100644
--- a/web_m2x_options/__manifest__.py
+++ b/web_m2x_options/__manifest__.py
@@ -1,7 +1,11 @@
+# Copyright 2015 0k.io
+# Copyright 2016 ACSONE SA/NV
+# Copyright 2017 Tecnativa
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     "name": 'web_m2x_options',
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     'category': 'Web',
     "author": "ACSONE SA/NV, "
               "0k.io, "
@@ -10,7 +14,6 @@
     'website': 'https://github.com/OCA/web',
     'license': 'AGPL-3',
     "depends": [
-        'base',
         'web',
     ],
     'data': [
diff --git a/web_m2x_options/static/src/js/form.js b/web_m2x_options/static/src/js/form.js
index 32a632c5..c0f57463 100644
--- a/web_m2x_options/static/src/js/form.js
+++ b/web_m2x_options/static/src/js/form.js
@@ -353,7 +353,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
                 }
             }
         },
-    })
+    });
 
     FormFieldMany2ManyTags.include({
         events: _.extend({}, FormFieldMany2ManyTags.prototype.events, {
@@ -368,6 +368,9 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
             this._super.apply(this, arguments);
             if (!open && !no_color_picker) {
                 this._onOpenColorPicker(event);
+            } else {
+                event.preventDefault();
+                event.stopPropagation();
             }
         },
     });