odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] removed remaining usages of OldWidget (sorry) 

bzr revid: nicolas.vanhoren@openerp.com-20120814135439-mslx2buf8pdpidkk
This commit is contained in:
niv-openerp 2012-08-14 15:54:39 +02:00
parent caa053c252 6229869bc1
commit 824a0568c6
10 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/web/static/src/js/coresetup.js
View File

@ -11,32 +11,6 @@ if (!console.debug) {
openerp.web.coresetup = function(instance) { 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 */ /** Session openerp specific RPC class */
instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{
init: function() { init: function() {

10
addons/web/static/src/js/data.js
View File

@ -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 * Management interface between views and grouped collections of OpenERP
* records. * records.
@ -451,9 +451,9 @@ instance.web.DataGroup = instance.web.OldWidget.extend( /** @lends openerp.web.
* content of the current grouping level. * content of the current grouping level.
* *
* @constructs instance.web.DataGroup * @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 {String} model name of the model managed by this DataGroup
* @param {Array} domain search domain for this DataGroup * @param {Array} domain search domain for this DataGroup
* @param {Object} context context of the DataGroup's searches * @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 * DateaManagement interface between views and the collection of selected
* OpenERP records (represents the view's state?) * OpenERP records (represents the view's state?)
* *
* @constructs instance.web.DataSet * @constructs instance.web.DataSet
* @extends instance.web.OldWidget * @extends instance.web.CallbackEnabled
* *
* @param {String} model the OpenERP model this dataset will manage * @param {String} model the OpenERP model this dataset will manage
*/ */

4
addons/web/static/src/js/search.js
View File

@ -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', template: 'SearchView.extended_search.proposition',
/** /**
* @constructs instance.web.search.ExtendedSearchProposition * @constructs instance.web.search.ExtendedSearchProposition
* @extends instance.web.OldWidget * @extends instance.web.Widget
* *
* @param parent * @param parent
* @param fields * @param fields

4
addons/web/static/src/js/view_form.js
View File

@ -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", template: "web.datepicker",
jqueryui_object: 'datetimepicker', jqueryui_object: 'datetimepicker',
type_of_date: "datetime", 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. * 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", template: "AbstractFormPopup.render",
/** /**
* options: * options:

10
addons/web_kanban/static/src/js/kanban.js
View File

@ -343,7 +343,7 @@ function get_class(name) {
return new instance.web.Registry({'tmp' : name}).get_object("tmp"); 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', template: 'KanbanView.group_header',
init: function (parent, records, group, dataset) { init: function (parent, records, group, dataset) {
var self = this; 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', template: 'KanbanView.record',
init: function (parent, record) { init: function (parent, record) {
this._super(parent); this._super(parent);
@ -563,7 +563,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
}); });
return new_record; return new_record;
}, },
render: function() { renderElement: function() {
this.qweb_context = { this.qweb_context = {
record: this.record, record: this.record,
widget: this, widget: this,
@ -574,9 +574,11 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
this.qweb_context[p] = _.bind(this[p], this); 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) 'content': this.view.qweb.render('kanban-box', this.qweb_context)
}); });
this.replaceElement($el);
}, },
bind_events: function() { bind_events: function() {
var self = this; var self = this;

42
addons/web_mobile/static/src/js/chrome_mobile.js
View File

@ -11,7 +11,33 @@ instance.web_mobile.mobilewebclient = function(element_id) {
return client; 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", 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", 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", 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", 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", 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", 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", 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", template: "Options",

2
addons/web_mobile/static/src/js/form_mobile.js
View File

@ -4,7 +4,7 @@
openerp.web_mobile.form_mobile = function (instance) { 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', template: 'FormView',

2
addons/web_mobile/static/src/js/list_mobile.js
View File

@ -4,7 +4,7 @@
openerp.web_mobile.list_mobile = function (instance) { 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', template: 'ListView',

2
addons/web_tests/static/src/js/web_tests.js
View File

@ -2,7 +2,7 @@ openerp.web_tests = function (instance) {
instance.web.client_actions.add( instance.web.client_actions.add(
'buncha-forms', 'instance.web_tests.BunchaForms'); 'buncha-forms', 'instance.web_tests.BunchaForms');
instance.web_tests = {}; instance.web_tests = {};
instance.web_tests.BunchaForms = instance.web.OldWidget.extend({ instance.web_tests.BunchaForms = instance.web.Widget.extend({
init: function (parent) { init: function (parent) {
this._super(parent); this._super(parent);
this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations'); this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations');

2
addons/web_view_editor/static/src/js/view_editor.js
View File

@ -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) { init: function(parent, element_id, dataset, view, options) {
this._super(parent); this._super(parent);
this.element_id = element_id; this.element_id = element_id;