sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/replaceAllChildren_test.js

@@ -12,7 +12,7 @@ var parentView;
 /*
  * SC.CoreView.UNRENDERED
  * SC.CoreView.UNATTACHED
- * SC.CoreView.UNATTACHED_BY_PARENT
+ * SC.CoreView.ATTACHED_PARTIAL
  * SC.CoreView.ATTACHED_SHOWING
  * SC.CoreView.ATTACHED_SHOWN
  * SC.CoreView.ATTACHED_HIDING

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

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok */
+/*globals module, test, equals, context, ok, same */
 
 module("SC.View");
 
@@ -62,3 +62,79 @@ test("it still works with the backward compatible theme property when extending"
   equals(1, count, "theme observers should get called");
 });
 
+var view;
+module("SC.View methods", {
+  setup: function () {
+    view = SC.View.create({});
+  },
+
+  teardown: function () {
+    view.destroy();
+    view = null;
+  }
+});
+
+test("_callOnChildViews", function () {
+  var aContext = 'abc',
+      callees = [],
+      contexts = [],
+      childView = SC.View.create({
+        childViews: ['grandChildView'],
+        calledFunction: function (context) {
+          callees.push(this);
+          if (context) { contexts.push(context); }
+        },
+
+        grandChildView: SC.View.extend({
+          calledFunction: function (context) {
+            callees.push(this);
+            if (context) { contexts.push(context); }
+          }
+        })
+      }),
+      grandChildView;
+
+  // Add the child view (and grandchild view).
+  view.appendChild(childView);
+
+  // Grab the grandchild view for easy reference.
+  grandChildView = childView.get('childViews').objectAt(0);
+
+  // Call the function by default (top-down).
+  view._callOnChildViews('calledFunction');
+  same(callees, [childView, grandChildView], "The child view function should be called top-down.");
+
+  // Reset.
+  callees.length = 0;
+  contexts.length = 0;
+
+  // Call the function top-down.
+  view._callOnChildViews('calledFunction', true);
+  same(callees, [childView, grandChildView], "The child view function should be called top-down.");
+
+  // Reset.
+  callees.length = 0;
+  contexts.length = 0;
+
+  // Call the function top-down with context.
+  view._callOnChildViews('calledFunction', true, aContext);
+  same(callees, [childView, grandChildView], "The child view function should be called top-down.");
+  same(contexts, [aContext, aContext], "The child view function when called should receive the context.");
+
+  // Reset.
+  callees.length = 0;
+  contexts.length = 0;
+
+  // Call the function bottom-up.
+  view._callOnChildViews('calledFunction', false);
+  same(callees, [grandChildView, childView], "The child view function should be called bottom-up.");
+
+  // Reset.
+  callees.length = 0;
+  contexts.length = 0;
+
+  // Call the function bottom-up with context.
+  view._callOnChildViews('calledFunction', false, aContext);
+  same(callees, [grandChildView, childView], "The child view function should be called bottom-up.");
+  same(contexts, [aContext, aContext], "The child view function when called should receive the context.");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/view_states_test.js

@@ -300,17 +300,17 @@ test("Test adding a child brings that child to the same state as the parentView.
   // Render the view.
   view._doRender();
   equals(view.viewState, SC.CoreView.UNATTACHED, "A rendered child view of unrendered parentView should be in the state");
-  equals(child.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "A rendered child view of unrendered parentView's child view should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_PARTIAL, "A rendered child view of unrendered parentView's child view should be in the state");
   ok(view.get('_isRendered'), "_isRendered should be true");
   ok(!view.get('isAttached'), "isAttached should be false");
   ok(!view.get('isVisibleInWindow'), "isVisibleInWindow should be false");
 
   // Attach the view.
   view._doAttach(document.body);
-  equals(view.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "An attached child view of unrendered parentView should be in the state");
-  equals(child.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "An attached child view of unrendered parentView's child view should be in the state");
+  equals(view.viewState, SC.CoreView.ATTACHED_PARTIAL, "An attached child view of unrendered parentView should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_PARTIAL, "An attached child view of unrendered parentView's child view should be in the state");
   ok(view.get('_isRendered'), "_isRendered should be true");
-  ok(!view.get('isAttached'), "isAttached should be false");
+  ok(view.get('isAttached'), "isAttached should be true");
   ok(!view.get('isVisibleInWindow'), "isVisibleInWindow should be false");
 
   // Reset
@@ -321,18 +321,18 @@ test("Test adding a child brings that child to the same state as the parentView.
   parentView._doRender();
   view._doAdopt(parentView);
   equals(parentView.viewState, SC.CoreView.UNATTACHED, "A newly created parentView that is rendered should be in the state");
-  equals(view.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "A newly created child view of unattached parentView should be in the state");
-  equals(child.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "A newly created child view of unattached parentView's child view should be in the state");
+  equals(view.viewState, SC.CoreView.ATTACHED_PARTIAL, "A newly created child view of unattached parentView should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_PARTIAL, "A newly created child view of unattached parentView's child view should be in the state");
   ok(view.get('_isRendered'), "_isRendered should be true");
-  ok(!view.get('isAttached'), "isAttached should be false");
+  ok(view.get('isAttached'), "isAttached should be true");
   ok(!view.get('isVisibleInWindow'), "isVisibleInWindow should be false");
 
   // Attach the view.
   view._doAttach(document.body);
-  equals(view.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "An attached child view of unattached parentView should be in the state");
-  equals(child.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "An attached child view of unattached parentView's child view should be in the state");
+  equals(view.viewState, SC.CoreView.ATTACHED_PARTIAL, "An attached child view of unattached parentView should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_PARTIAL, "An attached child view of unattached parentView's child view should be in the state");
   ok(view.get('_isRendered'), "_isRendered should be true");
-  ok(!view.get('isAttached'), "isAttached should be false");
+  ok(view.get('isAttached'), "isAttached should be true");
   ok(!view.get('isVisibleInWindow'), "isVisibleInWindow should be false");
 
   // Reset
@@ -365,8 +365,8 @@ test("Test showing and hiding parentView updates child views.", function () {
   parentView._doAttach(document.body);
   view._doAdopt(parentView);
   equals(parentView.viewState, SC.CoreView.ATTACHED_SHOWN, "A newly created parentView that is attached should be in the state");
-  equals(view.viewState, SC.CoreView.ATTACHED_SHOWN, "A newly created child view of unattached parentView should be in the state");
-  equals(child.viewState, SC.CoreView.ATTACHED_SHOWN, "A newly created child view of unattached parentView's child view should be in the state");
+  equals(view.viewState, SC.CoreView.ATTACHED_SHOWN, "A newly created child view of attached parentView should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_SHOWN, "A newly created child view of attached parentView's child view should be in the state");
   ok(view.get('isVisibleInWindow'), "isVisibleInWindow should be true");
 
   // Hide the parentView.
@@ -414,8 +414,8 @@ test("Test showing and hiding parentView updates child views.", function () {
   view._doAdopt(parentView);
 
   // Attach a parentView with children
-  equals(view.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "A child view of unattached parentView should be in the state");
-  equals(child.viewState, SC.CoreView.UNATTACHED_BY_PARENT, "A child view of unattached parentView's child view should be in the state");
+  equals(view.viewState, SC.CoreView.ATTACHED_PARTIAL, "A child view of unattached parentView should be in the state");
+  equals(child.viewState, SC.CoreView.ATTACHED_PARTIAL, "A child view of unattached parentView's child view should be in the state");
   parentView._doAttach(document.body);
   equals(view.viewState, SC.CoreView.ATTACHED_SHOWN, "A child view of attached_shown parentView should be in the state");
   equals(child.viewState, SC.CoreView.ATTACHED_SHOWN, "A child view of attached_shown parentView's child view should be in the state");
@@ -434,7 +434,7 @@ test("Test showing parentView with transitionShow", function () {
   parentView._doRender();
   parentView._doAttach(document.body);
 
-  SC.run(function() { parentView.set('isVisible', YES) });
+  SC.run(function() { parentView.set('isVisible', YES); });
 
   equals(parentView.viewState, SC.View.ATTACHED_SHOWING, "Upon being made visible, a view with a transition is in state");
   equals(childView.viewState, SC.View.ATTACHED_SHOWN, "A visible view whose parent is ATTACHED_SHOWING is in state.");
@@ -460,7 +460,7 @@ test("Test hiding with transitionHide", function () {
   SC.run(function () {
     parentView._doHide();
   });
-  ok(parentView.get('isVisibleInWindow'), "isVisibleInWindow of parentView should be false");
+  ok(parentView.get('isVisibleInWindow'), "isVisibleInWindow of parentView should be true");
   ok(view.get('isVisibleInWindow'), "isVisibleInWindow should be true");
   ok(child.get('isVisibleInWindow'), "isVisibleInWindow of child should be true");
 
@@ -482,7 +482,8 @@ test("Adjusting unrelated layout property (not specified in transition's layoutP
       view.adjust('opacity', 0);
       view.invokeNext(view.didTransitionIn);
     }
-  }
+  };
+
   var view = SC.View.create({
     transitionIn: transition,
     layout: { height: 40 },

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

@@ -404,7 +404,9 @@ SC.CoreView.reopen(
     @returns {SC.View} receiver
   */
   createLayer: function () {
-    this._doRender();
+    if (!this.get('_isRendered')) {
+      this._doRender();
+    }
 
     return this;
   },
@@ -433,7 +435,9 @@ SC.CoreView.reopen(
       this._doDetach();
     }
 
-    this._doDestroyLayer();
+    if (this.get('_isRendered')) {
+      this._doDestroyLayer();
+    }
 
     return this;
   },
@@ -956,27 +960,6 @@ SC.CoreView.reopen(
     this.createChildViews(); // setup child Views
   },
 
-  /**
-    Wakes up the view. The default implementation immediately syncs any
-    bindings, which may cause the view to need its display updated. You
-    can override this method to perform any additional setup. Be sure to
-    call sc_super to setup bindings and to call awake on childViews.
-
-    It is best to awake a view before you add it to the DOM.  This way when
-    the DOM is generated, it will have the correct initial values and will
-    not require any additional setup.
-
-    @returns {void}
-  */
-  awake: function () {
-    sc_super();
-    var childViews = this.get('childViews'), len = childViews.length, idx;
-    for (idx = 0; idx < len; ++idx) {
-      if (!childViews[idx]) { continue; }
-      childViews[idx].awake();
-    }
-  },
-
   /**
     Frame describes this view's current bounding rect, relative to its parent view. You
     can use this, for example, to reliably access a width for a view whose layout is
@@ -1013,12 +996,10 @@ SC.CoreView.reopen(
       /*
         TODO Can probably have some better width/height values - CC
         FIXME This will probably not work right with borders - PW
-        FIXME This assumes and reports a scale of 1 - DCP
       */
-      f.width = f.originalWidth = layer.offsetWidth;
-      f.height = f.originalHeight = layer.offsetHeight;
-      f.scale = 1;
-      f.transformOriginX = f.transformOriginY = 0.5;
+      f.width = layer.offsetWidth;
+      f.height = layer.offsetHeight;
+
       return f;
     }
 
@@ -1031,14 +1012,12 @@ SC.CoreView.reopen(
   },
 
   /** @private Call the method recursively on all child views. */
-  _callOnChildViews: function (methodName, context) {
+  _callOnChildViews: function (methodName, isTopDown, context) {
     var childView,
       childViews = this.get('childViews'),
       method,
       shouldContinue;
 
-    // Could have support for arguments, but accessing Arguments and using apply is slower than using call, so avoid it.
-    // args = SC.$A(arguments).slice(1);
     for (var i = childViews.length - 1; i >= 0; i--) {
       childView = childViews[i];
 
@@ -1047,12 +1026,20 @@ SC.CoreView.reopen(
 
       // Look up the method on the child.
       method = childView[methodName];
-      // method.apply(childView, args);  This is slower.
-      shouldContinue = method.call(childView, context);
+
+      // Call the method on this view *before* its children.
+      if (isTopDown === undefined || isTopDown) {
+        shouldContinue = method.call(childView, context);
+      }
 
       // Recurse.
       if (shouldContinue === undefined || shouldContinue) {
-        childView._callOnChildViews(methodName, context);
+        childView._callOnChildViews(methodName, isTopDown, context);
+      }
+
+      // Call the method on this view *after* its children.
+      if (isTopDown === false) {
+        method.call(childView, context);
       }
     }
   },
@@ -1074,11 +1061,10 @@ SC.CoreView.reopen(
     // FAST PATH: No frame, no clipping frame.
     if (!f) return null;
 
+    /*jshint eqnull:true */
     var scale = (f.scale == null) ? 1 : f.scale,
-        scaleIsArray = NO,
         pv = this.get('parentView'),
         pcf = pv ? pv.get('clippingFrame') : null,
-        sf, spcf, originX, originY, deltaH, deltaW,
         ret;
 
     // FAST PATH: No parent clipping frame, no change. (The origin and scale are reset from parent view's
@@ -1142,7 +1128,9 @@ SC.CoreView.reopen(
     @returns {SC.View} receiver
   */
   removeChild: function (view, immediately) {
-    view._doDetach(immediately);
+    if (view.get('isAttached')) {
+      view._doDetach(immediately);
+    }
 
     // If the view will transition out, wait for the transition to complete
     // before orphaning the view entirely.
@@ -1301,11 +1289,15 @@ SC.CoreView.reopen(
     } else {
       // Immediately remove the layer if attached (ignores transitionOut). This
       // will detach the layer for all child views as well.
-      this._doDetach(true);
+      if (this.get('isAttached')) {
+        this._doDetach(true);
+      }
 
       // Clear the layer if rendered.  This will clear all child views layer
       // references as well.
-      this._doDestroyLayer();
+      if (this.get('_isRendered')) {
+        this._doDestroyLayer();
+      }
 
       // Complete the destroy.
       this._destroy();
@@ -2092,7 +2084,8 @@ SC.CoreView.unload = function () {
     implement mouseDown (and not return NO) in order to receive mouseUp.
 
   SproutCore implements a higher-level API for handling in-application dragging and dropping.
-  See `SC.Drag`, `SC.DragSource`, `SC.DragDataSource`, and `SC.DropTarget` for more.
+  See `SC.Drag`, `SC.DragSourceProtocol`, `SC.DragDataSourceProtocol`, and `SC.DropTargetProtocol`
+  for more.
 
   Data-drag events
   ----
@@ -2292,7 +2285,8 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
   */
   computeFrameWithParentFrame: function (pdim) {
     // Layout.
-    var f, layout = this.get('layout');
+    var layout = this.get('layout'),
+        f;
 
     // We can't predict the frame for static layout, so just return the view's
     // current frame (see original computeFrameWithParentFrame in views/view.js)
@@ -2306,8 +2300,6 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
     f = {};
 
     var error, layer, AUTO = SC.LAYOUT_AUTO,
-        pv = this.get('parentView'),
-        scale, oX, oY, // Used with the special case ScrollView handling below.
         dH, dW, //shortHand for parentDimensions
         lR = layout.right,
         lL = layout.left,
@@ -2319,15 +2311,13 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
         lcY = layout.centerY;
 
     if (lW === AUTO) {
-      error = SC.Error.desc(("%@.layout() cannot use width:auto if " +
-        "staticLayout is disabled").fmt(this), "%@".fmt(this), -1);
+      error = SC.Error.desc(("%@.layout() cannot use width:auto if staticLayout is disabled").fmt(this), "%@".fmt(this), -1);
       SC.Logger.error(error.toString());
       throw error;
     }
 
     if (lH === AUTO) {
-      error = SC.Error.desc(("%@.layout() cannot use height:auto if " +
-        "staticLayout is disabled").fmt(this), "%@".fmt(this), -1);
+      error = SC.Error.desc(("%@.layout() cannot use height:auto if staticLayout is disabled").fmt(this), "%@".fmt(this), -1);
       SC.Logger.error(error.toString());
       throw error;
     }
@@ -2343,6 +2333,7 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
       } else {
         f.x = lL;
       }
+
       if (lW !== undefined) {
         if (lW === AUTO) { f.width = AUTO; }
         else if (SC.isPercentage(lW)) { f.width = dW * lW; }
@@ -2352,6 +2343,7 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
         if (lR && SC.isPercentage(lR)) { f.width = f.width - (lR * dW); }
         else { f.width = f.width - (lR || 0); }
       }
+
     // handle right aligned
     } else if (!SC.none(lR)) {
       if (SC.none(lW)) {
@@ -2451,13 +2443,14 @@ SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
     f = this._adjustForBorder(f, layout);
 
     // Make sure the width/height fix their min/max (note the inlining of SC.none for performance)...
+    /*jshint eqnull:true */
     if ((layout.maxHeight != null) && (f.height > layout.maxHeight)) f.height = layout.maxHeight;
     if ((layout.minHeight != null) && (f.height < layout.minHeight)) f.height = layout.minHeight;
     if ((layout.maxWidth != null) && (f.width > layout.maxWidth)) f.width = layout.maxWidth;
     if ((layout.minWidth != null) && (f.width < layout.minWidth)) f.width = layout.minWidth;
 
-    // Finally, adjust for scale. (Scale is only defined here if we're doing special-case ScrollView stuff.)
-    f = this._adjustForScale(f, layout, scale, oX, oY);
+    // Finally, adjust for scale.
+    f = this._adjustForScale(f, layout);
 
     return f;
   },

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

@@ -327,13 +327,13 @@ SC.View.reopen(
 
     // Get the layout (may be a previous layout already animating).
     if (!this._prevLayout) {
-      this._prevLayout = SC.clone(this.get('layout'));
+      this._prevLayout = SC.clone(this.get('explicitLayout'));
     }
 
     if (!pendingAnimations) { pendingAnimations = this._pendingAnimations = {}; }
 
     // Get the layout (may be a partially adjusted one already queued up).
-    layout = this._animateLayout || SC.clone(this.get('layout'));
+    layout = this._animateLayout || SC.clone(this.get('explicitLayout'));
 
     // Handle old style rotation.
     if (!SC.none(hash.rotate)) {
@@ -542,7 +542,7 @@ SC.View.reopen(
 
     // Adjust to final position.
     if (didCancel && !!layout) {
-      this.adjust(layout);
+      this.set('layout', layout);
     }
 
     // Clean up.
@@ -633,8 +633,7 @@ SC.View.reopen(
     components = matrixString.split(/\(|\)/);
     numbers = components[1].split(',');
     for (var i = 0, len = numbers.length; i < len; i++) {
-      var number = numbers[i],
-        value;
+      var number = numbers[i];
 
       // Transform E notation into fixed decimal (20 is maximum allowed).
       if (number.indexOf('e') > 0) {
@@ -744,7 +743,7 @@ SC.View.reopen(
 
         // Determine the current style.
         } else {
-          value = window.parseInt(value, 10);
+          value = window.parseFloat(value, 10);
 
           // Account for centerX & centerY animations (margin-left & margin-top).
           if (key === 'centerX') {