sproutcore 1.6.0.beta.3 → 1.6.0.rc.1

data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js

@@ -63,7 +63,8 @@ SC.ContainerView = SC.View.extend(
     @param {SC.View} newContent the new content view or null.
   */
   replaceContent: function(newContent) {
-    this.replaceAllChildren(newContent ? [newContent] : []);
+    this.removeAllChildren() ;
+    if (newContent) this.appendChild(newContent) ;
   },
 
   /** @private */
@@ -83,9 +84,7 @@ SC.ContainerView = SC.View.extend(
   awake: function() {
     sc_super();
     var nowShowing = this.get('nowShowing') ;
-    if (nowShowing && nowShowing.length>0) {
-      this.nowShowingDidChange();
-    }
+    if (nowShowing && nowShowing.length>0) this.nowShowingDidChange();
   },
   
   /**
@@ -117,7 +116,7 @@ SC.ContainerView = SC.View.extend(
     // If it's an uninstantiated view, then attempt to instantiate it.
     // (Uninstantiated views have a create() method; instantiated ones do not.)
     if (SC.typeOf(content) === SC.T_CLASS) {
-      if (content.kindOf(SC.CoreView)) content = content.create();
+      if (content.kindOf(SC.CoreView)) content = this.createChildView(content);
       else content = null;
     } 
     

data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js

@@ -112,7 +112,7 @@ SC.LabelView = SC.View.extend(SC.Control, SC.InlineEditable,
   /**
     Set the alignment of the label view.
     
-    @property {String} SC.ALIGN_LEFT|SC.ALIGN_MIDDLE|SC.ALIGN_RIGHT
+    @property {String} SC.ALIGN_LEFT|SC.ALIGN_CENTER|SC.ALIGN_RIGHT
     @default null
     @deprecated
   */

data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js

@@ -245,9 +245,9 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (continuouslyUpdatesValue !== null && continuouslyUpdatesValue !== undefined) {
       this.set('applyImmediately',  continuouslyUpdatesValue);
 
-      //@ if (debug)
+      // @if (debug)
       SC.Logger.warn("SC.TextFieldView#continuouslyUpdatesValue is deprecated. Please use #applyImmediately instead.");
-      //@ endif
+      // @endif
     }
     
     return sc_super();
@@ -526,7 +526,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     
     //Adding this to differentiate between older and newer versions of safari
     //since the internal default field padding changed 
-    isOldSafari= (parseInt(SC.browser.webkit,0)<532);
+    isOldSafari= SC.browser.isWebkit && (parseInt(SC.browser.webkit,0)<532);
     context.setClass('oldWebKitFieldPadding', isOldSafari);
     
     spellCheckString = spellCheckEnabled ? ' spellcheck="true"' : ' spellcheck="false"';
@@ -775,14 +775,14 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
       // passing the original event here instead that was potentially set from
       // loosing the responder on the inline text editor so that we can
       // use it for the delegate to end editing
-      this.fieldDidBlur(this._origEvent);
+      this.fieldDidBlur(this._origEvent || evt);
       var val = this.get('value');
       if(!SC.platform.input.placeholder && ((!val) || (val && val.length===0))) {
         this._hintON = YES;
       }
     }, this);
   },
