sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/foundation/system/datetime.js

@@ -252,32 +252,34 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
     like the C strftime function.
   
     The format parameter can contain the following characters:
-      %a - The abbreviated weekday name (``Sun'')
-      %A - The full weekday name (``Sunday'')
-      %b - The abbreviated month name (``Jan'')
-      %B - The full month name (``January'')
-      %c - The preferred local date and time representation
-      %d - Day of the month (01..31)
-      %H - Hour of the day, 24-hour clock (00..23)
-      %I - Hour of the day, 12-hour clock (01..12)
-      %j - Day of the year (001..366)
-      %m - Month of the year (01..12)
-      %M - Minute of the hour (00..59)
-      %p - Meridian indicator (``AM'' or ``PM'')
-      %S - Second of the minute (00..60)
-      %U - Week number of the current year,
+      - %a - The abbreviated weekday name (``Sun'')
+      - %A - The full weekday name (``Sunday'')
+      - %b - The abbreviated month name (``Jan'')
+      - %B - The full month name (``January'')
+      - %c - The preferred local date and time representation
+      - %d - Day of the month (01..31)
+      - %h - Hour of the day, 24-hour clock (0..23)
+      - %H - Hour of the day, 24-hour clock (00..23)
+      - %i - Hour of the day, 12-hour clock (1..12)
+      - %I - Hour of the day, 12-hour clock (01..12)
+      - %j - Day of the year (001..366)
+      - %m - Month of the year (01..12)
+      - %M - Minute of the hour (00..59)
+      - %p - Meridian indicator (``AM'' or ``PM'')
+      - %S - Second of the minute (00..60)
+      - %U - Week number of the current year,
           starting with the first Sunday as the first
           day of the first week (00..53)
-      %W - Week number of the current year,
+      - %W - Week number of the current year,
           starting with the first Monday as the first
           day of the first week (00..53)
-      %w - Day of the week (Sunday is 0, 0..6)
-      %x - Preferred representation for the date alone, no time
-      %X - Preferred representation for the time alone, no date
-      %y - Year without a century (00..99)
-      %Y - Year with century
-      %Z - Time zone (ISO 8601 formatted)
-      %% - Literal ``%'' character
+      - %w - Day of the week (Sunday is 0, 0..6)
+      - %x - Preferred representation for the date alone, no time
+      - %X - Preferred representation for the time alone, no date
+      - %y - Year without a century (00..99)
+      - %Y - Year with century
+      - %Z - Time zone (ISO 8601 formatted)
+      - %% - Literal ``%'' character
     
     @param {String} format the format string
     @return {String} the formatted string
@@ -783,7 +785,11 @@ SC.DateTime.mixin(SC.Comparable,
       case 'B': return this.monthNames[this._get('month')-1];
       case 'c': return this._date.toString();
       case 'd': return this._pad(this._get('day'));
+      case 'h': return this._get('hour');
       case 'H': return this._pad(this._get('hour'));
+      case 'i':
+        var hour = this._get('hour');
+        return (hour === 12 || hour === 0) ? 12 : (hour + 12) % 12;
       case 'I': 
         var hour = this._get('hour');
         return this._pad((hour === 12 || hour === 0) ? 12 : (hour + 12) % 12);
@@ -897,7 +903,7 @@ if (SC.RecordAttribute && !SC.RecordAttribute.transforms[SC.guidFor(SC.DateTime)
       Convert a String to a DateTime
     */
     to: function(str, attr) {
-      if (SC.none(str)) return str;
+      if (SC.none(str) || SC.instanceOf(str, SC.DateTime)) return str;
       var format = attr.get('format');
       return SC.DateTime.parse(str, format ? format : SC.DateTime.recordFormat);
     },

data/frameworks/sproutcore/frameworks/foundation/system/event.js

@@ -184,12 +184,12 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
           this.add(e, eventType, target, method, context);
         }, this);
         return this;
-      } else elem = elem.get(0);
+      } else elem = elem[0];
     }
     if (!elem) return this; // nothing to do
     
     // cannot register events on text nodes, etc.
