diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-05-17 12:01:05 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-05-17 12:01:05 +0200 |
| commit | fdff3408ec5a4074009dd55f9110f85a93518e72 (patch) | |
| tree | 20b05de099cfbecfff0b13b0bbf10371b629d417 /addons/base/static/src/js/base.js | |
| parent | 8c6880a0d683193ad20e910bc722d8583926ef4c (diff) | |
| parent | a6568345163fbcbd6f0e563952b976c47cc087a8 (diff) | |
[MERGE] a few trunk improvements
bzr revid: xmo@openerp.com-20110517100105-6ad5urt4gwydlbl8
Diffstat (limited to 'addons/base/static/src/js/base.js')
| -rw-r--r-- | addons/base/static/src/js/base.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index 19d608e0260..7ee9c947d1e 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -44,8 +44,11 @@ // The dummy class constructor function Class() { // All construction is actually done in the init method - if ( !initializing && this.init ) - this.init.apply(this, arguments); + if ( !initializing && this.init ) { + var ret = this.init.apply(this, arguments); + if (ret) { return ret; } + } + return this; } // Populate our constructed prototype object |