-  
+
   fieldDidFocus: function(evt) {
     this.becomeFirstResponder();
 

data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js

@@ -6,6 +6,8 @@
 // ==========================================================================
 
 /**
+  @class
+
   SC.routes manages the browser location. You can change the hash part of the
   current location. The following code
   
@@ -35,7 +37,8 @@
   SC.routes also supports HTML5 history, which uses a '/' instead of a '#'
   in the URLs, so that all your website's URLs are consistent.
 */
-SC.routes = SC.Object.create({
+SC.routes = SC.Object.create(
+  /** @scope SC.routes.prototype */{
   
   /**
     Set this property to YES if you want to use HTML5 history, if available on
@@ -387,8 +390,8 @@ SC.routes = SC.Object.create({
       delete params.route;
       delete params.params;
       route = firstRoute.routeForParts(location.split('/'), params);
-      if (route && route.target && route.method) {
-        route.method.call(route.target, params);
+      if (route && route.method) {
+        route.method.call(route.target || this, params);
       }
     }
   },

data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js

@@ -169,6 +169,17 @@ module('SC.routes defined routes', {
   
 });
 
+test('setting location triggers function when only passed function', function() {
+  var barred = false;
+
+  SC.routes.add('bar', function(params) {
+    barred = true;
+  });
+  SC.routes.set('location', 'bar');
+
+  ok(barred, 'Function was called');
+});
+
 test('setting location simply triggers route', function() {
   SC.routes.add("foo", router, "triggerRoute");
   SC.routes.set('location', 'bar');

data/lib/frameworks/sproutcore/frameworks/runtime/core.js

@@ -36,7 +36,7 @@ if (typeof console === 'undefined') {
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0.beta.3
+  @version 1.6.0.rc.1
   @namespace
 
   All SproutCore methods and functions are defined
@@ -57,7 +57,7 @@ if (typeof console === 'undefined') {
 window.SC = window.SC || {} ;
 window.SproutCore = window.SproutCore || SC ;
 
-SC.VERSION = '1.6.0.beta.3';
+SC.VERSION = '1.6.0.rc.1';
 
 /**
   @private

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js

@@ -662,7 +662,7 @@ SC.CoreArray = /** @lends SC.Array.prototype */ {
         chain.notifyPropertyDidChange();
 
         for (idx = 0; idx < len; idx++) {
-          item = removedObjects[idx];
+          item = removedObjects.objectAt(idx);
           clonedChain = item[kvoChainList][chainGuid];
           clonedChain.deactivate();
           delete item[kvoChainList][chainGuid];
@@ -691,7 +691,7 @@ SC.CoreArray = /** @lends SC.Array.prototype */ {
 
         len = addedObjects.get('length');
         for (idx = 0; idx < len; idx++) {
-          this._clonePropertyChainToItem(chain, addedObjects[idx]);
+          this._clonePropertyChainToItem(chain, addedObjects.objectAt(idx));
         }
       }, this);
     }

data/lib/frameworks/sproutcore/frameworks/runtime/private/property_chain.js

@@ -151,7 +151,7 @@ SC._PropertyChain = SC.Object.extend(
     }
   },
 
-  //@ if (debug)
+  // @if (debug)
   /**
     Returns a string representation of the chain segment.
 
@@ -161,7 +161,7 @@ SC._PropertyChain = SC.Object.extend(
     return "SC._PropertyChain(target: %@, property: %@)".fmt(
       this.get('target'), this.get('property'));
   }
-  //@ endif
+  // @endif
 });
 
 SC._PropertyChain.createChain = function(path, target, toInvalidate) {

data/lib/frameworks/sproutcore/frameworks/runtime/system/error.js

@@ -124,7 +124,7 @@ SC.$error = function(description, label, value, c) {
 } ;
 
 /**
-  Returns YES if the passed value is an error object or false.
+  Returns NO if the passed value is an error object or false.
 
   @param {Object} ret object value
   @returns {Boolean}

data/lib/frameworks/sproutcore/frameworks/runtime/system/logger.js

@@ -710,7 +710,7 @@ SC.Logger = SC.Object.create(
         type         = entry.type;
 
         if (includeTimestamps) {
-          timestampStr = timestampFormat.fmt(entry.timestamp.utcFormat());
+          timestampStr = timestampFormat.fmt(entry.timestamp.toUTCString());
         }
 
         // Is this a message or a group directive?
@@ -797,7 +797,7 @@ SC.Logger = SC.Object.create(
         type  = entry.type;
 
         // First determine the prefix.
-        prefix = timestampFormat.fmt(entry.timestamp.utcFormat());
+        prefix = timestampFormat.fmt(entry.timestamp.toUTCString());
         prefix += prefixMapping[type] || "";
 
         // Is this a message or a group directive?

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -456,9 +456,9 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   */
   design: function() {
     if (this.isDesign) {
-      //@ if (debug)
+      // @if (debug)
       SC.Logger.warn("SC.Object#design called twice for %@.".fmt(this));
-      //@ endif
+      // @endif
       return this;
     }
 

data/lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js

@@ -1,6 +1,7 @@
 // ==========================================================================
 // Project:   SC.Statechart - A Statechart Framework for SproutCore
 // Copyright: ©2010, 2011 Michael Cohen, and contributors.
+//            Portions @2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -29,13 +30,13 @@ SC.StatechartMonitor = SC.Object.extend({
   
   pushEnteredState: function(state) {
     this.propertyWillChange('length');
-    this.sequence.push({ entered: state });
+    this.sequence.push({ action: 'entered', state: state });
     this.propertyDidChange('length'); 
   },
   
   pushExitedState: function(state) {
     this.propertyWillChange('length');
-    this.sequence.push({ exited: state });
+    this.sequence.push({ action: 'exited', state: state });
     this.propertyDidChange('length');
   },
   
@@ -73,12 +74,7 @@ SC.StatechartMonitor = SC.Object.extend({
     len = this.sequence.length;
     for (i = 0; i < len; i += 1) {
       item = this.sequence[i];
-      if (item.exited) {
-        seq += "exited %@".fmt(item.exited.get('fullPath'));
-      } 
-      else if (item.entered) {
-        seq += "entered %@".fmt(item.entered.get('fullPath'));
-      } 
+      seq += "%@ %@".fmt(item.action, item.state.get('fullPath'));
       if (i < len - 1) seq += ", ";
     }
 
@@ -87,69 +83,4 @@ SC.StatechartMonitor = SC.Object.extend({
     return seq;
   }
   
-});
-
-SC.StatechartSequenceMatcher = SC.Object.extend({
-  
-  statechartMonitor: null,
-  
-  position: 0,
-  
-  match: YES,
-  
-  begin: function() {
-    this.position = -1;
-    this.match = YES;
-    return this;
-  },
-  
-  end: function() {
-    return this.match;
-  },
-  
-  entered: function() {
-    return this._doCheck('entered', arguments);
-  },
-  
-  exited: function() {
-    return this._doCheck('exited', arguments);
-  },
-  
-  _doCheck: function(event, args) {
-    var i = 0,
-        len = args.length,
-        seqItem = null,
-        arg = null,
-        seq = this.statechartMonitor.sequence;
-        
-    for (; i < len; i += 1) {
-      this.position += 1;
-  
-      if (this.position >= seq.length) {
-        this.match = NO;
-        return this;
-      }
-      
-      seqItem = seq[this.position];
-      if (!seqItem[event]) {
-        this.match = NO;
-        return this;
-      }
-      
-      arg = args[i];
-      if (SC.typeOf(arg) === SC.T_OBJECT) {
-        if (seqItem[event] !== arg) {
-          this.match = NO;
-          return this;
-        }
-      } 
-      else if (seqItem[event].get('name') !== arg) {
-        this.match = NO;
-        return this;
-      }
-    }
-  
-    return this;
-  }
-  
 });

data/lib/frameworks/sproutcore/frameworks/statechart/debug/sequence_matcher.js

@@ -0,0 +1,189 @@
+// ==========================================================================
+// Project:   SC.Statechart - A Statechart Framework for SproutCore
+// Copyright: ©2010, 2011 Michael Cohen, and contributors.
+//            Portions @2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*globals SC */
+
+SC.StatechartSequenceMatcher = SC.Object.extend({
+  
+  statechartMonitor: null,
+  
+  match: null,
+  
+  MISMATCH: {},
+  
+  begin: function() {
+    this._stack = [];
+    this.beginSequence();
+    this._start = this._stack[0];
+    return this;
+  },
+  
+  end: function() {
+    this.endSequence();
+    
+    if (this._stack.length > 0) {
+      throw "can not match sequence. sequence matcher has been left in an invalid state";
+    }
+    
+    var monitor = this.statechartMonitor,
+        result = this._matchSequence(this._start, 0) === monitor.sequence.length;
+
+    this.set('match', result);
+    
+    return result;
+  },
+  
+  entered: function() {
+    this._addStatesToCurrentGroup('entered', arguments);
+    return this;
+  },
+  
+  exited: function() {
+    this._addStatesToCurrentGroup('exited', arguments);
+    return this;
+  },
+  
+  beginConcurrent: function() {
+    var group = {
+      type: 'concurrent',
+      values: []
+    };
+    if (this._peek()) this._peek().values.push(group);
+    this._stack.push(group);
+    return this;
+  },
+  
+  endConcurrent: function() {
+    this._stack.pop();
+    return this;
+  },
+  
+  beginSequence: function() {
+    var group = {
+      type: 'sequence',
+      values: []
+    };
+    if (this._peek()) this._peek().values.push(group);
+    this._stack.push(group);
+    return this;
+  },
+  
+  endSequence: function() {
+    this._stack.pop();
+    return this;
+  },
+  
+  _peek: function() {
+    var len = this._stack.length;
+    return len === 0 ? null : this._stack[len - 1];
+  },
+  
+  _addStatesToCurrentGroup: function(action, states) {
+    var group = this._peek(), len = states.length, i = 0;
+    for (; i < len; i += 1) {
+      group.values.push({ action: action, state: states[i] });
+    }
+  },
+  
+  _matchSequence: function(sequence, marker) {
+    var values = sequence.values, 
+        len = values.length, 
+        i = 0, val,
+        monitor = this.statechartMonitor;
+        
+    if (len === 0) return marker;
+    if (marker > monitor.sequence.length) return this.MISMATCH;
+        
+    for (; i < len; i += 1) {
+      val = values[i];
+      
+      if (val.type === 'sequence') {
+        marker = this._matchSequence(val, marker);
+      } else if (val.type === 'concurrent') {
+        marker = this._matchConcurrent(val, marker);
+      } else if (!this._matchItems(val, monitor.sequence[marker])){
+        return this.MISMATCH;
+      } else {
+        marker += 1;
+      }
+      
+      if (marker === this.MISMATCH) return this.MISMATCH;
+    }
+    
+    return marker;
+  },
+
+  // A
+  // B (concurrent [X, Y])
+  //   X
+  //     M
+  //     N
+  //   Y
+  //     O
+  //     P
+  // C
+  // 
+  // 0 1  2 3 4   5 6 7  8
+  //      ^       ^
+  // A B (X M N) (Y O P) C
+  //      ^       ^
+  // A B (Y O P) (X M N) C
+  
+  _matchConcurrent: function(concurrent, marker) {
+    var values = SC.clone(concurrent.values), 
+        len = values.length, 
+        i = 0, val, tempMarker = marker, match = false,
+        monitor = this.statechartMonitor;
+        
+    if (len === 0) return marker;
+    if (marker > monitor.sequence.length) return this.MISMATCH;
+    
+    while (values.length > 0) {
+      for (i = 0; i < len; i += 1) {
+        val = values[i];
+      
+        if (val.type === 'sequence') {
+          tempMarker = this._matchSequence(val, marker);
+        } else if (val.type === 'concurrent') {
+          tempMarker = this._matchConcurrent(val, marker);
+        } else if (!this._matchItems(val, monitor.sequence[marker])){
+          tempMarker = this.MISMATCH;
+        } else {
+          tempMarker = marker + 1;
+        }
+      
+        if (tempMarker !== this.MISMATCH) break;
+      }
+      
+      if (tempMarker === this.MISMATCH) return this.MISMATCH;
+      values.removeAt(i);
+      len = values.length;
+      marker = tempMarker;
+    }
+    
+    return marker;
+  },
+  
+  _matchItems: function(matcherItem, monitorItem) {
+    if (!matcherItem || !monitorItem) return false;
+  
+    if (matcherItem.action !== monitorItem.action) {
+      return false;
+    }
+    
+    if (SC.typeOf(matcherItem.state) === SC.T_OBJECT && matcherItem.state === monitorItem.state) {
+      return true;      
+    }
+    
+    if (matcherItem.state === monitorItem.state.get('name')) {
+      return true;
+    }
+  
+    return false;
+  }
+  
+});