sproutcore 1.8.2.1 → 1.9.0

data/lib/frameworks/sproutcore/frameworks/ajax/system/response.js

@@ -373,7 +373,7 @@ SC.Response = SC.Object.extend(
     Will notify each listener. Returns true if any of the listeners handle.
   */
   _notifyListeners: function(listeners, status) {
-    var notifiers = listeners[status], params, target, action;
+    var notifiers = listeners[status], args, target, action;
     if (!notifiers) { return NO; }
 
     var handled = NO;
@@ -381,14 +381,14 @@ SC.Response = SC.Object.extend(
 
     for (var i = 0; i < len; i++) {
       var notifier = notifiers[i];
-      params = (notifier.params || []).copy();
-      params.unshift(this);
+      args = (notifier.args || []).copy();
+      args.unshift(this);
 
       target = notifier.target;
       action = notifier.action;
       if (SC.typeOf(action) === SC.T_STRING) { action = target[action]; }
 
-      handled = action.apply(target, params);
+      handled = action.apply(target, args);
     }
 
     return handled;
@@ -498,24 +498,60 @@ SC.XHRResponse = SC.Response.extend(
     this.set('rawRequest', null);
   },
 
+
   /**
     Starts the transport of the request
 
     @returns {XMLHttpRequest|ActiveXObject}
   */
   invokeTransport: function() {
-    var rawRequest, transport, handleReadyStateChange, async, headers;
+    var listener, listeners, listenersForKey,
+      rawRequest,
+      request = this.get('request'),
+      transport, handleReadyStateChange, async, headers;
 
     rawRequest = this.createRequest();
     this.set('rawRequest', rawRequest);
 
-    // configure async callback - differs per browser...
-    async = !!this.getPath('request.isAsynchronous');
+  // configure async callback - differs per browser...
+    async = !!request.get('isAsynchronous');
 
     if (async) {
-      if (!SC.browser.isIE && !SC.browser.isOpera) {
-        SC.Event.add(rawRequest, 'readystatechange', this,
-                     this.finishRequest, rawRequest);
+      if (window.XMLHttpRequestProgressEvent) {
+        // XMLHttpRequest Level 2
+
+        // Add progress event listeners that were specified on the request.
+        listeners = request.get("listeners");
+        if (listeners) {
+          for (var key in listeners) {
+
+            // Make sure the key is not an HTTP numeric status code.
+            if (isNaN(parseInt(key, 10))) {
+              // We still allow multiple notifiers on progress events, but we
+              // don't try to optimize this by using a single listener, because
+              // it is highly unlikely that the developer will add duplicate
+              // progress event notifiers and if they did, it is also unlikely
+              // that they would expect them to cascade in the way that the
+              // status code notifiers do.
+              listenersForKey = listeners[key];
+              for (var i = 0, len = listenersForKey.length; i < len; i++) {
+                listener = listenersForKey[i];
+
+                var keyTarget = key.split('.');
+                if (SC.none(keyTarget[1])) {
+                  SC.Event.add(rawRequest, keyTarget[0], listener.target, listener.action, listener.args);
+                } else {
+                  SC.Event.add(rawRequest[keyTarget[0]], keyTarget[1], listener.target, listener.action, listener.args);
+                }
+              }
+            }
+          }
+        }
+
+        SC.Event.add(rawRequest, 'loadend', this, this.finishRequest);
+      } else if (window.XMLHttpRequest) {
+        // XMLHttpRequest Level 1
+        SC.Event.add(rawRequest, 'readystatechange', this, this.finishRequest);
       } else {
         transport = this;
         handleReadyStateChange = function() {
@@ -554,21 +590,22 @@ SC.XHRResponse = SC.Response.extend(
     @returns {XMLHttpRequest|ActiveXObject}
   */
   createRequest: function() {
-    function tryThese() {
-      for (var i=0; i < arguments.length; i++) {
-        try {
-          var item = arguments[i]();
-          return item;
-        } catch (e) {}
-      }
-      return NO;
+    var rawRequest;
+
+    // check native support first
+    if (window.XMLHttpRequest) {
+      rawRequest = new XMLHttpRequest();
+    } else {
+      // There are two relevant Microsoft MSXML object types.
+      // See here for more information:
+      // http://www.snook.ca/archives/javascript/xmlhttprequest_activex_ie/
+      // http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/using-the-right-version-of-msxml-in-internet-explorer.aspx
+      // http://msdn.microsoft.com/en-us/library/windows/desktop/ms763742(v=vs.85).aspx
+      try { rawRequest = new ActiveXObject("MSXML2.XMLHTTP.6.0");  } catch(e) {}
+      try { if (!rawRequest) rawRequest = new ActiveXObject("MSXML2.XMLHTTP");  } catch(e) {}
     }
 
-    return tryThese(
-      function() { return new XMLHttpRequest(); },
-      function() { return new ActiveXObject('Msxml2.XMLHTTP'); },
-      function() { return new ActiveXObject('Microsoft.XMLHTTP'); }
-    );
+    return rawRequest;
   },
 
   /**
@@ -580,9 +617,11 @@ SC.XHRResponse = SC.Response.extend(
     @returns {Boolean} YES if completed, NO otherwise
   */
   finishRequest: function(evt) {
-    var rawRequest = this.get('rawRequest'),
-        readyState = rawRequest.readyState,
-        error, status, msg;
+    var listener, listeners, listenersForKey,
+      rawRequest = this.get('rawRequest'),
+      readyState = rawRequest.readyState,
+      request,
+      error, status, msg;
 
     if (readyState === 4 && !this.get('timedOut')) {
       this.receive(function(proceed) {
@@ -614,7 +653,34 @@ SC.XHRResponse = SC.Response.extend(
       }, this);
 
       // Avoid memory leaks
-      if (!SC.browser.isIE && !SC.browser.isOpera) {
+      if (window.XMLHttpRequestProgressEvent) {
+        // XMLHttpReqeust Level 2
+
+        SC.Event.remove(rawRequest, 'loadend', this, this.finishRequest);
+
+        request = this.get('request');
+        listeners = request.get("listeners");
+        if (listeners) {
+          for (var key in listeners) {
+
+            // Make sure the key is not an HTTP numeric status code.
+            if (isNaN(parseInt(key, 10))) {
+              listenersForKey = listeners[key];
+              for (var i = 0, len = listenersForKey.length; i < len; i++) {
+                listener = listenersForKey[i];
+
+                var keyTarget = key.split('.');
+                if (SC.none(keyTarget[1])) {
+                  SC.Event.remove(rawRequest, keyTarget[0], listener.target, listener.action, listener.args);
+                } else {
+                  SC.Event.remove(rawRequest[keyTarget[0]], keyTarget[1], listener.target, listener.action, listener.args);
+                }
+              }
+            }
+          }
+        }
+      } else if (window.XMLHttpRequest) {
+        // XMLHttpReqeust Level 1
         SC.Event.remove(rawRequest, 'readystatechange', this, this.finishRequest);
       } else {
         rawRequest.onreadystatechange = null;

data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js

@@ -7,15 +7,15 @@
 // ========================================================================
 // SC.Request Base Tests
 // ========================================================================
-/*globals module test ok isObj equals expects */
+/*globals module, test, ok, isObj, equals, expects */
 
 var url, request, contents ;
 
 module("SC.Request", {
 
   setup: function() {
-    url = sc_static("file_exists.json"); //"/static/sproutcore/en/desktop/_src/desktop.platform/english.lproj/file_exists.json" ;
-    request = SC.Request.getUrl(url) ;
+    url = sc_static("file_exists.json");
+    request = SC.Request.getUrl(url);
     contents = null ;
   },
 
@@ -164,14 +164,12 @@ test("Test Multiple Asynchronous GET Request - two immediate, and two in serial"
   }, 2000);
 });
 
-/**
-  There are two ways to be notified of request changes:
 
-    - Implementing a didReceive function on the SC.Request object
-    - Registering a listener using notify()
+//   There are two ways to be notified of request changes:
+//     - Implementing a didReceive function on the SC.Request object
+//     - Registering a listener using notify()
+//   The following two tests test the timeout functionality for each of these.
 
-  The following two tests test the timeout functionality for each of these.
-*/
 test("Timeouts - SC.Request didReceive callback", function() {
   var message;
 
@@ -275,8 +273,6 @@ test("Timeouts - Status listener callback", function() {
 });
 
 test("Test Multiple listeners per single status response", function() {
-
-
   var numResponses = 0;
   var response;
 
@@ -284,16 +280,16 @@ test("Test Multiple listeners per single status response", function() {
 
   request.notify(200, this, function(response) {
     numResponses++;
-    ok(true, "Receieved a response");
+    ok(true, "Received a response");
 
-    if (numResponses === 2) window.start();
+    if (numResponses === 2) { window.start(); }
   });
 
   request.notify(200, this, function(response) {
     numResponses++;
-    ok(true, "Receieved a response");
+    ok(true, "Received a response");
 
-    if (numResponses === 2) window.start();
+    if (numResponses === 2) { window.start(); }
   });
 
   response = request.send();
@@ -303,3 +299,188 @@ test("Test Multiple listeners per single status response", function() {
   stop() ; // stops the test runner - wait for response
 });
 
+
+/**
+  There was a short-lived bug where the additional Arguments passed to notify()
+  were being dropped because the slice on 'arguments' was happening after they
+  had already been adjusted.
+*/
+test("Multiple arguments passed to notify()", function() {
+  var response;
+
+  request.notify(this, function(response, a, b, c) {
+    equals(a, 'a', "Listener called with argument 'a'");
+    equals(b, 'b', "Listener called with argument 'b'");
+    equals(c, 'c', "Listener called with argument 'c'");
+
+    window.start();
+  }, 'a', 'b', 'c');
+
+  request.notify(200, this, function(response, a, b, c) {
+    equals(a, 'a', "Listener called with argument 'a'");
+    equals(b, 'b', "Listener called with argument 'b'");
+    equals(c, 'c', "Listener called with argument 'c'");
+
+    window.start();
+  }, 'a', 'b', 'c');
+
+  response = request.send();
+
+  stop() ; // stops the test runner - wait for response
+});
+
+
+test("Test event listeners on successful request.", function() {
+  var abort = false,
+    error = false,
+    load = false,
+    loadend = false,
+    loadstart = false,
+    progress = false,
+    response,
+    status,
+    timeout = false;
+
+  request.notify("loadstart", this, function(evt) {
+    loadstart = true;
+  });
+
+  request.notify("progress", this, function(evt) {
+    progress = true;
+  });
+
+  request.notify("load", this, function(evt) {
+    load = true;
+  });
+
+  request.notify("loadend", this, function(evt) {
+    loadend = true;
+  });
+
+  request.notify(200, this, function(response) {
+    status = response.status;
+
+    ok(loadstart, "Received a loadstart event.");
+    ok(progress, "Received a progress event.");
+    ok(load, "Received a load event.");
+    ok(loadend, "Received a loadend event.");
+    ok(!abort, "Did not receive an abort event.");
+    ok(!error, "Did not receive an error event.");
+    ok(!timeout, "Did not receive a timeout event.");
+    equals(status, 200, "Received a response with status 200.");
+
+    window.start();
+  });
+
+  response = request.send();
+
+  stop() ; // stops the test runner - wait for response
+});
+
+
+test("Test event listeners on aborted request.", function() {
+  var abort = false,
+    error = false,
+    load = false,
+    loadend = false,
+    loadstart = false,
+    progress = false,
+    response,
+    status,
+    timeout = false;
+
+  request.notify("loadstart", this, function(evt) {
+    loadstart = true;
+  });
+
+  request.notify("progress", this, function(evt) {
+    progress = true;
+
+    // Cancel it before it completes.
+    response.cancel();
+  });
+
+  request.notify("abort", this, function(evt) {
+    abort = true;
+  });
+
+  request.notify("loadend", this, function(evt) {
+    loadend = true;
+
+    ok(loadstart, "Received a loadstart event.");
+    ok(progress, "Received a progress event.");
+    ok(abort, "Received an abort event.");
+    ok(!load, "Did not receive a load event.");
+    ok(loadend, "Received a loadend event.");
+    ok(!error, "Did not receive an error event.");
+    ok(!timeout, "Did not receive a timeout event.");
+    equals(status, undefined, "Did not receive a status notification.");
+
+    window.start();
+  });
+
+  request.notify(this, function(response) {
+    status = response.status;
+  });
+
+  response = request.send();
+
+  stop(); // stops the test runner - wait for response
+});
+
+test("Test upload event listeners on successful request.", function() {
+  var abort = false,
+    body = {},
+    error = false,
+    load = false,
+    loadend = false,
+    loadstart = false,
+    progress = false,
+    response,
+    status,
+    timeout = false;
+
+  // Use a POST request
+  request = SC.Request.postUrl('/');
+
+  request.notify("upload.loadstart", this, function(evt) {
+    loadstart = true;
+  });
+
+  request.notify("upload.progress", this, function(evt) {
+    progress = true;
+  });
+
+  request.notify("upload.load", this, function(evt) {
+    load = true;
+  });
+
+  request.notify("upload.loadend", this, function(evt) {
+    loadend = true;
+  });
+
+  request.notify(200, this, function(response) {
+    status = response.status;
+
+    ok(loadstart, "Received a loadstart event.");
+    ok(progress, "Received a progress event.");
+    ok(load, "Received a load event.");
+    ok(loadend, "Received a loadend event.");
+    ok(!abort, "Did not receive an abort event.");
+    ok(!error, "Did not receive an error event.");
+    ok(!timeout, "Did not receive a timeout event.");
+    equals(status, 200, "Received a response with status 200.");
+
+    window.start();
+  });
+
+  // Make a significant body object.
+  var i;
+  for (i = 10000; i >= 0; i--) {
+    body['k' + i] = 'v' + i;
+  }
+
+  response = request.send(body);
+
+  stop() ; // stops the test runner - wait for response
+});

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -420,7 +420,7 @@ SC.detectBrowser = function(userAgent, language) {
   /** @deprecated Since version 1.7. Use browser.name.  See SC.BROWSER for possible values.
     Possible values:
 
-      - 'msie'
+      - 'ie'
       - 'mozilla'
       - 'chrome'
       - 'safari'

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js

@@ -63,8 +63,14 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
     If you set this property to a key name, array of key names, or a function,
     then then ArrayController will automatically reorder your content array
-    to match the sort order.  (If you set a function, the function will be
-    used to sort).
+    to match the sort order.  When using key names, you may specify the
+    direction of the sort by appending ASC or DESC to the key name.  By default
+    sorting is done in ascending order.
+
+    For example,
+
+        myController.set('orderBy', 'title DESC');
+        myController.set('orderBy', ['lastName ASC', 'firstName DESC']);
 
     Normally, you should only use this property if you set the content of the
     controller to an unordered enumerable such as SC.Set or SC.SelectionSet.
@@ -373,18 +379,27 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
     // generate comparison function if needed - use orderBy
     func = func || function(a,b) {
-      var status, key, match, descending;
+      var status, key, match, valueA, valueB;
 
       for(var i=0, l=orderBy.get('length'); i<l && !status; i++) {
         key = orderBy.objectAt(i);
 
-        match = key.match(/^(ASC )?(DESC )?(.*)$/);
-        key = match[3]; order = match[2] ? -1 : 1;
-
-        if (a) { a = a.isObservable ? a.get(key) : a[key]; }
-        if (b) { b = b.isObservable ? b.get(key) : b[key]; }
-
-        status = SC.compare(a, b) * order;
+        if (key.search(/(ASC|DESC)/) === 0) {
+          //@if(debug)
+          SC.warn("Developer Warning: SC.ArrayController's orderBy direction syntax has been changed to match that of SC.Query and MySQL.  Please change your String to 'key DESC' or 'key ASC'.  Having 'ASC' or 'DESC' precede the key has been deprecated.");
+          //@endif
+          match = key.match(/^(ASC )?(DESC )?(.*)$/);
+          key = match[3];
+        } else {
+          match = key.match(/^(\S*)\s*(DESC)?(?:ASC)?$/);
+          key = match[1];
+        }
+        order = match[2] ? -1 : 1;
+
+        if (a) { valueA = a.isObservable ? a.get(key) : a[key]; }
+        if (b) { valueB = b.isObservable ? b.get(key) : b[key]; }
+
+        status = SC.compare(valueA, valueB) * order;
       }
 
       return status ;
@@ -519,6 +534,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     // of knowing which indices changed. Instead, we just
     // invalidate the whole array.
     this.arrayContentDidChange(0, oldlen, newlen);
+    this.enumerableContentDidChange(0, oldlen - 1);
     this.endPropertyChanges();
     this.updateSelectionAfterContentChange();
   }.observes('orderBy'),