franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Ppgrade jquery

Browse Source 
- Early detection of table existency (on creation)
- Replaced deprecated ajax calls (defer)
This commit is contained in:
Franzz
2014-09-05 23:13:55 +02:00
parent 7df342462b
commit ecc3471ebc
5 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
jquery/databap.js vendored
View File

@@ -429,37 +429,35 @@ function Databap()
}
};
this.saveForm = function(action, $form, fOnSuccess, bProcessIcon, dataType)
this.saveForm = function(action, $form, fOnSuccess, bProcessIcon, dataType, asVars)
{
var sFormVars = $form.serialize();
var sFormVars = $form.serialize()+($.isEmptyObject(asVars)?'':'&'+$.param(asVars));
bProcessIcon = bProcessIcon || false;
if(bProcessIcon) self.addBufferIcon();
if(!dataType) dataType = 'text';
self.vars.loading = true;
$.ajax
(
$.ajax(
{
type: 'POST',
url: self.getActionLink(action),
data: sFormVars,
success:function(result)
{
self.vars.loading = false;
self.vars.disconnected = false;
if(bProcessIcon) self.resetIcon();
fOnSuccess(result);
},
error: function(jqXHR, textStatus, errorThrown)
{
self.vars.loading = false;
self.vars.disconnected = true;
debug('Error databap.js 331');
self.showError(textStatus);
},
dataType: dataType
}
);
})
.done(function(result)
{
self.vars.loading = false;
self.vars.disconnected = false;
if(bProcessIcon) self.resetIcon();
fOnSuccess(result);
})
.fail(function(jqXHR, textStatus, errorThrown)
{
self.vars.loading = false;
self.vars.disconnected = true;
debug('Error databap.js 331');
self.showError(textStatus);
});
};
this.getInfo = function(action, fOnSuccess, vars, type, fOnError, bProcessIcon)
@@ -471,41 +469,39 @@ function Databap()
vars['a'] = action;
self.vars.loading = true;
$.ajax
(
$.ajax(
{
url: self.consts.process_url,
data: vars,
success: function(result)
{
if(result==self.consts.errors.disconnected) databap.refresh();
else if((result==self.consts.error || typeof result.success != 'undefined' && result.success==self.consts.error) && typeof fOnError !== 'undefined') fOnError();
else
{
self.vars.loading = false;
self.vars.disconnected = false;
if(bProcessIcon) self.resetIcon();
fOnSuccess(result);
}
},
error: function(jqXHR, textStatus, errorThrown)
{
if(jqXHR.responseText==self.consts.errors.disconnected) databap.refresh();
self.vars.loading = false;
self.vars.disconnected = true;
debug('Error databap.js 361');
if(bProcessIcon) self.resetIcon();
if(!fOnError)
{
self.showError(textStatus);
debug(textStatus+' '+errorThrown);
}
else fOnError(textStatus);
},
dataType: type
}
);
})
.done(function(result)
{
if(result==self.consts.errors.disconnected) databap.refresh();
else if((result==self.consts.error || typeof result.success != 'undefined' && result.success==self.consts.error) && typeof fOnError !== 'undefined') fOnError();
else
{
self.vars.loading = false;
self.vars.disconnected = false;
if(bProcessIcon) self.resetIcon();
fOnSuccess(result);
}
})
.fail(function(jqXHR, textStatus, errorThrown)
{
if(jqXHR.responseText==self.consts.errors.disconnected) databap.refresh();
self.vars.loading = false;
self.vars.disconnected = true;
debug('Error databap.js 361');
if(bProcessIcon) self.resetIcon();
if(!fOnError)
{
self.showError(textStatus);
debug(textStatus+' '+errorThrown);
}
else fOnError(textStatus);
});
};
this.getSyncInfo = function(action, vars)