sproutcore 1.0.1049.pre.2 → 1.4.0.rc

data/lib/frameworks/sproutcore/apps/welcome/english.lproj/main_page.js

@@ -10,55 +10,65 @@ Welcome.mainPage = SC.Page.design({
   // The main pane is made visible on screen as soon as your app is loaded.
   // Add childViews to this pane for views to display immediately on page 
   // load.
-  mainPane: SC.MainPane.design({
-    childViews: 'contentView'.w(),
-    
+  mainPane: SC.PanelPane.design({
+    layout: { width: 360, height: 300, centerX: 0, centerY: 0 },
+
     contentView: SC.View.design({
-      layout: { width: 280, height: 340, centerX: 0, centerY: 0 },
-      childViews: 'heading appSelector launchApplication'.w(),
+      childViews: 'heading prompt icon scrollView button'.w(),
       
-      heading: SC.View.design({
-        layout: { width: 271, centerX: 0, top: 0, height: 60 },
+      icon: SC.View.design({
+        layout: { width: 32, left: 20, top: 18, height: 32 },
         tagName: 'img',
         render: function(context, firstTime) {
-          context.attr('src', sc_static('images/sproutcore'));
+          context.attr('src', sc_static('images/sproutcore-logo'));
         }
       }),
       
-      appSelector: SC.View.design({
-        layout: {top:80, left:0, right:0, bottom:46},
-        childViews: 'scrollView'.w(),
-        classNames: 'app-selector',
+      heading: SC.LabelView.design({
+        layout: { left: 56, top: 20, right: 20, height: 32 },
+        tagName: "h1",
+        classNames: "heading",
+        valueBinding: 'Welcome.displayTitle' 
+      }),
+      
+      prompt: SC.LabelView.design({
+        layout: { left: 20, top: 60, right: 20, height: 20 },
+        escapeHTML: NO,
+        value: "Choose an application:"
+      }),
+      
+      button: SC.ButtonView.design({
+        layout: { bottom: 18, height: 24, width: 140, centerX: 0 },
+        isEnabledBinding: "Welcome.targetsController.canLoadApp",
+
+        title: "Load Application",
+        theme: "capsule",
+        isDefault: YES,
+        
+        target: "Welcome.targetsController",
+        action: "loadApplication"
         
-        scrollView: SC.ScrollView.design({
-          layout: { left: 0, top: 0, right: 0, bottom: 0 },
-          hasHorizontalScroller: NO,
+      }),
+      
+      scrollView: SC.ScrollView.design({
+        layout: { left: 20, top: 80, right: 20, bottom: 63 },
+        hasHorizontalScroller: NO,
         
-          contentView: SC.ListView.design({  
-            rowHeight: 40,
+        contentView: SC.ListView.design({  
+          rowHeight: 32,
 
-            contentBinding: "Welcome.targetsController.appsOnly",
-            selectionBinding: "Welcome.targetsController.selection",
-            isEnabledBinding: "Welcome.targetsController.canLoadApp",
+          contentBinding: "Welcome.targetsController.appsOnly",
+          selectionBinding: "Welcome.targetsController.selection",
+          isEnabledBinding: "Welcome.targetsController.canLoadApp",
           
-            contentValueKey: "displayName",
-            contentIconKey: "targetIcon",
-            hasContentIcon: YES,
+          contentValueKey: "displayName",
+          contentIconKey: "targetIcon",
+          hasContentIcon: YES,
           
-            target: "Welcome.targetsController",
-            action: "loadApplication"
-          })
+          target: "Welcome.targetsController",
+          action: "loadApplication"
         })
-      }),
-      
-      launchApplication: SC.ButtonView.design({
-        layout: {bottom:0, height:30, width:160, centerX:0},
-        isEnabledBinding: "Welcome.targetsController.launchEnabled",
-        controlSize: SC.HUGE_CONTROL_SIZE,
-        title: "Launch Application",
-        isDefault: YES,
-        target: "Welcome.targetsController",
-        action: "loadApplication"
+        
       })
       
     }) 

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

@@ -61,8 +61,8 @@ SC.Animatable = {
   },
 
   // properties that adjust should relay to style
-  _styleProperties: [ "display", "transform" ],
-  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY opacity'.w(),
+  _styleProperties: [ "opacity", "display", "transform" ],
+  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY'.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—
@@ -83,13 +83,7 @@ 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");
 
@@ -122,8 +116,7 @@ SC.Animatable = {
     this._animators = {}; // keyAnimated => object describing it.
     this._animatableSetCSS = "";
     this._last_transition_css = ""; // to keep from re-setting unnecessarily
-    // 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._disableAnimation = 0; // calls to disableAnimation add one; enableAnimation remove one.
     this._transitionCallbacks = {}; // define callback set
     
     // alert if layer already created
@@ -163,9 +156,7 @@ SC.Animatable = {
   If you call disable twice, you need two enables to start it. Three times, you need
   three enables.
   */
-  disableAnimation: function() {
-    // This fallback is necessary if disableAnimation is called in the init method before initMixin is called
-    if (this._disableAnimation === undefined) this._disableAnimation = 0;
+  disableAnimation: function() { 
     this._disableAnimation++;
   },
   
@@ -232,27 +223,14 @@ SC.Animatable = {
     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.RunLoop.begin();
-    var propertyName = evt.originalEvent.propertyName,
-        callback = this._transitionCallbacks[propertyName];
-
-    // 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);
-    } 
-    SC.RunLoop.end();
+    SC.run(function() {
+      var propertyName = evt.originalEvent.propertyName,
+          callback = this._transitionCallbacks[propertyName];
+
+      if(callback) SC.Animatable.runCallback(callback);
+    }, this);
   },
 
 
@@ -366,7 +344,7 @@ SC.Animatable = {
     top and left transitions have the same duration.
     Not cacheable since transitions may be updated without using a setter.
   */
-  _animatable_hasAcceleratedLayer: function(){
+  hasAcceleratedLayer: function(){
     var leftDuration = this.transitions['left'] && this.transitions['left'].duration,
         topDuration = this.transitions['top'] && this.transitions['top'].duration;
 
@@ -375,7 +353,7 @@ SC.Animatable = {
     } else if ((topDuration || leftDuration) && !SC.platform.supportsCSSTransitions) {
       return NO;
     } else {
-      return this._animatable_original_hasAcceleratedLayer();
+      return sc_super();
     }
   }.property('wantsAcceleratedLayer', 'transitions'),
 
@@ -401,15 +379,13 @@ SC.Animatable = {
 
       var nT = newStyle['top'],
           nB = newStyle['bottom'],
-          nH = newStyle['height'],
           nL = newStyle['left'],
-          nR = newStyle['right'],
-          nW = newStyle['width'];
+          nR = newStyle['right'];
 
       // NOTE: This needs to match exactly the conditions in layoutStyles
       if (
-        (SC.empty(nT) || (!SC.isPercentage(nT) && !SC.empty(nH))) &&
-        (SC.empty(nL) || (!SC.isPercentage(nL) && !SC.empty(nW)))
+        (SC.empty(nT) || (!SC.isPercentage(nT) && SC.empty(nB))) &&
+        (SC.empty(nL) || (!SC.isPercentage(nL) && SC.empty(nR)))
       ) {
         specialTransform = YES;
         this._useSpecialCaseTransform = YES;
@@ -637,6 +613,13 @@ 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.
@@ -688,14 +671,15 @@ SC.Animatable = {
   },
   
   _animatableApplyNonDisplayStylesFromTimer: function() {
-    SC.RunLoop.begin();
-    this.inLoopAction();
-    SC.RunLoop.end();
+    SC.run(function() {
+      this.inLoopAction();
+    }, this);
   },
 
   _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...
     };
 
@@ -717,10 +701,7 @@ SC.Animatable = {
       else if (styleHelpers[i]) styleHelpers[i](style, i, styles);
       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;
@@ -963,6 +944,7 @@ 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);
@@ -1171,9 +1153,9 @@ SC.mixin(SC.Animatable, {
 
       // get diff
       var time_diff = end - SC.Animatable._timer_start_time;
-      var loop = SC.RunLoop.begin();
-      SC.Animatable.stats.set("lastFPS", SC.Animatable._ticks / (time_diff / 1000));
-      loop.end();
+      SC.run(function() {
+        SC.Animatable.stats.set("lastFPS", SC.Animatable._ticks / (time_diff / 1000));
+      });
     }
   },
 

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

@@ -50,11 +50,8 @@ module("Animatable", {
     });
     
     SC.RunLoop.end();
-  },
-
-  teardown: function(){
-    pane.remove();
   }
+  
 });
 
 test("animatable should have init-ed correctly", function(){
@@ -147,6 +144,4 @@ 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/browser.js

@@ -24,6 +24,6 @@ SC.browser = (function() {
     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/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -142,9 +142,9 @@ SC.Record = SC.Object.extend(
     if (this.get('status') & SC.Record.READY) return this._screc_isEditable;
     else return NO ;
   }.property('status').cacheable(),
-  
+
   _screc_isEditable: YES, // default
-  
+
   /**
     YES when the record's contents have been loaded for the first time.  You 
     can use this to quickly determine if the record is ready to display.
@@ -637,6 +637,26 @@ SC.Record = SC.Object.extend(
   // PRIVATE
   //
   
+  /** @private
+    Sets the key equal to value.
+
+    This version will first check to see if the property is an
+    SC.RecordAttribute, and if so, will ensure that its isEditable property
+    is YES before attempting to change the value.
+
+    @param key {String} the property to set
+    @param value {Object} the value to set or null.
+    @returns {SC.Record}
+  */
+  set: function(key, value) {
+    var func = this[key];
+
+    if (func && func.isProperty && func.get && !func.get('isEditable')) {
+      return this;
+    }
+    return sc_super();
+  },
+
   /** @private
     Creates string representation of record, with status.
     
@@ -669,13 +689,15 @@ SC.Record = SC.Object.extend(
   },
   
   /**
-   * Registers a child record with this parent record.
-   *
-   * If the parent already knows about the child record, return the cached instance.  If not,
-   * create the child record instance and add it to the child record cache.
-   *
-   * @param {CoreOrion.ChildRecord} recordType The type of the child record to register.
-   * @param {Hash} hash The hash of attributes to apply to the child record.
+    Registers a child record with this parent record.
+
+    If the parent already knows about the child record, return the cached
+    instance. If not, create the child record instance and add it to the child
+    record cache.
+
+    @param {SC.ChildRecord} recordType The type of the child record to
+    register.
+    @param {Hash} hash The hash of attributes to apply to the child record.
    */
   registerChildRecord: function(recordType, hash) {
     var pm = recordType.primaryKey || 'childRecordKey';
@@ -687,45 +709,47 @@ SC.Record = SC.Object.extend(
     }
 
     if (SC.none(childRecord)) childRecord = this.createChildRecord(recordType, hash);
- 
+
     return childRecord;
   },
   
   /**
-   * Creates a new child record instance.
-   *
-   * @param {CoreOrion.ChildRecord} recordType The type of the child record to create.
-   * @param {Hash} hash The hash of attributes to apply to the child record. (may be null)
+    Creates a new child record instance.
+
+    @param {SC.ChildRecord} recordType The type of the child record to create.
+    @param {Hash} hash The hash of attributes to apply to the child record.
+    (may be null)
    */
   createChildRecord: function(childRecordType, hash) {
-    SC.RunLoop.begin();
-    // Generate the key used by the parent's child record manager.
-    var key = SC.Record._generateChildKey();
-    hash = hash || {}; // init if needed
-    var pm = childRecordType.primaryKey || 'childRecordKey';
-    var childKey = hash[pm];
-    hash[pm] = key;
-    
-    var store = this.get('store');
-    if (SC.none(store)) throw 'Error: during the creation of a child record: NO STORE ON PARENT!';
-    
-    var cr = store.createRecord(childRecordType, hash);
-    cr._parentRecord = this;
-    
-    // ID processing if necessary
-    if(this.generateIdForChild) this.generateIdForChild(cr);
-    
-    // Add the child record to the hash.
-    var crManager = this.get('childRecords');
-    if (SC.none(crManager)) {
-      //console.log('Creating Child Record Manager for (%@)'.fmt(SC.guidFor(this)));
-      crManager = SC.Object.create();
-      this.set('childRecords', crManager);
-    }
-    
-    crManager[key] = cr;
-    SC.RunLoop.end();
-    
+    var cr = null;
+    SC.run(function() {
+      // Generate the key used by the parent's child record manager.
+      var key = SC.Record._generateChildKey();
+      hash = hash || {}; // init if needed
+      var pm = childRecordType.primaryKey || 'childRecordKey';
+      var childKey = hash[pm];
+      hash[pm] = key;
+
+      var store = this.get('store');
+      if (SC.none(store)) throw 'Error: during the creation of a child record: NO STORE ON PARENT!';
+
+      cr = store.createRecord(childRecordType, hash);
+      cr._parentRecord = this;
+
+      // ID processing if necessary
+      if(this.generateIdForChild) this.generateIdForChild(cr);
+
+      // Add the child record to the hash.
+      var crManager = this.get('childRecords');
+      if (SC.none(crManager)) {
+        //console.log('Creating Child Record Manager for (%@)'.fmt(SC.guidFor(this)));
+        crManager = SC.Object.create();
+        this.set('childRecords', crManager);
+      }
+
+      crManager[key] = cr;
+    }, this);
+
     return cr;
   },