|
@ -193,6 +193,8 @@ $.api = $.fn.api = function(parameters) { |
|
|
// call beforesend and get any settings changes
|
|
|
// call beforesend and get any settings changes
|
|
|
requestSettings = module.get.settings(); |
|
|
requestSettings = module.get.settings(); |
|
|
|
|
|
|
|
|
|
|
|
console.log(requestSettings); |
|
|
|
|
|
|
|
|
// check if before send cancelled request
|
|
|
// check if before send cancelled request
|
|
|
if(requestSettings === false) { |
|
|
if(requestSettings === false) { |
|
|
module.cancelled = true; |
|
|
module.cancelled = true; |
|
@ -723,6 +725,9 @@ $.api = $.fn.api = function(parameters) { |
|
|
if(runSettings === undefined) { |
|
|
if(runSettings === undefined) { |
|
|
module.error(error.noReturnedValue); |
|
|
module.error(error.noReturnedValue); |
|
|
} |
|
|
} |
|
|
|
|
|
if(runSettings === false) { |
|
|
|
|
|
return runSettings; |
|
|
|
|
|
} |
|
|
return (runSettings !== undefined) |
|
|
return (runSettings !== undefined) |
|
|
? $.extend(true, {}, runSettings) |
|
|
? $.extend(true, {}, runSettings) |
|
|
: $.extend(true, {}, settings) |
|
|
: $.extend(true, {}, settings) |
|
|