summaryrefslogtreecommitdiff
path: root/addons/base/static/src/js/controller.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-07-28 16:49:12 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-07-28 16:49:12 +0200
commit8e8ca695cb7136048e8d5c428c1daaf06af7f476 (patch)
tree57e045e26975a2ef9433881f3d2739bcff8e68ad /addons/base/static/src/js/controller.js
parentccb48c8f4b2bab8345e1e80379b54b2f093954e8 (diff)
[imp] changed Controller to Widget and BaseWidget to OldWidget
bzr revid: nicolas.vanhoren@openerp.com-20110728144912-t3kml1yo8gt261ga
Diffstat (limited to 'addons/base/static/src/js/controller.js')
-rw-r--r--addons/base/static/src/js/controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index a9bf99f8764..2ed00f29ff9 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -140,7 +140,7 @@ instance.base.generate_null_object_class = function(claz, add) {
copy_proto(prototype.prototype);
};
copy_proto(claz.prototype);
- newer.init = instance.base.Controller.prototype.init;
+ newer.init = instance.base.Widget.prototype.init;
var tmpclass = claz.extend(newer);
return tmpclass.extend(add || {});
};
@@ -214,7 +214,7 @@ instance.base.SessionAware = instance.base.Class.extend({
}
});
-instance.base.Controller = instance.base.SessionAware.extend({
+instance.base.Widget = instance.base.SessionAware.extend({
/**
* The name of the QWeb template that will be used for rendering. Must be
* redefined in subclasses or the default render() method can not be used.
@@ -295,7 +295,7 @@ instance.base.Controller = instance.base.SessionAware.extend({
* For retro compatibility only, the only difference with is that render takes
* directly this instead of
*/
-instance.base.BaseWidget = instance.base.Controller.extend({
+instance.base.OldWidget = instance.base.Widget.extend({
render: function (additional) {
return QWeb.render(this.template, _.extend(_.extend({}, this), additional || {}));
}