Removed remaining usages

bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui
This commit is contained in:
niv-openerp 2012-08-14 15:53:24 +02:00
parent 3ebfaedd64
commit 6229869bc1
5 changed files with 40 additions and 38 deletions

View File

@ -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() {

View File

@ -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;

View File

@ -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",

View File

@ -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',

View File

@ -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',