dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed "on_succes" option to "done" allowing multiple inputs

Browse Source 
renamed "on_succes" option to "done" allowing multiple inputs,code
refactoring
This commit is contained in:
Carlos Cesar Caballero Díaz
2017-04-12 08:48:52 -04:00
parent 232598fd8d
commit 02d2fefc21
3 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
applications/admin/static/js/web2py.js
View File

@@ -40,6 +40,10 @@
},
ajax: function (u, s, t, options) {
/*simple ajax function*/
// set options default value
options = typeof options !== 'undefined' ? options : {};
var query = '';
if (typeof s == 'string') {
var d = $(s).serialize();
@@ -60,30 +64,39 @@
}
}
// default options for jquery ajax function
// default success action
var success_function = function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
};
// declare success actions as array
var success = [success_function];
// add user success actions
if ($.isArray(options.done)){
success = $.merge(success, options.done);
} else {
success.push(options.done);
}
// default jquery ajax options
var ajax_options = {
type: 'POST',
url: u,
data: query,
success: function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
// trigger on_success
if (options.on_success){
options.on_success();
}
}
success: success
};
//remove custom "done" option if exists
delete options.done;
// merge default ajax options with user custom options
for (var attrname in options) {
// not merge custom on_success option
if(attrname != "on_success"){
ajax_options[attrname] = options[attrname];
}
}
// call ajax function

43
applications/examples/static/js/web2py.js
View File

@@ -40,6 +40,10 @@
},
ajax: function (u, s, t, options) {
/*simple ajax function*/
// set options default value
options = typeof options !== 'undefined' ? options : {};
var query = '';
if (typeof s == 'string') {
var d = $(s).serialize();
@@ -60,30 +64,39 @@
}
}
// default options for jquery ajax function
// default success action
var success_function = function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
};
// declare success actions as array
var success = [success_function];
// add user success actions
if ($.isArray(options.done)){
success = $.merge(success, options.done);
} else {
success.push(options.done);
}
// default jquery ajax options
var ajax_options = {
type: 'POST',
url: u,
data: query,
success: function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
// trigger on_success
if (options.on_success){
options.on_success();
}
}
success: success
};
//remove custom "done" option if exists
delete options.done;
// merge default ajax options with user custom options
for (var attrname in options) {
// not merge custom on_success option
if(attrname != "on_success"){
ajax_options[attrname] = options[attrname];
}
}
// call ajax function

43
applications/welcome/static/js/web2py.js
View File

@@ -40,6 +40,10 @@
},
ajax: function (u, s, t, options) {
/*simple ajax function*/
// set options default value
options = typeof options !== 'undefined' ? options : {};
var query = '';
if (typeof s == 'string') {
var d = $(s).serialize();
@@ -60,30 +64,39 @@
}
}
// default options for jquery ajax function
// default success action
var success_function = function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
};
// declare success actions as array
var success = [success_function];
// add user success actions
if ($.isArray(options.done)){
success = $.merge(success, options.done);
} else {
success.push(options.done);
}
// default jquery ajax options
var ajax_options = {
type: 'POST',
url: u,
data: query,
success: function (msg) {
if (t) {
if (t == ':eval') eval(msg);
else if (typeof t == 'string') $('#' + t).html(msg);
else t(msg);
}
// trigger on_success
if (options.on_success){
options.on_success();
}
}
success: success
};
//remove custom "done" option if exists
delete options.done;
// merge default ajax options with user custom options
for (var attrname in options) {
// not merge custom on_success option
if(attrname != "on_success"){
ajax_options[attrname] = options[attrname];
}
}
// call ajax function