sproutcore 1.4.5 → 1.5.0.pre.3

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

@@ -61,8 +61,8 @@ SC.Animatable = {
   },
 
   // properties that adjust should relay to style
-  _styleProperties: [ "opacity", "display", "transform" ],
-  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY'.w(),
+  _styleProperties: [ "display", "transform" ],
+  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY opacity'.w(),
 
   // we cache this dictionary so we don't generate a new one each time we make
   // a new animation. It is used so we can start the animations in order—
@@ -84,6 +84,12 @@ SC.Animatable = {
     this._animatable_original_willRemoveFromParent = this.willRemoveFromParent || function(){};
     this.willRemoveFromParent = this._animatable_will_remove_from_parent;
 
+    this._animatable_original_hasAcceleratedLayer = this.hasAcceleratedLayer || function(){};
+    this.hasAcceleratedLayer = this._animatable_hasAcceleratedLayer;
+
+    this._animatable_original_animate = this.animate || function(){};
+    this.animate = this._animatable_animate;
+
     // auto observers do not work when mixed in live, so make sure we do a manual observer
     this.addObserver("style", this, "styleDidChange");
 
@@ -116,7 +122,8 @@ SC.Animatable = {
     this._animators = {}; // keyAnimated => object describing it.
     this._animatableSetCSS = "";
     this._last_transition_css = ""; // to keep from re-setting unnecessarily
-    this._disableAnimation = 0; // calls to disableAnimation add one; enableAnimation remove one.
+    // Setting this conditionally allows us to disableAnimation in the init method, before initMixin gets called
+    if (this._disableAnimation === undefined) this._disableAnimation = 0; // calls to disableAnimation add one; enableAnimation remove one.
     this._transitionCallbacks = {}; // define callback set
 
     // alert if layer already created
@@ -199,7 +206,7 @@ SC.Animatable = {
       dictionary = SC.clone(dictionary);
     }
 
-    var style = SC.clone(this.get("style")), didChangeStyle = NO, layout = SC.clone(this.get("layout")), didChangeLayout = NO;
+    var style = SC.clone(this.get('style')), didChangeStyle = NO, layout = SC.clone(this.get('layout')), didChangeLayout = NO;
     var sprops = this._styleProperties;
     for (var i in dictionary)
     {
@@ -227,20 +234,33 @@ SC.Animatable = {
       }
     }
 
-    if (didChangeStyle) this.set("style", style);
-    if (didChangeLayout) this.set("layout", layout);
+    if (didChangeStyle) this.set('style', style);
+    if (didChangeLayout) this.set('layout', layout);
 
     // call base with whatever is leftover
     return this;
   },
 
+  /**
+    Don't interfere with the built-in animate method.
+  */
+  _animatable_animate: function(){
+    this.disableAnimation();
+    var ret = this._animatable_original_animate.apply(this, arguments);
+    this.enableAnimation();
+    return ret;
+  },
 
   transitionEnd: function(evt){
     SC.run(function() {
       var propertyName = evt.originalEvent.propertyName,
           callback = this._transitionCallbacks[propertyName];
 
-      if(callback) SC.Animatable.runCallback(callback);
+      // only callback is animation is not disabled; assume if anim was 
+      // disabled we already invoked the callback..
+      if(callback && this._disableAnimation<=0) {
+        SC.Animatable.runCallback(callback);
+      }
     }, this);
   },
 
@@ -355,7 +375,7 @@ SC.Animatable = {
     top and left transitions have the same duration.
     Not cacheable since transitions may be updated without using a setter.
   */
-  hasAcceleratedLayer: function(){
+  _animatable_hasAcceleratedLayer: function(){
     var leftDuration = this.transitions['left'] && this.transitions['left'].duration,
         topDuration = this.transitions['top'] && this.transitions['top'].duration;
 
@@ -364,7 +384,7 @@ SC.Animatable = {
     } else if ((topDuration || leftDuration) && !SC.platform.supportsCSSTransitions) {
       return NO;
     } else {
-      return sc_super();
+      return this._animatable_original_hasAcceleratedLayer();
     }
   }.property('wantsAcceleratedLayer', 'transitions'),
 
@@ -613,13 +633,6 @@ SC.Animatable = {
 
   },
 
-  _style_opacity_helper: function(style, key, props)
-  {
-    style["opacity"] = props["opacity"];
-    style["mozOpacity"] = props["opacity"]; // older Firefox?
-    style["filter"] = "alpha(opacity=" + props["opacity"] * 100 + ")";
-  },
-
   /**
   @private
   Adjusts display and queues a change for the other properties.
@@ -679,7 +692,6 @@ SC.Animatable = {
   _animatableApplyNonDisplayStyles: function(){
     var layer = this.layer, styles = this.holder._animatableCurrentStyle; // this == timer
     var styleHelpers = {
-      opacity: this.holder._style_opacity_helper
       // more to be added here...
     };
 
@@ -702,6 +714,9 @@ SC.Animatable = {
       else style[i] = styles[i];
     }
 
+    // apply transform
+    if (!SC.empty(transform)) style[SC.platform.cssPrefix+"Transform"] = transform;
+
     // don't want to set because we don't want updateLayout... again.
     if (updateLayout) {
       var prev = this.holder.layout;
@@ -944,7 +959,6 @@ SC.Animatable = {
     if (this.property == "opacity")
     {
       this.style["zoom"] = 1;
-      this.style["filter"] = "alpha(opacity=" + Math.round(value * 20) * 5 + ")";
     }
 
     if (t < e) SC.Animatable.addTimer(this);

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

@@ -14,12 +14,12 @@ module("Animatable", {
     
     view = SC.View.create(SC.Animatable, { 
       layout: { left: 100, top: 100, height: 100, width: 100 },
-      style: { opacity: 0.5 },
+      style: { transform: 'scale(1)' },
       transitions: {
         left: 0.25,
         top: { duration: 0.35 },
         width: { duration: 0.2, timing: SC.Animatable.TRANSITION_EASE_IN_OUT },
-        style: { opacity: 1 }
+        style: { transform: 1 }
       }
     });
     pane.appendChild(view);
@@ -50,8 +50,11 @@ module("Animatable", {
     });
     
     SC.RunLoop.end();
+  },
+
+  teardown: function(){
+    pane.remove();
   }
-  
 });
 
 test("animatable should have init-ed correctly", function(){
@@ -92,7 +95,7 @@ test("animatable handler for layer update should ensure both layout and styles a
   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"], 0.5, "opacity should be .5");
+  equals(current["transform"], 'scale(1)', "transform should be scale(1)");
   equals(current["left"], 100, "left should be 100");
   
   // go back to the beginning
@@ -144,4 +147,6 @@ test("animation should not interfere with computed layout properties.", function
   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/lib/frameworks/sproutcore/frameworks/bootstrap/system/bench.js

@@ -0,0 +1,14 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*global SC_benchmarkPreloadEvents*/
+// sc_require("system/browser")
+if (typeof SC_benchmarkPreloadEvents !== "undefined") {
+  SC.benchmarkPreloadEvents = SC_benchmarkPreloadEvents;
+  SC_benchmarkPreloadEvents = undefined;
+} else {
+  SC.benchmarkPreloadEvents = { headStart: new Date().getTime() };
+}

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

@@ -5,25 +5,32 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-var SC = SC || { BUNDLE_INFO: {}, LAZY_INSTANTIATION: {} };
+var SC = SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
 
-SC.browser = (function() {
-  var userAgent = navigator.userAgent.toLowerCase(),
-      version = (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1] ;
+SC._detectBrowser = function(rawUserAgent, language) {
+  if (rawUserAgent === undefined) rawUserAgent = navigator.userAgent;
+  if (language === undefined) language = navigator.language || navigator.browserLanguage;
+
+  var userAgent = rawUserAgent.toLowerCase(),
+      // Gibberish at the end is to determine when the browser version is done
+      version = (userAgent.match( /.*(?:rv|chrome|webkit|opera|ie)[\/: ](.+?)([ \);]|$)/ ) || [])[1],
+      webkitVersion = (userAgent.match( /webkit\/(.+?) / ) || [])[1];
 
   var browser = {
-    version: version,
-    safari: (/webkit/).test( userAgent ) ? version : 0,
-    opera: (/opera/).test( userAgent ) ? version : 0,
-    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]
+    version:      version,
+    safari:       /webkit/.test(userAgent) ? webkitVersion : 0,
+    opera:        /opera/.test(userAgent) ? version : 0,
+    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) && !/like mac os x/.test(userAgent)),
+    language:     language.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.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : 'unknown' ;
   return browser ;
-})();
+};
+
+SC.browser = SC._detectBrowser();

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

