From b93a4e7343c1ffefaa1edb42693bedb1b506872c Mon Sep 17 00:00:00 2001
From: Fabien Bourgeois <fabien@yaltik.com>
Date: Wed, 7 Jun 2017 09:49:20 +0200
Subject: [PATCH] [FIX][MIG]Fix PhoneFR widget for v10

---
 .../src/js/web_widget_phone_check_fr.js       | 17 +++++++----
 .../static/src/xml/qweb.xml                   | 28 ++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/web_widget_phone_check_fr/static/src/js/web_widget_phone_check_fr.js b/web_widget_phone_check_fr/static/src/js/web_widget_phone_check_fr.js
index 41165e2..6bead89 100644
--- a/web_widget_phone_check_fr/static/src/js/web_widget_phone_check_fr.js
+++ b/web_widget_phone_check_fr/static/src/js/web_widget_phone_check_fr.js
@@ -28,13 +28,16 @@ odoo.define('web.web_widget_phone_check', function(require) {
   var FieldPhoneFr = widget.FieldChar.extend({
       template: 'FieldPhoneFr',
       is_syntax_valid: function () {
-        var val = this.$('input').val() || '';
-        return ((val.length === 0) || rePhone.test(val));
+        if (this.$input) {
+          var val = this.$input.val() || '';
+          return ((val.length === 0) || rePhone.test(val));
+        } else {
+          return true;
+        }
       },
       render_value: function() {
-        if (!this.get('effective_readonly')) {
-          this._super();
-        } else {
+        this._super();
+        if (this.get('effective_readonly')) {
           var val = this.get('value') || '';
           this.$el.find('a').attr('href', 'tel:' + val).text(val);
         }
@@ -42,4 +45,8 @@ odoo.define('web.web_widget_phone_check', function(require) {
     });
 
   core.form_widget_registry.add('phonefr', FieldPhoneFr);
+
+  return {
+    FieldPhoneFr: FieldPhoneFr
+  };
 });
diff --git a/web_widget_phone_check_fr/static/src/xml/qweb.xml b/web_widget_phone_check_fr/static/src/xml/qweb.xml
index 8f1afc0..ec990bb 100644
--- a/web_widget_phone_check_fr/static/src/xml/qweb.xml
+++ b/web_widget_phone_check_fr/static/src/xml/qweb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -18,21 +18,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <templates>
   <t t-name="FieldPhoneFr">
-    <span class="oe_form_field oe_form_field_email"
-      t-att-style="widget.node.attrs.style">
-      <a t-if="widget.get('effective_readonly')" href="#"
-        class="oe_form_uri" target="_blank"/>
-          <t t-if="!widget.get('effective_readonly')">
-              <div>
-                  <input type="text"
-                      t-att-id="widget.id_for_label"
-                      t-att-tabindex="widget.node.attrs.tabindex"
-                      t-att-autofocus="widget.node.attrs.autofocus"
-                      t-att-placeholder="widget.node.attrs.placeholder"
-                      t-att-maxlength="widget.field.size"
-                  />
-              </div>
-          </t>
-      </span>
+      <t t-if="widget.get('effective_readonly')">
+        <a t-if="widget.clickable" class="o_form_uri o_text_overflow" href="#" target="_blank"/>
+        <span t-if="!widget.clickable" class="o_text_overflow"/>
+      </t>
+      <input t-if="!widget.get('effective_readonly')" class="o_form_input" type="text"
+            t-att-id="widget.id_for_label"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-placeholder="widget.node.attrs.placeholder"
+            t-att-maxlength="widget.field.size" />
   </t>
 </templates>