-    if ( elem.nodeType == 3 || elem.nodeType == 8 ) return SC.Event;
+    if ( elem.nodeType === 3 || elem.nodeType === 8 ) return SC.Event;
 
     // For whatever reason, IE has trouble passing the window object
     // around, causing it to be cloned in the process
@@ -260,12 +260,12 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
           this.remove(e, eventType, target, method);
         }, this);
         return this;
-      } else elem = elem.get(0);
+      } else elem = elem[0];
     }
     if (!elem) return this; // nothing to do
     
     // don't do events on text and comment nodes
-    if ( elem.nodeType == 3 || elem.nodeType == 8 ) return SC.Event;
+    if ( elem.nodeType === 3 || elem.nodeType === 8 ) return SC.Event;
 
     // For whatever reason, IE has trouble passing the window object
     // around, causing it to be cloned in the process
@@ -389,18 +389,18 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
           this.trigger(e, eventType, args, donative);
         }, this);
         return this;
-      } else elem = elem.get(0);
+      } else elem = elem[0];
     }
     if (!elem) return this; // nothing to do
 
     // don't do events on text and comment nodes
-    if ( elem.nodeType == 3 || elem.nodeType == 8 ) return undefined;
+    if ( elem.nodeType === 3 || elem.nodeType === 8 ) return undefined;
     
     // Normalize to an array
     args = SC.A(args) ;
 
     var ret, fn = SC.typeOf(elem[eventType] || null) === SC.T_FUNCTION , 
-        event, current, onfoo;
+        event, current, onfoo, isClick;
 
     // Get the event to pass, creating a fake one if necessary
     event = args[0];
