quick fix for overwriting of global and .setup() error/complete callb…

…acks
furf · Dec 14, 2010 · 9414037 · 9414037
1 parent 515cbc5
commit 9414037
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/dist/Sexy-slim.js b/dist/Sexy-slim.js
@@ -62,8 +62,8 @@
           isScript = realType === 'script',
           defer    = uid > 0 ? remote && isScript ? true : cfg.defer : false,
           success  = cfg.success || (isScript ? passPrevious : passData),
-          error    = cfg.error || jQuery.noop,
-          complete = cfg.complete || jQuery.noop;
+          error    = cfg.error || this.cfg.error || jQuery.ajaxSettings.error || jQuery.noop,
+          complete = cfg.complete ||  this.cfg.complete || jQuery.ajaxSettings.complete || jQuery.noop;
 
       cfgs.push(jQuery.extend(true, cfg, this.cfg, cfg, {
 

diff --git a/dist/Sexy-slim.min.js b/dist/Sexy-slim.min.js
diff --git a/dist/Sexy.js b/dist/Sexy.js
@@ -63,8 +63,8 @@
           isStyle  = realType === 'style',
           defer    = uid > 0 ? remote && (isScript || isStyle) ? true : cfg.defer : false,
           success  = cfg.success || (isScript || isStyle ? passPrevious : passData),
-          error    = cfg.error || jQuery.noop,
-          complete = cfg.complete || jQuery.noop;
+          error    = cfg.error || this.cfg.error || jQuery.ajaxSettings.error || jQuery.noop,
+          complete = cfg.complete ||  this.cfg.complete || jQuery.ajaxSettings.complete || jQuery.noop;
 
       cfgs.push(jQuery.extend(true, cfg, this.cfg, cfg, {
 

diff --git a/dist/Sexy.min.js b/dist/Sexy.min.js
diff --git a/dist/jquery.Sexy-slim.js b/dist/jquery.Sexy-slim.js
@@ -62,8 +62,8 @@
           isScript = realType === 'script',
           defer    = uid > 0 ? remote && isScript ? true : cfg.defer : false,
           success  = cfg.success || (isScript ? passPrevious : passData),
-          error    = cfg.error || jQuery.noop,
-          complete = cfg.complete || jQuery.noop;
+          error    = cfg.error || this.cfg.error || jQuery.ajaxSettings.error || jQuery.noop,
+          complete = cfg.complete ||  this.cfg.complete || jQuery.ajaxSettings.complete || jQuery.noop;
 
       cfgs.push(jQuery.extend(true, cfg, this.cfg, cfg, {
 

diff --git a/dist/jquery.Sexy-slim.min.js b/dist/jquery.Sexy-slim.min.js
diff --git a/dist/jquery.Sexy.js b/dist/jquery.Sexy.js
@@ -63,8 +63,8 @@
           isStyle  = realType === 'style',
           defer    = uid > 0 ? remote && (isScript || isStyle) ? true : cfg.defer : false,
           success  = cfg.success || (isScript || isStyle ? passPrevious : passData),
-          error    = cfg.error || jQuery.noop,
-          complete = cfg.complete || jQuery.noop;
+          error    = cfg.error || this.cfg.error || jQuery.ajaxSettings.error || jQuery.noop,
+          complete = cfg.complete ||  this.cfg.complete || jQuery.ajaxSettings.complete || jQuery.noop;
 
       cfgs.push(jQuery.extend(true, cfg, this.cfg, cfg, {
 

diff --git a/dist/jquery.Sexy.min.js b/dist/jquery.Sexy.min.js
diff --git a/src/sexy-slim.js b/src/sexy-slim.js
@@ -53,8 +53,8 @@
           isScript = realType === 'script',
           defer    = uid > 0 ? remote && isScript ? true : cfg.defer : false,
           success  = cfg.success || (isScript ? passPrevious : passData),
-          error    = cfg.error || jQuery.noop,
-          complete = cfg.complete || jQuery.noop;
+          error    = cfg.error || this.cfg.error || jQuery.ajaxSettings.error || jQuery.noop,
+          complete = cfg.complete ||  this.cfg.complete || jQuery.ajaxSettings.complete || jQuery.noop;
 
       cfgs.push(jQuery.extend(true, cfg, this.cfg, cfg, {