sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/animation/tests/core.js

@@ -3,12 +3,18 @@
 // ==========================================================================
 
 /*globals module test ok isObj equals expects */
-var view, base, inherited;
+var view, base, inherited, pane, computed;
 module("Animatable", {
   setup: function() {
+    SC.RunLoop.begin();
+    pane = SC.Pane.create({
+      layout: { top: 0, right: 0, width: 200, height: 200 }
+    });
+    pane.append();
+    
     view = SC.View.create(SC.Animatable, { 
       layout: { left: 100, top: 100, height: 100, width: 100 },
-      style: { opacity: .5 },
+      style: { opacity: 0.5 },
       transitions: {
         left: 0.25,
         top: { duration: 0.35 },
@@ -16,6 +22,7 @@ module("Animatable", {
         style: { opacity: 1 }
       }
     });
+    pane.appendChild(view);
     
     // identical to normal view above
     base = SC.View.extend(SC.Animatable, { 
@@ -33,6 +40,20 @@ module("Animatable", {
         left: 0.99
       }
     });
+    
+    // computed
+    computed = base.create({
+      _test_left: 5,
+      layout: function() {
+        return { left: this._test_left, top: 5, width: 50, height: 50 };
+      }.property("_test_left").cacheable()
+    });
+    
+    SC.RunLoop.end();
+  },
+
+  teardown: function(){
+    pane.remove();
   }
 });
 
@@ -66,25 +87,66 @@ test("animatable should handle concatenated transitions properly", function(){
 });
 
 test("animatable handler for layer update should ensure both layout and styles are set in the 'current style'.", function() {
-  var original_transition_enabled = SC.Animatable.enableCSSTransitions;
-  SC.Animatable.enableCSSTransitions = NO;
+  var original_transition_enabled = SC.platform.supportsCSSTransitions;
+  SC.platform.supportsCSSTransitions = NO;
   
-  // check current style (should be none yet)
+  // we should have a style (it is inside a pane)
   var current = view.getCurrentJavaScriptStyles();
-  equals(current, null, "There should be no current style yet.");
-  
-  // create the layer
-  view.createLayer();
-  view.updateLayer();
-  
-  // check again. Now, we should have a style
-  current = view.getCurrentJavaScriptStyles();
   ok(!SC.none(current), "There now SHOULD be a current JS style.");
   
   // and now, make sure we have both style AND layout set properly.
-  equals(current["opacity"], .5, "opacity should be .5");
+  equals(current["opacity"], 0.5, "opacity should be .5");
   equals(current["left"], 100, "left should be 100");
   
   // go back to the beginning
-  SC.Animatable.enableCSSTransitions = original_transition_enabled;
-});
+  SC.platform.supportsCSSTransitions = original_transition_enabled;
+});
+
+test("animatable callbacks work in general", function(){
+  SC.RunLoop.begin();
+  view.transitions["left"] = {
+    duration: 0.25,
+    action: function() {
+      start();
+      ok(true, "Callback was called.");
+    }
+  };
+  view.updateLayout();
+  view.adjust("left", 0).updateLayout();
+  SC.RunLoop.end();
+  stop();
+  
+  setTimeout(function(){
+    start();
+    ok(false, "Timeout! Callback was not called.");
+  }, 1000);
+  
+});
+
+test("animation should not interfere with layout property observers or frame", function(){
+  SC.RunLoop.begin();
+  
+  // sanity check
+  equals(view.get("layout").left, 100, "layout left before adjust");
+  equals(view.get("frame").x, 100, "frame x before adjust");
+  
+  // adjust left
+  view.adjust("left", 0).updateLayout();
+
+  // check values
+  equals(view.get("layout").left, 0, "layout left after adjust");
+  equals(view.get("frame").x, 0, "frame x after adjust");
+  SC.RunLoop.end();
+});
+
+test("animation should not interfere with computed layout properties.", function() {
+  equals(computed.get("layout").left, 5, "layout left before change and animation");
+  computed.adjust("left", 20);
+  equals(computed.get("layout").left, 5, "layout left after change (shouldn't change)");
+  computed.updateLayout();
+  equals(computed.get("layout").left, 5, "layout left after updateLayout");
+  computed.set("_test_left", 21);
+  equals(computed.get("layout").left, 21, "layout left after setting _test_left (make sure computed property is undisturbed)");
+});
+
+// test("doesn't interfere with built-in animation");

data/frameworks/sproutcore/frameworks/bootstrap/core.js

@@ -2,6 +2,6 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 

data/frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js

@@ -2,9 +2,11 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // sc_resource('setup_body_class_names'); // publish into inline format
 
+// sc_require("system/loader");
+
 if (SC.setupBodyClassNames) SC.setupBodyClassNames() ;

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

@@ -2,14 +2,14 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 var SC = SC || { BUNDLE_INFO: {}, LAZY_INSTANTIATION: {} };
 
 SC.browser = (function() {
-  var userAgent = navigator.userAgent.toLowerCase();
-  var version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
+  var userAgent = navigator.userAgent.toLowerCase(),
+      version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
 
   var browser = {
     version: version,
@@ -18,11 +18,12 @@ SC.browser = (function() {
     msie: (/msie/).test( userAgent ) && !(/opera/).test( userAgent ) ? version : 0,
     mozilla: (/mozilla/).test( userAgent ) && !(/(compatible|webkit)/).test( userAgent ) ? version : 0,
     mobileSafari: (/apple.*mobile.*safari/).test(userAgent) ? version : 0,
+    chrome: (/chrome/).test( userAgent ) ? version : 0,
     windows: !!(/(windows)/).test(userAgent),
     mac: !!((/(macintosh)/).test(userAgent) || (/(mac os x)/).test(userAgent)),
     language: (navigator.language || navigator.browserLanguage).split('-', 1)[0]
   };
   
-    browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.safari ? 'safari' : browser.opera ? 'opera' : 'unknown' ;
+  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.safari ? 'safari' : browser.opera ? 'opera' : 'unknown' ;
   return browser ;
 })();

data/frameworks/sproutcore/frameworks/bootstrap/system/loader.js

@@ -2,9 +2,11 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+// sc_require("system/browser");
+
 SC.bundleDidLoad = function(bundle) {
   var info = this.BUNDLE_INFO[bundle] ;
   if (!info) info = this.BUNDLE_INFO[bundle] = {} ;
@@ -40,7 +42,8 @@ SC.setupBodyClassNames = function() {
   if(borderRad) classNames.push('border-rad');
   classNames.push(browser) ;
   classNames.push(platform) ;
-  if (SC.browser.msie==7) classNames.push('ie7') ;
+  if (parseInt(SC.browser.msie,0)==7) classNames.push('ie7') ;
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;
+  if ('createTouch' in document) classNames.push('touch');
   el.className = classNames.join(' ') ;
 } ;

data/frameworks/sproutcore/frameworks/core_tools/data_source.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals CoreTools */
 

data/frameworks/sproutcore/frameworks/datastore/core.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // Place any global constants here

data/frameworks/sproutcore/frameworks/datastore/data_sources/cascade.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('data_sources/data_source');

data/frameworks/sproutcore/frameworks/datastore/data_sources/data_source.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 

data/frameworks/sproutcore/frameworks/datastore/data_sources/fixtures.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('data_sources/data_source');

data/frameworks/sproutcore/frameworks/datastore/debug/json.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // 50 JSON records.

data/frameworks/sproutcore/frameworks/datastore/debug/standard_setup.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Apple Inc. and contributors.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test json0_9 json10_19 json20_29 json30_39 json40_49 */
 

data/frameworks/sproutcore/frameworks/datastore/models/child_attribute.js

@@ -0,0 +1,122 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2010 Evin Grano
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+sc_require('models/record');
+sc_require('models/record_attribute');
+
+/** @class
+  
+  ChildAttribute is a subclass of RecordAttribute and handles to-one 
+  relationship for child record
+  
+  When setting ( .set() ) the value of a toMany attribute, make sure
+  to pass in an array of SC.Record objects.
+  
+  There are many ways you can configure a ManyAttribute:
+  
+  {{{
+    contacts: SC.ChildAttribute.attr('SC.Child');
+  }}}
+  
+  @extends SC.RecordAttribute
+  @since SproutCore 1.0
+*/
+SC.ChildAttribute = SC.RecordAttribute.extend(
+  /** @scope SC.ChildAttribute.prototype */ {
+    
+  isChildRecordTransform: YES,
+      
+  // ..........................................................
+  // LOW-LEVEL METHODS
+  //
+  
+  /**  @private - adapted for to many relationship */
+  toType: function(parentRecord, key, hash) {
+    var ret   = null,
+        cacheKey  = SC.keyFor('__kid__', SC.guidFor(this)),
+        recordType  = this.get('typeClass');
+    
+    if (parentRecord[cacheKey]) return parentRecord[cacheKey];
+    
+    if (!parentRecord) {
+      throw 'SC.Child: Error during transform: Unable to retrieve parent record.';
+    }
+
+    // If no hash, return null.
+    if (hash){
+      // Get the record type.
+      var childNS = parentRecord.get('childRecordNamespace');
+      if (hash.type && !SC.none(childNS)) {
+        recordType = childNS[hash.type];
+      }
+
+      if (!recordType || SC.typeOf(recordType) !== SC.T_CLASS) {
+        throw 'SC.Child: Error during transform: Invalid record type.';
+      }
+      // Create an instance of the record by registering it with the parent and return.
+      ret = parentRecord[cacheKey] = parentRecord.registerChildRecord(recordType, hash);
+    }
+    return ret;
+  },
+  
+  // Default fromType is just returning itself
+  fromType: function(record, key, value){
+    return value;
+  },
+    
+  /**
+    The core handler.  Called from the property.
+    
+    @param {SC.Record} record the record instance
+    @param {String} key the key used to access this attribute on the record
+    @param {Object} value the property value if called as a setter
+    @returns {Object} property value
+  */
+  call: function(record, key, value) {
+    var attrKey = this.get('key') || key,
+        cacheKey = SC.keyFor('__kid__', SC.guidFor(this)), 
+        nvalue;
+    if (value !== undefined) {
+      // careful: don't overwrite value here.  we want the return value to 
+      // cache.
+      this.orphan(record);
+      nvalue = this.fromType(record, key, value) ; // convert to attribute.
+      record[cacheKey] = null;
+      record.writeAttribute(attrKey, nvalue);
+      value = this.toType(record, key, value); // need to convert to the child record for caching
+    } else {
+      value = record.readAttribute(attrKey);
+      if (SC.none(value) && (value = this.get('defaultValue'))) {
+        if (typeof value === SC.T_FUNCTION) {
+          value = this.defaultValue(record, key, this);
+          // write default value so it doesn't have to be executed again
+          if(record.attributes()) record.writeAttribute(attrKey, value, true);
+        }
+      } else value = this.toType(record, key, value);
+    }
+
+    return value ;
+  },
+  
+  orphan: function(parentRecord){
+    var cacheKey = SC.keyFor('__kid__', SC.guidFor(this)),
+        store, storeKey, attrs, key, param, cRef;
+    cRef = parentRecord ? parentRecord[cacheKey] : null;
+    if (cRef) {
+      attrs = cRef.get('readOnlyAttributes');
+      for(key in attrs) {
+        param = cRef[key];
+        // Orphan all the child record and child records in a tree to clean up the store
+        if(param && param.isChildRecordTransform) param.orphan(parentRecord);
+      }
+      store = cRef.get('store');
+      if(store) storeKey = cRef.storeKey;
+      if(storeKey) store.unloadRecord(undefined, undefined, storeKey);
+    }
+  }
+});
+
+

data/frameworks/sproutcore/frameworks/datastore/models/child_record.js

@@ -0,0 +1,105 @@
+// ..........................................................
+// SC.ChildRecord
+// 
+
+sc_require('core');
+sc_require('models/record');
+sc_require('system/query'); // FIXME: [EG] some wonky build order crap here...
+
+/**
+ * An extension of SC.Record. We use this as the superclass for child record types 
+ *
+ * @extends SC.Record
+ * @author Evin Grano
+ * @author Sean Eidemiller
+ *
+ * @version Sproutcore 1.0
+ * @since Sproutcore 1.0
+ */
+ 
+SC.ChildRecord = SC.Record.extend(
+  /** @scope SC.ChildRecord.prototype */ {
+  
+  /**
+   * This is a check to see if this is a ChildRecord
+   */
+  isChildRecord: YES,
+  
+  /**
+   * The type of the child record.
+   *
+   * This will be set by subclasses that require a type attribute.
+   */
+  type: null,
+  
+  /**
+   *
+   */
+  primaryKey: 'childRecordKey',
+  
+  /**
+   * The immediate parent of the child record.
+   */
+  _parentRecord: null,
+  
+  /**
+    All child records will have a life cycle that mirrors as they are created or 
+    loaded into memory, modified, committed and finally destroyed.  This life 
+    cycle is managed by the status property on your record. 
+
+    The status of a record is modelled as a finite state machine.  Based on the 
+    current state of the record, you can determine which operations are 
+    currently allowed on the record and which are not.
+    
+    In general, a record can be in one of five primary states; SC.Record.EMPTY,
+    SC.Record.BUSY, SC.Record.READY, SC.Record.DESTROYED, SC.Record.ERROR. 
+    These are all described in more detail in the class mixin (in record.js) where 
+    they are defined.
+    
+    @property {Number}
+  */
+  status: function() {
+    var pStatus = SC.Record.EMPTY;
+    if (this._parentRecord) {
+      pStatus = this._parentRecord.get('status');
+      this.store.writeStatus(this.storeKey, pStatus);
+      this.store.dataHashDidChange(this.storeKey);
+    } else {
+      pStatus = this.store.readStatus(this.storeKey);
+    }
+    return pStatus;
+  }.property('storeKey').cacheable(),
+  
+  
+  /**
+   * Marks the record as dirty.
+   *
+   * Invokes the parent's recordDidChange() function until it gets to an SC.Record instance, at
+   * which point the record is marked as dirty in the store.
+   */
+  recordDidChange: function() {
+    if (this._parentRecord && this._parentRecord.recordDidChange) {
+      this._parentRecord.recordDidChange();
+    }
+    else{
+      sc_super();
+    }
+  },
+  
+  /**
+   * Creates a new child record using the parent of *this* child record.
+   * all the way up to the base parent record.  This is to give access to 
+   * all the children in a root parent tree  
+   */
+  createChildRecord: function(recordType, hash) {
+    var ret, myParent = this._parentRecord;
+  
+    if (myParent) {
+      ret = myParent.createChildRecord(recordType, hash);
+    } else {
+      ret = sc_super();
+    }
+  
+    return ret;
+  }  
+});