sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js

@@ -11,8 +11,9 @@ sc_require('views/view/animation');
 SC.CSS_TRANSFORM_NAMES = ['rotateX', 'rotateY', 'rotateZ', 'scale'];
 
 SC.CSS_TRANSFORM_MAP = {
-  rotate: function () {
-    return null;
+  rotate: function (val) {
+    if (SC.typeOf(val) === SC.T_NUMBER) { val += 'deg'; }
+    return 'rotate(' + val + ')';
   },
 
   rotateX: function (val) {
@@ -103,6 +104,18 @@ SC.View.LayoutStyleCalculator = {
       }
 
       style[transformAttribute] = transforms.length > 0 ? transforms.join(' ') : null;
+
+      // Transform origin.
+      var transformOriginAttribute = SC.browser.experimentalStyleNameFor('transformOrigin'),
+        originX = layout.transformOriginX,
+        originY = layout.transformOriginY;
+      if (originX == null && originY == null) {
+        style[transformOriginAttribute] = null;
+      } else {
+        if (originX == null) originX = 0.5;
+        if (originY == null) originY = 0.5;
+        style[transformOriginAttribute] = (originX * 100) + '% ' + (originY * 100) + '%';
+      }
     }
 
     // Reset any transitions.
@@ -353,21 +366,23 @@ SC.View.LayoutStyleCalculator = {
 
       if (shouldTranslate) {
         var transformAttribute = SC.browser.experimentalStyleNameFor('transform'),
-          curValue = style[transformAttribute];
+          curValue = style[transformAttribute],
+          newValue;
 
-        // Don't overwrite previously transformed values.
-        if (curValue) {
-          curValue += ' ';
-        } else {
-          curValue = '';
-        }
+        newValue = 'translateX(' + style.left + 'px) translateY(' + style.top + 'px)';
 
-        style[transformAttribute] = curValue + 'translateX(' + style.left + 'px) translateY(' + style.top + 'px)';
+        // double check to make sure this is needed
+        if (SC.platform.supportsCSS3DTransforms) { newValue += ' translateZ(0px)'; }
+
+        // Append any current transforms.
+        // NOTE: The order of transforms is important. If we scale before translate, our translations
+        // will be scaled and incorrect.
+        if (curValue) { newValue += ' ' + curValue; }
+        style[transformAttribute] = newValue;
+
+        // Set the absolute left & top style to 0,0 (will be translated from there).
         style.left = 0;
         style.top = 0;
-
-        // double check to make sure this is needed
-        if (SC.platform.supportsCSS3DTransforms) { style[transformAttribute] += ' translateZ(0px)'; }
       }
     }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js

@@ -3,23 +3,10 @@ sc_require("views/view");
 SC.View.reopen(
   /** @scope SC.View.prototype */{
 
-  /**
-    This code exists to make it possible to pool SC.Views.
-    */
-  _lastLayerId: null,
-
-  /** @private */
-  init: function (original) {
-    original();
-
-    // Set up the cached layerId if it has been set on create.
-    this._lastLayerId = this.get('layerId');
-  }.enhance(),
-
   /**
     Handles changes in the layer id.
   */
-  layerIdDidChange: function () {
+  layerIdDidChange: function() {
     var layer  = this.get('layer'),
         lid    = this.get('layerId'),
         lastId = this._lastLayerId;
@@ -60,7 +47,7 @@ SC.View.reopen(
     @param {SC.View} beforeView
     @returns {SC.View} the receiver
   */
-  insertBefore: function (view, beforeView) {
+  insertBefore: function(view, beforeView) {
     view.beginPropertyChanges(); // limit notifications
 
     // Reset any views that are already building in or out.
@@ -80,25 +67,9 @@ SC.View.reopen(
     //   }
     // });
 
-    return this;
+    return this ;
   },
 
-  removeChild: function (original, view) {
-    if (!view) { return this; } // nothing to do
-    if (view.parentView !== this) {
-      throw new Error("%@.removeChild(%@) must belong to parent".fmt(this, view));
-    }
-
-    // notify views
-    // TODO: Deprecate these notifications.
-    if (view.willRemoveFromParent) { view.willRemoveFromParent(); }
-    if (this.willRemoveChild) { this.willRemoveChild(view); }
-
-    original(view);
-
-    return this;
-  }.enhance(),
-
   /**
     Replace the oldView with the specified view in the receivers childNodes
     array. This will also replace the DOM node of the oldView with the DOM
@@ -111,13 +82,13 @@ SC.View.reopen(
     @param view {SC.View} the view to remove from the DOM.
     @returns {SC.View} the receiver
   */
-  replaceChild: function (view, oldView) {
+  replaceChild: function(view, oldView) {
     // suspend notifications
     view.beginPropertyChanges();
     oldView.beginPropertyChanges();
     this.beginPropertyChanges();
 
-    this.insertBefore(view, oldView).removeChild(oldView);
+    this.insertBefore(view,oldView).removeChild(oldView) ;
 
     // resume notifications
     this.endPropertyChanges();
@@ -176,7 +147,7 @@ SC.View.reopen(
     // }
     this.endPropertyChanges();
 
-    return this;
+    return this ;
   },
 
   /**
@@ -186,7 +157,7 @@ SC.View.reopen(
     @param view {SC.View} the view to insert
     @returns {SC.View} the receiver
   */
-  appendChild: function (view) {
+  appendChild: function(view) {
     return this.insertBefore(view, null);
   },
 
@@ -200,7 +171,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildInChild: function (view) {
+  buildInChild: function(view) {
     view.willBuildInToView(this);
     this.appendChild(view);
     view.buildInToView(this);
@@ -212,7 +183,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildOutChild: function (view) {
+  buildOutChild: function(view) {
     view.buildOutFromView(this);
   },
 
@@ -221,14 +192,14 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildInDidFinishFor: function (child) {
+  buildInDidFinishFor: function(child) {
   },
 
   /**
     @private
     Called by child view when build out finishes. By default removes the child view.
   */
-  buildOutDidFinishFor: function (child) {
+  buildOutDidFinishFor: function(child) {
     this.removeChild(child);
   },
 
@@ -251,7 +222,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildIn: function () {
+  buildIn: function() {
     //@if(debug)
     SC.warn("The SC.View build methods have been deprecated in favor of the transition plugins.  To build in a view, please provide a transitionIn plugin (many are pre-built in SproutCore) and to build out a view, please provide a transitionOut plugin.");
     //@endif
@@ -263,7 +234,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildOut: function () {
+  buildOut: function() {
     //@if(debug)
     SC.warn("The SC.View build methods have been deprecated in favor of the transition plugins.  To build in a view, please provide a transitionIn plugin (many are pre-built in SproutCore) and to build out a view, please provide a transitionOut plugin.");
     //@endif
@@ -276,7 +247,7 @@ SC.View.reopen(
     It is usually called before a build in, by the parent view.
     @deprecated Version 1.10
   */
-  resetBuild: function () {
+  resetBuild: function() {
 
   },
 
@@ -289,7 +260,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildOutDidCancel: function () {
+  buildOutDidCancel: function() {
 
   },
 
@@ -303,7 +274,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildInDidCancel: function () {
+  buildInDidCancel: function() {
 
   },
 
@@ -312,7 +283,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildInDidFinish: function () {
+  buildInDidFinish: function() {
     this.isBuildingIn = NO;
     this._buildingInTo.buildInDidFinishFor(this);
     this._buildingInTo = null;
@@ -323,7 +294,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  buildOutDidFinish: function () {
+  buildOutDidFinish: function() {
     this.isBuildingOut = NO;
     this._buildingOutFrom.buildOutDidFinishFor(this);
     this._buildingOutFrom = null;
@@ -334,7 +305,7 @@ SC.View.reopen(
 
     @deprecated Version 1.10
   */
-  resetBuildState: function () {
+  resetBuildState: function() {
     if (this.isBuildingIn) {
       this.buildInDidCancel();
       this.isBuildingIn = NO;
@@ -359,7 +330,7 @@ SC.View.reopen(
 
     Mostly, this cancels any build out _before_ the view is removed through parent change.
   */
-  willBuildInToView: function (view) {
+  willBuildInToView: function(view) {
     // stop any current build outs (and if we need to, we also need to build in again)
     if (this.isBuildingOut) {
       this.buildOutDidCancel();
@@ -370,7 +341,7 @@ SC.View.reopen(
     @private (semi)
     Called by building parent view's buildInChild method.
   */
-  buildInToView: function (view) {
+  buildInToView: function(view) {
     // if we are already building in, do nothing.
     if (this.isBuildingIn) { return; }
 
@@ -386,7 +357,7 @@ SC.View.reopen(
 
     The supplied view should always be the parent view.
   */
-  buildOutFromView: function (view) {
+  buildOutFromView: function(view) {
     // if we are already building out, do nothing.
     if (this.isBuildingOut) { return; }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/statechart.js

@@ -230,6 +230,9 @@ SC.CoreView.reopen(
   /* @private Internal variable used to store the original frame before running an automatic transition. */
   _preTransitionFrame: null,
 
+  /* @private Internal variable used to cache layout properties which must be reset after the transition. */
+  _transitionLayoutCache: null,
+
   /**
     The current state of the view as managed by its internal statechart.
 
@@ -363,6 +366,9 @@ SC.CoreView.reopen(
       if (idx < 0) { idx = childViews.length; }
       childViews.insertAt(idx, this);
 
+      // Pass the current designMode to the view (and its children).
+      this.updateDesignMode(this.get('designMode'), parentView.get('designMode'));
+
       // Notify adopted (on self and all child views).
       this._adopted();
 
@@ -506,8 +512,10 @@ SC.CoreView.reopen(
     case SC.CoreView.ATTACHED_SHOWN:
     case SC.CoreView.ATTACHED_SHOWN_ANIMATING:
       //@if(debug)
-      // This should be avoided, because moving the view layer without explicitly removing it first is a dangerous practice.
-      SC.warn("Developer Warning: You can not attach the view, %@, to a new node without properly detaching it first.".fmt(this));
+      if (parentNode !== this.getPath('parentView.layer')) {
+        // This should be avoided, because moving the view layer without explicitly removing it first is a dangerous practice.
+        SC.warn("Developer Warning: You can not attach the view, %@, to a new node without properly detaching it first.".fmt(this));
+      }
       //@endif
       break;
     case SC.CoreView.UNATTACHED_BY_PARENT:
@@ -654,6 +662,9 @@ SC.CoreView.reopen(
       if (immediately) {
         // Note: *will* detach notice already sent.
         this.cancelAnimation(); // Fires didTransitionOut callback (state changes to UNATTACHED/notifications sent).
+
+        // Detach immediately.
+        this._executeDoDetach();
       }
 
       // Don't try to notify or run transition out code again.
@@ -843,10 +854,11 @@ SC.CoreView.reopen(
 
       // Update states after *will* and before *did* notifications!
       this._gotoUnattachedState();
+      this._callOnChildViews('_gotoUnattachedByParentState');
 
-      // Notify *did* (bottom-up from children to parent).
-      this._callOnChildViews('_parentDidRender');
+      // Notify *did* (top-down from parent to children).
       this._rendered();
+      this._callOnChildViews('_rendered');
 
       // Bypass the unattached state for adopted views.
       var parentView = this.get('parentView');
@@ -1007,9 +1019,9 @@ SC.CoreView.reopen(
 
       // Notify *did* (bottom-up from children to parent).
       if (this.didShowInDocument) { this.didShowInDocument(); }
-      if (state === SC.CoreView.ATTACHED_SHOWING) {
-        this._callOnChildViews('_parentDidShowInDocument');
-      }
+      // if (state === SC.CoreView.ATTACHED_SHOWING) {
+      //   this._callOnChildViews('_parentDidShowInDocument');
+      // }
     }
   },
 
@@ -1419,14 +1431,6 @@ SC.CoreView.reopen(
     }
   },
 
-  /** @private Updates according to parent did render. */
-  _parentDidRender: function () {
-    // Update states after *will* and before *did* notifications!
-    this._gotoUnattachedByParentState();
-
-    this._rendered();
-  },
-
   /** @private Starts building out view if appropriate. */
   _parentWillBuildOutFromDocument: function (owningView) {
     var state = this.get('viewState'),
@@ -1504,6 +1508,10 @@ SC.CoreView.reopen(
     this._notifyWillDetach();
   },
 
+  _ancestorDidChangeParent: function () {
+    this.notifyPropertyChange('pane');
+  },
+
   /** @private Routes according to parent did detach. */
   _parentDidRemoveFromDocument: function () {
     var state = this.get('viewState');
@@ -1623,25 +1631,43 @@ SC.CoreView.reopen(
   },
 
   /** @private */
-  _setupTransition: function () {
+  _setupTransition: function (transition) {
+    // Get a copy of the layout.
+    var layout = SC.clone(this.get('layout'));
     // Prepare for a transition.
-    this._preTransitionLayout = SC.clone(this.get('layout'));
+    this._preTransitionLayout = layout;
     this._preTransitionFrame = this.get('borderFrame');
+    // Cache appropriate layout values.
+    var layoutProperties = SC.get(transition, 'layoutProperties');
+    // If the transition specifies any layouts, cache them.
+    if (layoutProperties && layoutProperties.length) {
+      this._transitionLayoutCache = {};
+      var i, prop, len = layoutProperties.length;
+      for (i = 0; i < len; i++) {
+        prop = layoutProperties[i];
+        this._transitionLayoutCache[prop] = layout[prop] === undefined ? null : layout[prop];
+      }
+    }
   },
 
   /** @private */
   _teardownTransition: function () {
-    // Some transition plugins will send a didTransitionIn/Out event even
-    // if the transition was cancelled. In either case, the transition can't
-    // be cleaned up multiple times.
-    if (this._preTransitionLayout) {
-      // Reset the layout to its original value.
-      this.set('layout', this._preTransitionLayout);
+    // Make sure this isn't being called twice for the same transition. For example,
+    // some transition plugins will send a didTransitionIn/Out event even if the
+    // transition was cancelled.
 
-      // Clean up.
-      this._preTransitionLayout = null;
-      this._preTransitionFrame = null;
+    // If we have a hash of cached layout properties, adjust back to it.
+    if (this._transitionLayoutCache) {
+      this.adjust(this._transitionLayoutCache);
     }
+    // Otherwise, just set the layout back to what it was.
+    else if (this._preTransitionLayout) {
+      this.set('layout', this._preTransitionLayout);
+    }
+    // Clean up.
+    this._preTransitionLayout = null;
+    this._preTransitionFrame = null;
+    this._transitionLayoutCache = null;
   },
 
   /** @private Attempts to run a transition hide, ensuring any incoming transitions are stopped in place. */
@@ -1662,7 +1688,7 @@ SC.CoreView.reopen(
     //   inPlace = true;
     //   break;
     // default:
-    this._setupTransition();
+    this._setupTransition(transitionHide);
     // }
 
     // Set up the hiding transition.
@@ -1688,7 +1714,7 @@ SC.CoreView.reopen(
       inPlace = true;
       break;
     default:
-      this._setupTransition();
+      this._setupTransition(transitionIn);
     }
 
     // Set up the incoming transition.
@@ -1706,7 +1732,7 @@ SC.CoreView.reopen(
       options = this.get('transitionOutOptions') || {};
 
     if (!inPlace) {
-      this._setupTransition();
+      this._setupTransition(transitionOut);
     }
 
     // Increment the shared building out count.
@@ -1736,7 +1762,7 @@ SC.CoreView.reopen(
     //   this.cancelAnimation(SC.LayoutState.CURRENT);
     //   inPlace = true;
     // } else {
-    this._setupTransition();
+    this._setupTransition(transitionShow);
     // }
 
     // Set up the showing transition.
@@ -1746,6 +1772,9 @@ SC.CoreView.reopen(
 
     // Execute the showing transition.
     transitionShow.run(this, options, this._preTransitionLayout, this._preTransitionFrame);
+
+    // This view's state is going to be transitioning, but all child views are now considered shown.
+    this._callOnChildViews('_parentDidShowInDocument');
   },
 
   /** @private */