From 183b85f750e8911d22d10304ad00c7b5c95e2fcf Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 14 Aug 2012 15:31:07 +0200 Subject: [PATCH 1/3] [IMP] Removed OldWidget in data.js bzr revid: nicolas.vanhoren@openerp.com-20120814133107-prmdonwh6f7gu276 --- addons/web/static/src/js/data.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 2589afe5503..1cdb4a713f1 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -439,7 +439,7 @@ instance.web.data = { }) }; -instance.web.DataGroup = instance.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{ +instance.web.DataGroup = instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataGroup# */{ /** * Management interface between views and grouped collections of OpenERP * records. @@ -451,9 +451,9 @@ instance.web.DataGroup = instance.web.OldWidget.extend( /** @lends openerp.web. * content of the current grouping level. * * @constructs instance.web.DataGroup - * @extends instance.web.OldWidget + * @extends instance.web.CallbackEnabled * - * @param {instance.web.OldWidget} parent widget + * @param {instance.web.CallbackEnabled} parent widget * @param {String} model name of the model managed by this DataGroup * @param {Array} domain search domain for this DataGroup * @param {Object} context context of the DataGroup's searches @@ -524,13 +524,13 @@ instance.web.StaticDataGroup = instance.web.GrouplessDataGroup.extend( /** @lend } }); -instance.web.DataSet = instance.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{ +instance.web.DataSet = instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataSet# */{ /** * DateaManagement interface between views and the collection of selected * OpenERP records (represents the view's state?) * * @constructs instance.web.DataSet - * @extends instance.web.OldWidget + * @extends instance.web.CallbackEnabled * * @param {String} model the OpenERP model this dataset will manage */ From 3ebfaedd64e27de71bf7a39d33b14dd9518680ee Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 14 Aug 2012 15:42:46 +0200 Subject: [PATCH 2/3] [IMP] removed a lot of OldWidget usage bzr revid: nicolas.vanhoren@openerp.com-20120814134246-y2awqbt2i1hcan61 --- addons/web/static/src/js/search.js | 4 ++-- addons/web/static/src/js/view_form.js | 4 ++-- addons/web_kanban/static/src/js/kanban.js | 4 ++-- addons/web_tests/static/src/js/web_tests.js | 2 +- addons/web_view_editor/static/src/js/view_editor.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index d8611b924cf..0e3a5eb0dee 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1737,11 +1737,11 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ } }); -instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{ +instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{ template: 'SearchView.extended_search.proposition', /** * @constructs instance.web.search.ExtendedSearchProposition - * @extends instance.web.OldWidget + * @extends instance.web.Widget * * @param parent * @param fields diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index af8cc791ac2..17574caf90b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2173,7 +2173,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ } }); -instance.web.DateTimeWidget = instance.web.OldWidget.extend({ +instance.web.DateTimeWidget = instance.web.Widget.extend({ template: "web.datepicker", jqueryui_object: 'datetimepicker', type_of_date: "datetime", @@ -4097,7 +4097,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({ /** * Class with everything which is common between FormOpenPopup and SelectCreatePopup. */ -instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ +instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ template: "AbstractFormPopup.render", /** * options: diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 36394894167..0f55975ff33 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -343,7 +343,7 @@ function get_class(name) { return new instance.web.Registry({'tmp' : name}).get_object("tmp"); } -instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ +instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ template: 'KanbanView.group_header', init: function (parent, records, group, dataset) { var self = this; @@ -517,7 +517,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ } }); -instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ +instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ template: 'KanbanView.record', init: function (parent, record) { this._super(parent); diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js index e006567c707..ffc32a93aaf 100644 --- a/addons/web_tests/static/src/js/web_tests.js +++ b/addons/web_tests/static/src/js/web_tests.js @@ -2,7 +2,7 @@ openerp.web_tests = function (instance) { instance.web.client_actions.add( 'buncha-forms', 'instance.web_tests.BunchaForms'); instance.web_tests = {}; - instance.web_tests.BunchaForms = instance.web.OldWidget.extend({ + instance.web_tests.BunchaForms = instance.web.Widget.extend({ init: function (parent) { this._super(parent); this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations'); diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index cfdd5d6bfea..5e04134d1ce 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -19,7 +19,7 @@ instance.web.ViewManagerAction.include({ } } }) -instance.web_view_editor.ViewEditor = instance.web.OldWidget.extend({ +instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id; From 6229869bc18b57fe27de48973e6a84bc0c228703 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 14 Aug 2012 15:53:24 +0200 Subject: [PATCH 3/3] Removed remaining usages bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui --- addons/web/static/src/js/coresetup.js | 26 ------------ addons/web_kanban/static/src/js/kanban.js | 6 ++- .../web_mobile/static/src/js/chrome_mobile.js | 42 +++++++++++++++---- .../web_mobile/static/src/js/form_mobile.js | 2 +- .../web_mobile/static/src/js/list_mobile.js | 2 +- 5 files changed, 40 insertions(+), 38 deletions(-) diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 6ba62162e93..44e2d3aba78 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -11,32 +11,6 @@ if (!console.debug) { openerp.web.coresetup = function(instance) { -/** - * @deprecated use :class:`instance.web.Widget` - */ -instance.web.OldWidget = instance.web.Widget.extend({ - init: function(parent, element_id) { - this._super(parent); - this.element_id = element_id; - this.element_id = this.element_id || _.uniqueId('widget-'); - - var tmp = document.getElementById(this.element_id); - this.setElement(tmp || this._make_descriptive()); - }, - renderElement: function() { - var rendered = this.render(); - if (rendered) { - this.replaceElement($(rendered)); - } - return this; - }, - render: function (additional) { - if (this.template) - return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {})); - return null; - } -}); - /** Session openerp specific RPC class */ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{ init: function() { diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 0f55975ff33..fe14b4c697f 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -563,7 +563,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ }); return new_record; }, - render: function() { + renderElement: function() { this.qweb_context = { record: this.record, widget: this, @@ -574,9 +574,11 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ this.qweb_context[p] = _.bind(this[p], this); } } - return this._super({ + var $el = instance.web.qweb.render(this.template, { + 'widget': this, 'content': this.view.qweb.render('kanban-box', this.qweb_context) }); + this.replaceElement($el); }, bind_events: function() { var self = this; diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 029e4bce49b..fce7aed6d48 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -11,7 +11,33 @@ instance.web_mobile.mobilewebclient = function(element_id) { return client; }; -instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({ +/** + * @deprecated use :class:`instance.web.Widget` + */ +instance.web_mobile.MobileWidget = instance.web.Widget.extend({ + init: function(parent, element_id) { + this._super(parent); + this.element_id = element_id; + this.element_id = this.element_id || _.uniqueId('widget-'); + + var tmp = document.getElementById(this.element_id); + this.setElement(tmp || this._make_descriptive()); + }, + renderElement: function() { + var rendered = this.render(); + if (rendered) { + this.replaceElement($(rendered)); + } + return this; + }, + render: function (additional) { + if (this.template) + return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {})); + return null; + } +}); + +instance.web_mobile.MobileWebClient = instance.web_mobile.MobileWidget.extend({ template: "WebClient", @@ -31,7 +57,7 @@ instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Login = instance.web.OldWidget.extend({ +instance.web_mobile.Login = instance.web_mobile.MobileWidget.extend({ template: "Login", @@ -118,7 +144,7 @@ instance.web_mobile.Login = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Header = instance.web.OldWidget.extend({ +instance.web_mobile.Header = instance.web_mobile.MobileWidget.extend({ template: "Header", @@ -130,7 +156,7 @@ instance.web_mobile.Header = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Footer = instance.web.OldWidget.extend({ +instance.web_mobile.Footer = instance.web_mobile.MobileWidget.extend({ template: "Footer", @@ -142,7 +168,7 @@ instance.web_mobile.Footer = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Shortcuts = instance.web.OldWidget.extend({ +instance.web_mobile.Shortcuts = instance.web_mobile.MobileWidget.extend({ template: "Shortcuts", @@ -181,7 +207,7 @@ instance.web_mobile.Shortcuts = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Menu = instance.web.OldWidget.extend({ +instance.web_mobile.Menu = instance.web_mobile.MobileWidget.extend({ template: "Menu", @@ -247,7 +273,7 @@ instance.web_mobile.Menu = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Secondary = instance.web.OldWidget.extend({ +instance.web_mobile.Secondary = instance.web_mobile.MobileWidget.extend({ template: "Menu.secondary", @@ -304,7 +330,7 @@ instance.web_mobile.Secondary = instance.web.OldWidget.extend({ } }); -instance.web_mobile.Options = instance.web.OldWidget.extend({ +instance.web_mobile.Options = instance.web_mobile.MobileWidget.extend({ template: "Options", diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index c3c2025ac1f..6b3cd09175e 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -4,7 +4,7 @@ openerp.web_mobile.form_mobile = function (instance) { -instance.web_mobile.FormView = instance.web.OldWidget.extend({ +instance.web_mobile.FormView = instance.web_mobile.MobileWidget.extend({ template: 'FormView', diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js index abe5620a0a3..b48753c82f2 100644 --- a/addons/web_mobile/static/src/js/list_mobile.js +++ b/addons/web_mobile/static/src/js/list_mobile.js @@ -4,7 +4,7 @@ openerp.web_mobile.list_mobile = function (instance) { -instance.web_mobile.ListView = instance.web.OldWidget.extend({ +instance.web_mobile.ListView = instance.web_mobile.MobileWidget.extend({ template: 'ListView',