[MERGE] new fields & field conversions in CMS

bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq

1 files changed, 17 insertions, 3 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index d839252bc58..ffb0f9b86a3 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -160,9 +160,17 @@
                     editables: { text: '*' },
 
                     upcast: function (el) {
-                        return el.attributes['data-oe-type'];
+                        return el.attributes['data-oe-type']
+                            && el.attributes['data-oe-type'] !== 'monetary';
                     },
                 });
+                editor.widgets.add('monetary', {
+                    editables: { text: 'span.oe_currency_value' },
+
+                    upcast: function (el) {
+                        return el.attributes['data-oe-type'] === 'monetary';
+                    }
+                });
             }
         });
 
@@ -345,12 +353,17 @@
             var self = this;
             // setup dirty-marking for each editable element
             this.fetch_editables(root)
-                .prop('contentEditable', true)
                 .addClass('oe_editable')
                 .each(function () {
                     var node = this;
-                    observer.observe(node, OBSERVER_CONFIG);
                     var $node = $(node);
+                    // only explicitly set contenteditable on view sections,
+                    // cke widgets system will do the widgets themselves
+                    if ($node.data('oe-model') === 'ir.ui.view') {
+                        node.contentEditable = true;
+                    }
+
+                    observer.observe(node, OBSERVER_CONFIG);
                     $node.one('content_changed', function () {
                         $node.addClass('oe_dirty');
                         self.trigger('change');
@@ -812,6 +825,7 @@
 
             var style = data.style;
             element.setAttribute('src', data.url);
+            element.removeAttribute('data-cke-saved-src');
             $(element.$).removeClass(this.image_styles.join(' '));
             if (style) { element.addClass(style); }
         },