sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

merging changes

Browse source
This commit is contained in:
rlx 2011-08-06 17:41:01 +00:00
commit 8e468ced0b
7 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
source/Ox.UI/js/Core/Ox.App.js
View file

@ -55,18 +55,25 @@ Ox.App = function(options) {
@*/
that.api.api(function(result) {
Ox.forEach(result.data.actions, function(val, key) {
that.api[key] = function(data, callback) {
if (arguments.length == 1 && Ox.isFunction(data)) {
callback = data;
data = {};
}
that.api[key] = function(/*data, age, callback*/) {
var data = {}, age = -1, callback = null;
Ox.forEach(arguments, function(argument) {
if (Ox.isObject(argument)) {
data = argument;
} else if (Ox.isNumber(argument)) {
age = argument;
} else if (Ox.isFunction(argument)) {
callback = argument;
}
});
return Ox.Request.send($.extend({
url: self.options.url,
age: age,
callback: callback,
data: {
action: key,
data: JSON.stringify(data)
},
callback: callback
url: self.options.url
}, !val.cache ? {age: 0}: {}));
};
});