diff --git a/addons/web/static/lib/novajs/src/nova.js b/addons/web/static/lib/novajs/src/nova.js index a299dad23d3..2a593611165 100644 --- a/addons/web/static/lib/novajs/src/nova.js +++ b/addons/web/static/lib/novajs/src/nova.js @@ -421,14 +421,14 @@ nova = (function() { }, this), target); }, __widgetRenderAndInsert: function(insertion, target) { - this.render_element(); + this.renderElement(); insertion(target); return this.start(); }, /** * This is the method to implement to render the Widget. */ - render_element: function() {}, + renderElement: function() {}, /** * Method called after rendering. Mostly used to bind actions, perform asynchronous * calls, etc... diff --git a/addons/web/static/lib/novajs/test/test.js b/addons/web/static/lib/novajs/test/test.js index 924d085c9ac..60ef8b966e6 100644 --- a/addons/web/static/lib/novajs/test/test.js +++ b/addons/web/static/lib/novajs/test/test.js @@ -104,7 +104,7 @@ module("Widget"); test("base", function() { var Claz = nova.Widget.extend({ - render_element: function() { + renderElement: function() { this.$element.attr("id", "testdiv"); this.$element.html("test"); } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index de3275f3230..c019d59e7e1 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -864,7 +864,7 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ }, on_loaded: function(data) { this.data = data; - this.render_element(); + this.renderElement(); if (!this.$secondary_menu && this.getParent()) { // TODO: create Widget openerp.web.SubMenu this.$secondary_menu = this.getParent().$element.find('.oe_secondary_menu'); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index bbfac551c5d..fe2ca1beb4f 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -881,7 +881,7 @@ openerp.web.Widget = nova.Widget.extend(_.extend({}, openerp.web.CallbackEnabled * `this.template` must be defined. The context given to QWeb contains the "widget" * key that references `this`. */ - render_element: function() { + renderElement: function() { var rendered = null; if (this.template) rendered = openerp.web.qweb.render(this.template, {widget: this}); @@ -939,7 +939,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({ var tmp = document.getElementById(this.element_id); this.$element = tmp ? $(tmp) : $(document.createElement(this.tagName)); }, - render_element: function() { + renderElement: function() { var rendered = this.render(); if (rendered) { var elem = $(rendered); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 17b9849cd42..78626f69d8a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -936,7 +936,7 @@ openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.fo update_dom: function() { this.$element.toggle(!this.invisible); }, - render_element: function() { + renderElement: function() { this.$element.html(QWeb.render(this.form_template, { "widget": this })); }, do_attach_tooltip: function(widget, trigger, options) { @@ -1030,13 +1030,13 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({ } this.set_row_cells_with(this.table[this.table.length - 1]); }, - render_element: function() { + renderElement: function() { this._super(); var self = this; _.each(this.table, function(row) { _.each(row, function(td) { td.$element = self.$element.find('.' + td.element_class); - td.render_element(); + td.renderElement(); }); }); }, @@ -1140,12 +1140,12 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({ } } }, - render_element: function() { + renderElement: function() { this._super(); var self = this; _.each(this.pages, function(page) { page.$element = self.$element.find('.' + page.element_class); - page.render_element(); + page.renderElement(); }); }, start: function() { @@ -1335,7 +1335,7 @@ openerp.web.form.WidgetLabel = openerp.web.form.Widget.extend({ this.nowrap = true; } }, - render_element: function() { + renderElement: function() { var rendered; if (this['for'] && this.type !== 'label') { rendered = QWeb.render(this.form_template, {widget: this['for']}); @@ -2819,7 +2819,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope }, read_function: null}); this.initial_ids = this.options.initial_ids; this.created_elements = []; - this.render_element(); + this.renderElement(); openerp.web.form.dialog(this.$element, { close: function() { self.check_exit(); @@ -3028,7 +3028,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp this.row_id = row_id; this.context = context || {}; this.options = _.defaults(options || {}, {"auto_write": true}); - this.render_element(); + this.renderElement(); openerp.web.dialog(this.$element, { title: options.title || '', modal: true, @@ -3150,10 +3150,10 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({ start: function() { this._super(); this.selection.$element = $(".oe_form_view_reference_selection", this.$element); - this.selection.render_element(); + this.selection.renderElement(); this.selection.start(); this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element); - this.m2o.render_element(); + this.m2o.renderElement(); this.m2o.start(); }, is_valid: function() { @@ -3400,7 +3400,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({ }); openerp.web.form.WidgetHtml = openerp.web.form.Widget.extend({ - render_element: function () { + renderElement: function () { var $root = $('