added ajax deferred

README.md

@@ -89,7 +89,7 @@ $.when(late(1000), late(1200)).then(function(resolvedValue1, resolvedValue2) {
 
 The beast. Easy ajax functions.
 
-**Note:** these are *not* deferred. The reason? the deferred.js script makes up about half of the compiled `ki.extend.js` file.
+**Note:** by default, deferred Ajax is included in the build. If you **are not using Deferred** then just uncomment the normal ajax lib and comment off Deferred and Ajax-Deferred.
 
 Simple `POST`. Data is automagically `$.param'd` and sent with a request header of `('Content-type', 'application/x-www-form-urlencoded')`.
 
@@ -119,6 +119,45 @@ $.ajax('http:https://example.com/save', { id: 456 }, function(res, err) {
 });
 ```
 
+---
+
+Deferred Examples
+
+```javascript
+$.ajax('form.php', { id: 123 }).done(function(res){
+ console.log(res);
+});
+```
+
+Simple `GET`. If you do not pass an object, than the request is treated as a `GET` request.
+
+```javascript
+$.ajax('json.js').done(function(res) {
+ console.log(res);
+});
+```
+
+Simple error handling. The second argument in the callback is an error callback.
+
+```javascript
+$.ajax('http:https://example.com/save', { id: 456 }).then(function(res) {
+ alert('I am ok!');
+},
+function(res) {
+ alert('Got an error, bro.');
+});
+```
+
+Using `$.when`:
+
+```javascript
+$.when($.ajax('text.txt'), $.ajax('json.js')).then(function(res1, res2){
+ console.log(res1, res2);
+}, function(res){
+ console.log(res);
+});
+```
+
 ### Building
 
 You can choose to build a custom version of the extend lib. Just open the `gruntfile` and remove items from the concat task.
@@ -142,7 +181,8 @@ Here is the default list:
 'build/parts/is.js',
 'build/parts/map.js',
 'build/parts/stop.js',
-'build/parts/ajax.js',
+// 'build/parts/ajax-deferred.js',
+// 'build/parts/ajax.js',
 'build/ki-deferred-js/deferred.js',
 'build/parts/footer.js'
 ```

build/parts/ajax-deferred.js

@@ -0,0 +1,48 @@
+$.param = function(obj, prefix) {
+ var str = [];
+ for(var p in obj) {
+ var k = prefix ? prefix + "[" + p + "]" : p, v = obj[p];
+ str.push(typeof v == "object" ? $.param(v, k) : encodeURIComponent(k) + "=" + encodeURIComponent(v));
+ }
+ return str.join("&");
+};
+
+// var p = new $.Deferred();
+// p.resolve(n);
+// return p.promise();
+
+$.ajax = function(a, b, c) {
+ var xhr = new XMLHttpRequest();
+ var p = new $.Deferred();
+ // 1 == post, 0 == get
+ var type = (typeof(b) === 'object') ? 1: 0;
+ var gp = ['GET', 'POST'];
+ xhr.open(gp[type], a, true);
+ var cb = (!type) ? b: c;
+ if (typeof(c) === 'undefined' && typeof(b) !== 'function') {
+ cb = function(){};
+ }
+ xhr.onerror = function() {
+ p.reject(this);
+ cb(this, true);
+ };
+ xhr.onreadystatechange = function() {
+ if (this.readyState === 4) {
+ if (this.status >= 200 && this.status < 400){
+ p.resolve(this.response);
+ cb(this.response, true);
+ } else {
+ p.reject(this);
+ cb(this, true);
+ }
+ }
+ };
+ if (type) {
+ xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ xhr.send($.param(b));
+ } else {
+ xhr.send();
+ }
+ xhr = null;
+ return p.promise();
+};

gruntfile.js

@@ -30,7 +30,8 @@ module.exports = function(grunt) {
  'build/parts/is.js',
  'build/parts/map.js',
  'build/parts/stop.js',
- 'build/parts/ajax.js',
+ // 'build/parts/ajax.js',
+ 'build/parts/ajax-deferred.js',
  'build/ki-deferred-js/deferred.js',
  'build/parts/footer.js'
  ],

ki.extend.js

@@ -183,22 +183,32 @@ $.param = function(obj, prefix) {
  return str.join("&");
 };
 
-$.ajax = function(a, b, c, d) {
+// var p = new $.Deferred();
+// p.resolve(n);
+// return p.promise();
+
+$.ajax = function(a, b, c) {
  var xhr = new XMLHttpRequest();
+ var p = new $.Deferred();
  // 1 == post, 0 == get
  var type = (typeof(b) === 'object') ? 1: 0;
  var gp = ['GET', 'POST'];
  xhr.open(gp[type], a, true);
- xhr.responseType = (typeof(c) === 'string') ? c: '';
  var cb = (!type) ? b: c;
+ if (typeof(c) === 'undefined' && typeof(b) !== 'function') {
+ cb = function(){};
+ }
  xhr.onerror = function() {
+ p.reject(this);
  cb(this, true);
  };
  xhr.onreadystatechange = function() {
  if (this.readyState === 4) {
  if (this.status >= 200 && this.status < 400){
- cb(this.response, false);
+ p.resolve(this.response);
+ cb(this.response, true);
  } else {
+ p.reject(this);
  cb(this, true);
  }
  }
@@ -210,6 +220,7 @@ $.ajax = function(a, b, c, d) {
  xhr.send();
  }
  xhr = null;
+ return p.promise();
 };
 
 /**