@@ -7,19 +7,6 @@
 
 // sc_require("system/browser");
 
-SC.bundleDidLoad = function(bundle) {
-  var info = this.BUNDLE_INFO[bundle] ;
-  if (!info) info = this.BUNDLE_INFO[bundle] = {} ;
-  info.loaded = true ;
-};
-
-SC.bundleIsLoaded = function(bundle) {
-  var info = this.BUNDLE_INFO[bundle] ;
-  return info ? !!info.loaded : false ;
-};
-
-SC.loadBundle = function() { throw "SC.loadBundle(): SproutCore is not loaded."; };
-
 SC.setupBodyClassNames = function() {
   var el = document.body ;
   if (!el) return ;
@@ -41,6 +28,7 @@ SC.setupBodyClassNames = function() {
   if(shadows) classNames.push('box-shadow');
   if(borderRad) classNames.push('border-rad');
   classNames.push(browser) ;
+  if (browser === 'chrome') classNames.push('safari');
   classNames.push(platform) ;
   if (parseInt(SC.browser.msie,0)==7) classNames.push('ie7') ;
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;

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

@@ -0,0 +1,72 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2010 Strobe Inc. All rights reserved.
+// Author:    Peter Wagenet
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+function testUserAgent(userAgent, matchers) {
+  var browser = SC._detectBrowser(userAgent), key;
+  for (key in matchers) equals(browser[key], matchers[key], "'"+key+"' should be '"+matchers[key]+"'");
+}
+
+test("Chrome", function() {
+  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
+  testUserAgent(userAgent, { version: '9.0.572.1', chrome: '9.0.572.1', safari: '534.12', current: 'chrome' });
+});
+
+test("Safari", function() {
+  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-HK) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0.2 Safari/533.18.5";
+  testUserAgent(userAgent, { version: '533.18.1', safari: '533.18.1', current: 'safari' });
+});
+
+test("Opera", function() {
+  var userAgent;
+  userAgent = "Opera/9.00 (X11; Linux i686; U; pl)";
+  testUserAgent(userAgent, { version: '9.00', opera: '9.00', current: 'opera' });
+
+  userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]";
+  testUserAgent(userAgent, { version: '8.65', opera: '8.65', current: 'opera' });
+});
+
+test("MSIE", function() {
+  var userAgent = "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US))";
+  testUserAgent(userAgent, { version: '9.0', msie: '9.0', current: 'msie' });
+});
+
+test("Mozilla", function() {
+  var userAgent;
+  userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; it; rv:2.0b4) Gecko/20100818";
+  testUserAgent(userAgent, { version: '2.0b4', mozilla: '2.0b4', current: 'mozilla' });
+
+  userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:2.0b7pre) Gecko/20100921 Firefox/4.0b7pre";
+  testUserAgent(userAgent, { version: '2.0b7pre', mozilla: '2.0b7pre', current: 'mozilla' });
+});
+
+test("Mobile Safari", function() {
+  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
+  testUserAgent(userAgent, { version: '532.9', safari: '532.9', mobileSafari: '532.9', current: 'safari' });
+});
+
+test("Unknown", function() {
+  var userAgent = "Mozilla/5.0 (compatible; Konqueror/4.4; Linux) KHTML/4.4.1 (like Gecko) Fedora/4.4.1-1.fc12";
+  testUserAgent(userAgent, { version: undefined, current: 'unknown' });
+});
+
+test("Windows", function(){
+  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8";
+  testUserAgent(userAgent, { windows: true });
+});
+
+test("Mac", function(){
+  var userAgent;
+  userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
+  testUserAgent(userAgent, { mac: true });
+
+  userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
+  testUserAgent(userAgent, { mac: false });
+});
+
+test("Language", function(){
+  equals(SC._detectBrowser(undefined, 'en-US').language, 'en', "should only show base language part");
+});

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