@@ -690,7 +690,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
   
   /** @private Take an incoming event and convert it to a normalized event. */
   normalizeEvent: function(event) {
-    if (event == window.event) {
+    if (event === window.event) {
       // IE can't do event.normalized on an Event object
       return SC.Event.create(event) ; 
     } else {
@@ -768,8 +768,16 @@ SC.Event.prototype = {
   normalized: YES,
 
   /** Returns the pressed character (found in this.which) as a string. */
-  getCharString: function() { 
-    return (this.charCode>0) ? String.fromCharCode(this.which) : null;
+  getCharString: function() {
+      if(SC.browser.msie){
+        if(this.keyCode == 8 || this.keyCode == 9 || (this.keyCode>=37 && this.keyCode<=40)){
+          return String.fromCharCode(0);
+        }else{
+          return (this.keyCode>0) ? String.fromCharCode(this.keyCode) : null;  
+        }
+      }else{
+        return (this.charCode>0) ? String.fromCharCode(this.charCode) : null;
+      }
   },
   
   /** Returns character codes for the event.  The first value is the normalized code string, with any shift or ctrl characters added to the begining.  The second value is the char string by itself.

data/frameworks/sproutcore/frameworks/foundation/system/page.js

@@ -41,7 +41,7 @@ SC.Page = SC.Object.extend(
       this[key] = value = value.create({ page: this }) ;
       if (!this.get('inDesignMode')) value.awake() ;
       return value ;
-    } else return sc_super() ;
+    } else return sc_super();
   },
   
   /**
@@ -54,9 +54,10 @@ SC.Page = SC.Object.extend(
   */
   awake: function() {
     // step through all views and build them
-    for(var key in this) {
+    var value, key;
+    for(key in this) {
       if (!this.hasOwnProperty(key)) continue ;
-      var value = this[key] ;
+      value = this[key] ;
       if (value && value.isViewClass) {
         this[key] = value = value.create({ page: this }) ;
       }
@@ -78,9 +79,10 @@ SC.Page = SC.Object.extend(
     Applies a localization to every view builder defined on the page.  You must call this before you construct a view to apply the localization.
   */
   loc: function(locs) {
-    for(var key in locs) {
+    var view, key;
+    for(key in locs) {
       if (!locs.hasOwnProperty(key)) continue ;
-      var view = this[key] ;
+      view = this[key] ;
       if (!view || !view.isViewClass) continue ;
       view.loc(locs[key]);
     }

data/frameworks/sproutcore/frameworks/foundation/system/ready.js

@@ -92,6 +92,7 @@ SC.mixin({
     // Only call once
     if (SC.isReady) return ;
     if (typeof SC.mapDisplayNames === SC.T_FUNCTION) SC.mapDisplayNames();
+    if (typeof SC.addInvokeOnceLastDebuggingInfo === SC.T_FUNCTION) SC.addInvokeOnceLastDebuggingInfo();
      
     // setup locale
     SC.Locale.createCurrentLocale();

data/frameworks/sproutcore/frameworks/foundation/system/render_context.js

@@ -297,6 +297,8 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     var elem = this._elem, 
         mode = this.updateMode,
         key, value, styles, factory, cur, next, before;
+        
+    this._innerHTMLReplaced = NO;
     
     if (!elem) {
       // throw "Cannot update context because there is no source element";
@@ -309,6 +311,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     
     // replace innerHTML
     if (this.length>0) {
+      this._innerHTMLReplaced = YES;
       if (mode === SC.MODE_REPLACE) {
         elem.innerHTML = this.join();
       } else {
@@ -398,9 +401,9 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     // generate opening tag.
     
     // get attributes first.  Copy in className + styles...
-    var tag = this._TAG_ARRAY, pair, joined, key ;
-    var attrs = this._attrs, className = this._classNames ;
-    var id = this._id, styles = this._styles;
+    var tag = this._TAG_ARRAY, pair, joined, key ,
+        attrs = this._attrs, className = this._classNames,
+        id = this._id, styles = this._styles;
     
     // add tag to tag array
     tag[0] = '<';  tag[1] = this._tagName ;
@@ -422,7 +425,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
           pair[1] = styles[key];
           if (pair[1] === null) continue; // skip empty styles
           
-          if(typeof pair[1] === SC.T_NUMBER) pair[1] = "%@px".fmt(pair[1]);
+          if(typeof pair[1] === SC.T_NUMBER) pair[1] = pair[1]+"px";
           joined.push(pair.join(': '));
         }
         attrs.style = joined.join('; ') ;
@@ -482,7 +485,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   },
   
   /**
-    Generates a with the passed options.  Like calling context.begin().end().
+    Generates a tag with the passed options.  Like calling context.begin().end().
     
     @param {String} tagName optional tag name.  default 'div'
     @param {Hash} opts optional tag options.  defaults to empty options.
@@ -695,7 +698,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   // CSS Styles Support
   // 
     
-  _STYLE_REGEX: /\s*([^:\s]+)\s*:\s*([^;\s]+)\s*;?/g,
+  _STYLE_REGEX: /\s*([^:\s]+)\s*:\s*([^;]+)\s*;?/g,
   
   /**
     Retrieves or sets the current styles for the outer tag.  If you retrieve

data/frameworks/sproutcore/frameworks/foundation/system/request.js

@@ -13,7 +13,7 @@ sc_require('system/response');
   Implements support for Ajax requests using XHR, JSON-P and other prototcols.
   
   SC.Request is much like an inverted version of the request/response objects
-  you receive when implement HTTP servers.  
+  you receive when implementing HTTP servers.  
   
   To send a request, you just need to create your request object, configure
   your options, and call send() to initiate the request.
@@ -101,6 +101,21 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
   */
   type: 'GET',
   
+  /**
+    An optional timeout value of the request, in milliseconds.  The timer
+    begins when SC.Response#fire is actually invoked by the request manager
+    and not necessarily when SC.Request#send is invoked.  If this timeout is
+    reached before a response is received, the equivalent of
+    SC.Request.manager#cancel() will be invoked on the SC.Response instance
+    and the didTimeout() callback will be called.
+    
+    An exception will be thrown if you try to invoke send() on a request that
+    has both a timeout and isAsyncronous set to NO.
+    
+    @property {Number}
+  */
+  timeout: null,
+  
   /**
     The body of the request.  May be an object is isJSON or isXML is set,
     otherwise should be a string.
@@ -149,9 +164,9 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
   
   /**
     Invoked when a response has been received but not yet processed.  This is
-    your chance to fixup the response based on the results.  If you don't want
-    to continue processing the response call response.cancel().
-    
+    your chance to fix up the response based on the results.  If you don't
+    want to continue processing the response call response.cancel().
+
     @param {SC.Response} response the response
     @returns {void}
   */
@@ -168,11 +183,21 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
   */
   didReceive: function(request, response) {},
   
+  /**
+    Invoked when a request times out before a response has been received, as
+    determined by the 'timeout' property.  Note that if a request times out,
+    neither willReceive() nor didReceive() will be called.
+
+    @param {SC.Response} response the response
+    @returns {void}
+  */
+  didTimeout: function(request, response) {},
+  
   // ..........................................................
   // HELPER METHODS
   // 
 
-  COPY_KEYS: 'isAsynchronous isJSON isXML address type body responseClass willSend didSend willReceive didReceive'.w(),
+  COPY_KEYS: 'isAsynchronous isJSON isXML address type timeout body responseClass willSend didSend willReceive didReceive'.w(),
   
   /**
     Returns a copy of the current request.  This will only copy certain
@@ -291,6 +316,16 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
     @returns {SC.Response} new response object
   */  
   send: function(body) {
+    // Sanity-check:  Be sure a timeout value was not specified if the request
+    // is synchronous (because it wouldn't work).
+    var timeout = this.get('timeout');
+    if (timeout) {
+      if (!this.get('isAsynchronous')) throw "Timeout values cannot be used with synchronous requests";
+    }
+    else if (timeout === 0) {
+      throw "The timeout value must either not be specified or must be greater than 0";
+    }
+    
     if (body) this.set('body', body);
     return SC.Request.manager.sendRequest(this.copy()._prep());
   },
@@ -343,7 +378,7 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
   notify: function(status, target, action, params) {
     
     // normalize status
-    var hasStatus = YES, params ;
+    var hasStatus = YES ;
     if (SC.typeOf(status) !== SC.T_NUMBER) {
       params = SC.A(arguments).slice(2);
       action = target;

data/frameworks/sproutcore/frameworks/foundation/system/response.js

@@ -173,6 +173,18 @@ SC.Response = SC.Object.extend(
   */
   isCancelled: NO,
   
+  /**
+    Set to YES if the request timed out.  Set to NO if the request has
+    completed before the timeout value.  Set to null if the timeout timer is
+    still ticking.
+  */
+  timedOut: null,
+  
+  /**
+    The timer tracking the timeout
+  */
+  timeoutTimer: null,
+  
   // ..........................................................
   // METHODS
   // 
@@ -183,7 +195,6 @@ SC.Response = SC.Object.extend(
     begin the actual request.
   */
   fire: function() {
-    
     var req = this.get('request'),
         source = req ? req.get('source') : null;
     
@@ -198,6 +209,20 @@ SC.Response = SC.Object.extend(
     // immediately if it is synchronous.
     if (!this.get('isCancelled')) this.invokeTransport();
 
+
+    // If the request specified a timeout value, then set a timer for it now.
+    var timeout = req.get('timeout');
+    if (timeout) {
+      var timer = SC.Timer.schedule({
+        target:   this, 
+        action:   'timeoutReached', 
+        interval: timeout,
+        repeats:  NO
+      });
+      this.set('timeoutTimer', timer);
+    }
+
+
     // if the transport did not cancel the request for some reason, let the
     // source know that the request was sent
     if (!this.get('isCancelled') && source && source.didSend) {
@@ -210,9 +235,9 @@ SC.Response = SC.Object.extend(
   },
   
   /**
-    Invoked by the transport when it receives a response.  The passed 
+    Invoked by the transport when it receives a response.  The passed-in
     callback will be invoked to actually process the response.  If cancelled
-    we will pass NO.  You sould cleanup instead.
+    we will pass NO.  You should clean up instead.
     
     Invokes callbacks on the source request also.
     
@@ -221,25 +246,33 @@ SC.Response = SC.Object.extend(
     @returns {SC.Response} receiver
   */
   receive: function(callback, context) {
-    var req = this.get('request');
-    var source = req ? req.get('source') : null;
-    
-    // invoke the source, giving a chance to fixup the reponse or (more 
-    // likely) cancel the request.
-    if (source && source.willReceive) source.willReceive(req, this);
-    
-    // invoke the callback.  note if the response was cancelled or not
-    callback.call(context, !this.get('isCancelled'));
-    
-    // if we weren't cancelled, then give the source first crack at handling
-    // the response.  if the source doesn't want listeners to be notified,
-    // it will cancel the response.
-    if (!this.get('isCancelled') && source && source.didReceive) {
-      source.didReceive(req, this);
-    }
+    // If we timed out, we should ignore this response.
+    if (!this.get('timedOut')) {
+      // If we had a timeout timer scheduled, invalidate it now.
+      var timer = this.get('timeoutTimer');
+      if (timer) timer.invalidate();
+      this.set('timedOut', NO);
+    
+      var req = this.get('request');
+      var source = req ? req.get('source') : null;
+    
+      // invoke the source, giving a chance to fixup the reponse or (more 
+      // likely) cancel the request.
+      if (source && source.willReceive) source.willReceive(req, this);
+    
+      // invoke the callback.  note if the response was cancelled or not
+      callback.call(context, !this.get('isCancelled'));
+    
+      // if we weren't cancelled, then give the source first crack at handling
+      // the response.  if the source doesn't want listeners to be notified,
+      // it will cancel the response.
+      if (!this.get('isCancelled') && source && source.didReceive) {
+        source.didReceive(req, this);
+      }
 
-    // notify listeners if we weren't cancelled.
-    if (!this.get('isCancelled')) this.notify();
+      // notify listeners if we weren't cancelled.
+      if (!this.get('isCancelled')) this.notify();
+    }
     
     // no matter what, remove from inflight queue
     SC.Request.manager.transportDidClose(this) ;
@@ -252,12 +285,38 @@ SC.Response = SC.Object.extend(
   */
   cancel: function() {
     if (!this.get('isCancelled')) {
-      this.set('isCancelled', YES);
-      this.cancelTransport();
+      this.set('isCancelled', YES) ;
+      this.cancelTransport() ;
       SC.Request.manager.transportDidClose(this) ;
     }
   },
   
+  /**
+    Default method just closes the connection.
+  */
+  timeoutReached: function() {
+    // If we already received a response yet the timer still fired for some
+    // reason, do nothing.
+    if (this.get('timedOut') === null) {
+      this.set('timedOut', YES);
+      this.cancelTransport();
+      SC.Request.manager.transportDidClose(this);
+      
+      // Set our value to an error.
+      var error = SC.$error("HTTP Request timed out", "Request", 408) ;
+      error.set("errorValue", this) ;
+      this.set('isError', YES);
+      this.set('errorObject', error);
+      
+      // Invoke the didTimeout callback.
+      var req = this.get('request');
+      var source = req ? req.get('source') : null;
+      if (!this.get('isCancelled') && source && source.didTimeout) {
+        source.didTimeout(req, this);
+      }
+    }
+  },
+  
   /**
     Override with concrete implementation to actually cancel the transport.
   */
@@ -453,7 +512,13 @@ SC.XHRResponse = SC.Response.extend({
 
         // if there was an error - setup error and save it
         if ((status < 200) || (status >= 300)) {
-          msg = rawRequest.statusText;
+          
+          try {
+            msg = rawRequest.statusText || '';
+          } catch(e2) {
+            msg = '';
+          }
+          
           error = SC.$error(msg || "HTTP Request failed", "Request", status) ;
           error.set("errorValue", this) ;
           this.set('isError', YES);