pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat openerp.base.callback

Browse Source 
bzr revid: xmo@openerp.com-20110314115828-5w00q4qsx06pxb8p
This commit is contained in:
Xavier Morel
2011-03-14 12:58:28 +01:00
parent 598b5de1c0
commit 970dc4e2ad
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/openerp/js/controllers.js
+16 -11
View File
@@ -16,9 +16,8 @@ openerp.base.callback = function(obj, method) {
// position: "first" or "last"
// unique: boolean
// })
var args = Array.prototype.slice.call(arguments);
var callback = function() {
var args2 = Array.prototype.slice.call(arguments);
var args = Array.prototype.slice.call(arguments);
var r;
for(var i = 0; i < callback.callback_chain.length; i++) {
var c = callback.callback_chain[i];
@@ -26,7 +25,7 @@ openerp.base.callback = function(obj, method) {
// al: obscure but shortening C-style hack, sorry
callback.callback_chain.pop(i--);
}
r = c.callback.apply(c.self, c.args.concat(args2));
r = c.callback.apply(c.self, c.args.concat(args));
// TODO special value to stop the chain
// openerp.base.callback_stop
}
@@ -34,13 +33,12 @@ openerp.base.callback = function(obj, method) {
};
callback.callback_chain = [];
callback.add = function(f) {
var args2 = Array.prototype.slice.call(arguments);
if(typeof(f) == 'function') {
f = { callback: f, args: args2.slice(1) };
f = { callback: f, args: Array.prototype.slice.call(arguments, 1) };
}
f.self = f.self || null;
f.args = f.args || [];
f.unique = f.unique || false;
f.unique = !!f.unique;
if(f.position == 'last') {
callback.callback_chain.push(f);
} else {
@@ -49,14 +47,21 @@ openerp.base.callback = function(obj, method) {
return callback;
};
callback.add_first = function(f) {
callback.add.apply(null,arguments);
return callback.add.apply(null,arguments);
};
callback.add_last = function(f) {
var args2 = Array.prototype.slice.call(arguments);
callback.add({callback: f, args: args2.slice(1), position: "last"});
return callback.add({
callback: f,
args: Array.prototype.slice.call(arguments, 1),
position: "last"
});
};
callback.add({ callback: method, self:obj, args:args.slice(2) });
return callback;
return callback.add({
callback: method,
self:obj,
args:Array.prototype.slice.call(arguments, 2)
});
};
openerp.base.BasicController = Class.extend({