@@ -77,9 +77,9 @@ SC.ChildRecord = SC.Record.extend(
    * 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() {
+  recordDidChange: function(key) {
     if (this._parentRecord && this._parentRecord.recordDidChange) {
-      this._parentRecord.recordDidChange();
+      this._parentRecord.recordDidChange(key);
     }
     else{
       sc_super();

data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -360,7 +360,7 @@ SC.Record = SC.Object.extend(
       
       if(!ignoreDidChange) this.endEditing(key);
     }
-    return this ;  
+    return this ;
   },
   
   /**
@@ -482,7 +482,7 @@ SC.Record = SC.Object.extend(
         store      = this.get('store'), 
         storeKey   = this.get('storeKey'), 
         key, valueForKey, typeClass, recHash, attrValue, normChild,  isRecord,
-        isChild, defaultVal, keyForDataHash;
+        isChild, defaultVal, keyForDataHash, attr;
       
     var dataHash = store.readEditableDataHash(storeKey) || {};
     dataHash[primaryKey] = recordId;
@@ -499,8 +499,12 @@ SC.Record = SC.Object.extend(
           isChild  = valueForKey.isChildRecordTransform;
           if (!isRecord && !isChild) {
             attrValue = this.get(key);
-
             if(attrValue!==undefined || (attrValue===null && includeNull)) {
+              attr = this[key];
+              // if record attribute, make sure we transform with the fromType
+              if(SC.instanceOf(attr, SC.RecordAttribute)) {
+                attrValue = attr.fromType(this, key, attrValue);
+              }
               dataHash[keyForDataHash] = attrValue;
             }
           

data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js

@@ -176,13 +176,42 @@ SC.RecordAttribute = SC.Object.extend(
   */
   toType: function(record, key, value) {
     var transform = this.get('transform'),
-        type      = this.get('typeClass');
+        type      = this.get('typeClass'),
+        children;
     
     if (transform && transform.to) {
       value = transform.to(value, this, type, record, key) ;
+      
+      // if the transform needs to do something when its children change, we need to set up an observer for it
+      if(!SC.none(value) && (children = transform.observesChildren)) {
+        var i, len = children.length,
+        // store the record, transform, and key so the observer knows where it was called from
+        context = {
+          record: record,
+          key: key
+        };
+        
+        for(i = 0; i < len; i++) value.addObserver(children[i], this, this._SCRA_childObserver, context);
+      }
     }
+    
     return value ;
   },
+  
+  /**
+    @private
+    
+    Shared observer used by any attribute whose transform creates a seperate object that needs to write back to the datahash when it changes. For example, when enumerable content changes on a SC.Set attribute, it writes back automatically instead of forcing you to call .set manually.
+    This functionality can be used by setting an array named observesChildren on your transform containing the names of keys to observe.
+    When one of them triggers it will call childDidChange on your transform with the same arguments as to and from.
+  */
+  _SCRA_childObserver: function(obj, key, deprecated, context, rev) {
+    // write the new value back to the record
+    this.call(context.record, context.key, obj);
+    
+    // mark the attribute as dirty
+    context.record.notifyPropertyChange(context.key);
+  },
 
   /** 
     Converts the passed value from the core attribute value.  This will apply 
@@ -293,6 +322,23 @@ SC.RecordAttribute.transforms = {};
   | *to(value, attr, klass, record, key)* | converts the passed value (which will be of the class expected by the attribute) into the underlying attribute value |
   | *from(value, attr, klass, record, key)* | converts the underyling attribute value into a value of the class |
   
+  You can also provide an array of keys to observer on the return value. When any of these change, your from method will be called to write the changed object back to the record. For example:
+  
+  {{{
+  {
+    to: function(value, attr, type, record, key) {
+      if(value) return value.toSet();
+      else return SC.Set.create();
+    },
+  
+    from: function(value, attr, type, record, key) {
+      return value.toArray();
+    },
+  
+    observesChildren: ['[]']
+  }
+  }}}
+  
   @param {Object} klass the type of object you convert
   @param {Object} transform the transform object
   @returns {SC.RecordAttribute} receiver
@@ -346,7 +392,9 @@ SC.RecordAttribute.registerTransform(Array, {
       obj = [];
     }
     return obj;
-  }
+  },
+  
+  observesChildren: ['[]']
 });
 
 /** @private - generic converter for Object */
@@ -393,8 +441,7 @@ SC.RecordAttribute.registerTransform(Date, {
 
   /** @private - convert a string to a Date */
   to: function(str, attr) {
-    if (str === null)
-      return null;
+    if (str === null) return null;
 
     var ret ;
     str = str.toString() || '';
@@ -492,3 +539,18 @@ if (SC.DateTime && !SC.RecordAttribute.transforms[SC.guidFor(SC.DateTime)]) {
   });
   
 }
+
+/**
+  Parses a coreset represented as an array.
+ */
+SC.RecordAttribute.registerTransform(SC.Set, {
+  to: function(value, attr, type, record, key) {
+    return SC.Set.create(value);
+  },
+  
+  from: function(value, attr, type, record, key) {
+    return value.toArray();
+  },
+  
+  observesChildren: ['[]']
+});