sproutcore 1.11.0.rc1 → 1.11.0.rc2

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/touch.js

@@ -40,35 +40,40 @@ module("SC.RootResponder", {
     evt2.changedTouches.push(evt);
     evt2.changedTouches.push(evt2);
   },
-  
+
   teardown: function() {
     pane.destroy();
+    evt = evt2 = layer = view = pane = null;
   }
 });
 
 // With v1.11, SC.Touch now provides its own velocity along each axis.
 test("SC.Touch velocity", function() {
   // Get a layer
-  var touch;
+  var touch,
+    lastTimestamp;
+
+  lastTimestamp = evt.timeStamp;
 
   // Trigger touchstart
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchstart', [evt]);
-  });
+  SC.Event.trigger(layer, 'touchstart', [evt]);
 
   touch = SC.RootResponder.responder._touches[evt.identifier];
 
   equals(touch.velocityX, 0, "Horizontal velocity begin at zero");
   equals(touch.velocityY, 0, "Vertical velocity begin at zero");
 
-  evt.type = 'touchmove';
-  evt.timeStamp += 100;
-  evt.pageX += 100;
-  evt.pageY += 100;
-  
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchmove', [evt]);
-  });
+  // Copy the last DOM touch as the basis of an updated DOM touch.
+  touch = SC.copy(touch);
+  touch.pageX += 100;
+  touch.pageY += 100;
+
+  evt = SC.Event.simulateEvent(layer, 'touchmove', { touches: [touch], identifier: 4, changedTouches: [touch] });
+  evt.timeStamp = lastTimestamp + 100;
+
+  SC.Event.trigger(layer, 'touchmove', [evt]);
+
+  touch = SC.RootResponder.responder._touches[evt.identifier];
 
   equals(touch.velocityX, 1, 'VelocityX for 100 pixels in 100 ms is 1.');
   equals(touch.velocityY, 1, 'VelocityY for 100 pixels in 100 ms is 1.');
@@ -77,13 +82,15 @@ test("SC.Touch velocity", function() {
 
 test("averagedTouchesForView", function() {
   // Start touch.
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchstart', [evt, evt2]);
-  });
+  SC.Event.trigger(layer, 'touchstart', evt);
+
+  // Copy the last DOM touch as the basis of an updated DOM touch.
+  var touch1 = SC.RootResponder.responder._touches[evt.identifier];
+  var touch2 = SC.RootResponder.responder._touches[evt2.identifier];
 
   // Get our starting average.
-  var expectedAverageX = (evt.pageX + evt2.pageX) / 2,
-    expectedAverageY = (evt.pageY + evt2.pageY) / 2,
+  var expectedAverageX = (touch1.pageX + touch2.pageX) / 2,
+    expectedAverageY = (touch1.pageY + touch2.pageY) / 2,
     startAverage = SC.clone(SC.RootResponder.responder.averagedTouchesForView(view));
 
   equals(startAverage.x, expectedAverageX, "averagedTouchesForView correctly returns touch location averages (x)");
@@ -91,13 +98,14 @@ test("averagedTouchesForView", function() {
   ok(startAverage.d, "averagedTouchesForView's distance measurement should ... be a nonzero number. (Pythagoras doesn't play nice with integers.)");
 
   // Pinch out by 50 pixels in every direction.
-  evt.pageX = 50;
-  evt.pageY = 50;
-  evt2.pageX = 250;
-  evt2.pageY = 250;
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchmove', [evt, evt2]);
-  });
+  touch1.pageX = 50;
+  touch1.pageY = 50;
+  touch2.pageX = 250;
+  touch2.pageY = 250;
+
+  var moveEvt = SC.Event.simulateEvent(layer, 'touchmove', { touches: [touch1, touch2], identifier: 6, changedTouches: [touch1, touch2] });
+  SC.Event.trigger(layer, 'touchmove', moveEvt);
+
   // Get our post-pinch average.
   var endAverage = SC.RootResponder.responder.averagedTouchesForView(view);
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/touch.js

@@ -65,16 +65,15 @@ test("Touch event handling and juggling.", function() {
   var outer = pane.outerView,
       inner = outer.innerView,
       layer = inner.get('layer'),
-      event = SC.Event.simulateEvent(layer, 'touchstart');
+      event = SC.Event.simulateEvent(layer, 'touchstart'),
+      touch;
 
   event.touches = [];
   event.identifier = 4;
   event.changedTouches = [event];
 
   // Trigger touchstart: outerView.captureTouch > outerView.touchStart
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchstart', [event]);
-  });
+  SC.Event.trigger(layer, 'touchstart', [event]);
 
   equals(outerCapture, 1, "To capture the initial touch, outerView.captureTouch should have run:");
   equals(outerStart, 1, "Having captured the initial touch, outerView.touchStart should have run:");
@@ -87,10 +86,13 @@ test("Touch event handling and juggling.", function() {
   if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
 
   // Trigger touchmoved: outerView.touchesDragged > [passes touch to innerView] > innerView.touchStart
-  event.type = 'touchmove';
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchmove', [event]);
-  });
+
+  // Copy the last DOM touch as the basis of an updated DOM touch.
+  touch = SC.RootResponder.responder._touches[event.identifier];
+  touch = SC.copy(touch);
+
+  event = SC.Event.simulateEvent(layer, 'touchmove', { touches: [touch], identifier: 4, changedTouches: [touch] });
+  SC.Event.trigger(layer, 'touchmove', [event]);
 
   if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
   if (outerStart !== 1) ok(false, "outerView.touchStart should only have been called once!");
@@ -103,9 +105,12 @@ test("Touch event handling and juggling.", function() {
   if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
 
   // Trigger touchmoved x2: innerView.touchesDragged > [passes touch back to outerView] > outerView.touchStart > innerView.touchCancelled
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchmove', [event]);
-  });
+  // Copy the last DOM touch as the basis of an updated DOM touch.
+  touch = SC.RootResponder.responder._touches[event.identifier];
+  touch = SC.copy(touch);
+
+  event = SC.Event.simulateEvent(layer, 'touchmove', { touches: [touch], identifier: 4, changedTouches: [touch] });
+  SC.Event.trigger(layer, 'touchmove', [event]);
 
   if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
   equals(outerDragged, 1, "Having passed ownership to innerView, outerView.touchesDragged should not have been called again:");
@@ -118,10 +123,13 @@ test("Touch event handling and juggling.", function() {
   if (outerEnd) ok(false, "outerView.touchEnd should not have been called yet!");
 
   // Trigger touchend: outerView.touchEnd
-  event.type = 'touchend';
-  SC.run(function() {
-    SC.Event.trigger(layer, 'touchend', [event]);
-  });
+
+  // Copy the last DOM touch as the basis of an updated DOM touch.
+  touch = SC.RootResponder.responder._touches[event.identifier];
+  touch = SC.copy(touch);
+
+  event = SC.Event.simulateEvent(layer, 'touchend', { touches: [touch], identifier: 4, changedTouches: [touch] });
+  SC.Event.trigger(layer, 'touchend', [event]);
 
   if (outerCapture !== 1) ok(false, "outerView.captureTouch should only have been called once!");
   if (outerStart !== 1) ok(false, "outerView.touchStart should only have been called once!");

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

@@ -189,7 +189,7 @@ SC.View.reopen(
         );
 
     The animate functions are intelligent in how they apply animations and
-    calling animate in a manner that would effect an ongoing animation (i.e.
+    calling animate in a manner that would affect an ongoing animation (i.e.
     animating left again while it is still in transition) will result in
     the ongoing animation callback firing immediately with isCancelled set to
     true and adjusting the transition to accomodate the new settings.

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

@@ -145,6 +145,7 @@ SC.View.reopen(
     }
 
     // Ignore undefined values or values equal to the current value.
+    /*jshint eqeqeq:false*/
     if (newValue !== undefined && layout[key] != newValue) { // coerced so '100' == 100
       // Only clone the layout if it is not given.
       if (!newLayout) newLayout = SC.clone(this.get('layout'));
@@ -543,13 +544,16 @@ SC.View.reopen(
       // Add the original, unscaled height and width.
       frame.originalWidth = originalWidth;
       frame.originalHeight = originalHeight;
+
       return frame;
     }
+
     // Get the scale and transform origins, if not provided. (Note inlining of SC.none for performance)
     /*jshint eqnull:true*/
     scale = scale == null ? layout.scale : scale;
     oX = oX == null ? layout.transformOriginX : oX;
     oY = oY == null ? layout.transformOriginY : oY;
+
     // Get defaults.
     if (scale == null) scale = 1;
     if (oX == null) oX = 0.5;
@@ -559,6 +563,7 @@ SC.View.reopen(
     if (scale !== 1) {
       frame = SC.scaleRect(frame, scale, oX, oY);
     }
+
     // Regardless, attach the scale numbers for reference.
     frame.scale = scale;
     frame.transformOriginX = oX;
@@ -797,8 +802,8 @@ SC.View.reopen(
     if (!SC.none(currentLayout.rotate)) {
       if (SC.none(currentLayout.rotateZ) && SC.platform.get('supportsCSS3DTransforms')) {
         currentLayout.rotateZ = currentLayout.rotate;
-      delete currentLayout.rotate;
-    }
+        delete currentLayout.rotate;
+      }
     }
 
     // Optimize notifications depending on if we resized or just moved.
@@ -1139,11 +1144,12 @@ SC.View.reopen(
 
   /** @private */
   _doUpdateLayoutStyle: function () {
-    var context;
+    var layer = this.get('layer'),
+      layoutStyle = this.get('layoutStyle');
 
-    context = this.renderContext(this.get('layer'));
-    context.setStyle(this.get('layoutStyle'));
-    context.update();
+    for (var styleName in layoutStyle) {
+      layer.style[styleName] = layoutStyle[styleName];
+    }
 
     // Reset that an update is required.
     this._layoutStyleNeedsUpdate = false;

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

@@ -11,6 +11,7 @@ sc_require('views/view/animation');
 SC.CSS_TRANSFORM_NAMES = ['rotateX', 'rotateY', 'rotateZ', 'scale'];
 
 SC.CSS_TRANSFORM_MAP = {
+
   rotate: function (val) {
     if (SC.typeOf(val) === SC.T_NUMBER) { val += 'deg'; }
     return 'rotate(' + val + ')';
@@ -41,21 +42,30 @@ SC.CSS_TRANSFORM_MAP = {
 /** @private */
 SC.View.LayoutStyleCalculator = {
 
+  /** @private Shared object used to avoid continually initializing/destroying objects. */
+  _SC_STATE_MAP: null,
+
+  /** @private Shared object used to avoid continually initializing/destroying objects. */
+  _SC_TRANSFORMS_ARRAY: null,
+
+  /** @private Shared object used to avoid continually initializing/destroying objects. */
+  _SC_TRANSITIONS_ARRAY: null,
+
   /** @private If the value is undefined, make it null. */
   _valueOrNull: function (value) {
     return value === undefined ? null : value;
   },
 
   /** @private */
-  _prepareStyle: function (layout) {
+  _prepareStyle: function (style, layout) {
     /*jshint eqnull:true */
     // It's important to provide null defaults to reset any previous style when
     // this is applied.
-    var commonBorder = this._valueOrNull(layout.border),
-      style = {
-        marginLeft: null,
-        marginTop: null
-      };
+    var commonBorder = this._valueOrNull(layout.border);
+
+    // Reset properties that might not be set from style to style.
+    style.marginLeft = null;
+    style.marginTop = null;
 
     // Position and size.
     style.bottom = layout.bottom;
@@ -88,9 +98,12 @@ SC.View.LayoutStyleCalculator = {
     // Handle transforms (including reset).
     if (SC.platform.supportsCSSTransforms) {
       var transformAttribute = SC.browser.experimentalStyleNameFor('transform'),
-        transforms = [],
+        transforms = this._SC_TRANSFORMS_ARRAY, // Shared object used to avoid continually initializing/destroying objects.
         transformMap = SC.CSS_TRANSFORM_MAP;
 
+      // Create the array once. Note: This is a shared array; it must be set to 0 length each time.
+      if (!transforms) { transforms = this._SC_TRANSFORMS_ARRAY = []; }
+
       // The order of the transforms is important so that we can decompose them
       // from the transformation matrix later if necessary.
       for (var i = 0, len = SC.CSS_TRANSFORM_NAMES.length; i < len; i++) {
@@ -103,6 +116,7 @@ SC.View.LayoutStyleCalculator = {
         }
       }
 
+      // Set or reset the transform style.
       style[transformAttribute] = transforms.length > 0 ? transforms.join(' ') : null;
 
       // Transform origin.
@@ -123,24 +137,13 @@ SC.View.LayoutStyleCalculator = {
       style[SC.browser.experimentalStyleNameFor('transition')] = null;
     }
 
-    // for ie, we will NOT use alpha. It is just a source of pain.
-    // a) it will not affect absolutely positioned child elements, and is therefore
-    //    useless for most SC purposes.
-    //
-    // b) It completely breaks semitransparent background images (PNGs with opacity)
-    //
-    // If users want to use alpha, they should do it on their own.
-
-    // if(!SC.none(layout.opacity)) style.filter = "alpha(opacity=%@)".fmt(layout.opacity * 100);
-
-    return style;
+    // Reset shared object!
+    this._SC_TRANSFORMS_ARRAY.length = 0;
   },
 
   /** @private */
-  _prepareState: function (style) {
+  _prepareState: function (state, style) {
     /*jshint eqnull:true */
-    var state = {};
-
     state.hasBottom = (style.bottom != null);
     state.hasRight = (style.right != null);
     state.hasLeft = (style.left != null);
@@ -151,8 +154,6 @@ SC.View.LayoutStyleCalculator = {
     state.hasWidth = (style.width != null);
     state.hasMaxWidth = (style.maxWidth != null);
     state.hasMaxHeight = (style.maxHeight != null);
-
-    return state;
   },
 
 
@@ -277,7 +278,7 @@ SC.View.LayoutStyleCalculator = {
   },
 
   /** @private */
-  // return "auto" for "auto", null for null, converts 0.XY into "XY%".
+  // return "auto" for "auto", null for null, converts 0.X into "X%".
   // otherwise returns the original number, rounded down
   _cssNumber: function (val) {
     /*jshint eqnull:true*/
@@ -293,12 +294,11 @@ SC.View.LayoutStyleCalculator = {
 
     @return {Object} Layout style hash.
   */
-  calculate: function (view) {
+  calculate: function (view, style) {
     var layout = view.get('layout'),
       animations = view._activeAnimations,
-      state,
-      useStaticLayout = view.get('useStaticLayout'),
-      style;
+      state = this._SC_STATE_MAP, // Shared object used to avoid continually initializing/destroying objects.
+      useStaticLayout = view.get('useStaticLayout');
 
     // Fast path!
     // If the developer sets useStaticLayout and doesn't provide a unique `layout` property, we
@@ -307,8 +307,14 @@ SC.View.LayoutStyleCalculator = {
     // use it.
     if (useStaticLayout && layout === SC.View.prototype.layout) { return {}; }
 
-    style = this._prepareStyle(layout);
-    state = this._prepareState(style);
+    // Reset and prep the style object.
+    this._prepareStyle(style, layout);
+
+    // Create the object once. Note: This is a shared object; all properties must be overwritten each time.
+    if (!state) { state = this._SC_STATE_MAP = {}; }
+
+    // Reset and prep the state object.
+    this._prepareState(state, style);
 
     // handle invalid use of auto in absolute layouts
     if (!useStaticLayout) {
@@ -389,7 +395,10 @@ SC.View.LayoutStyleCalculator = {
     // Handle animations
     if (animations) {
       if (SC.platform.supportsCSSTransitions) {
-        var transitions = [];
+        var transitions = this._SC_TRANSITIONS_ARRAY; // Shared object used to avoid continually initializing/destroying objects.
+
+        // Create the array once. Note: This is a shared array; it must be set to 0 length each time.
+        if (!transitions) { transitions = this._SC_TRANSITIONS_ARRAY = []; }
 
         for (key in animations) {
           var animation = animations[key],
@@ -436,6 +445,9 @@ SC.View.LayoutStyleCalculator = {
         }
 
         style[SC.browser.experimentalStyleNameFor('transition')] = transitions.join(", ");
+
+        // Reset shared object!
+        this._SC_TRANSITIONS_ARRAY.length = 0;
       } else {
         // TODO: Do it the JS way
       }
@@ -449,6 +461,9 @@ SC.View.LayoutStyleCalculator = {
 SC.View.reopen(
   /** @scope SC.View.prototype */ {
 
+  /** @private Shared object used to avoid continually initializing/destroying objects. */
+  _SC_STYLE_MAP: null,
+
   /**
     layoutStyle describes the current styles to be written to your element
     based on the layout you defined.  Both layoutStyle and frame reset when
@@ -460,7 +475,14 @@ SC.View.reopen(
     @readOnly
   */
   layoutStyle: function () {
-    return SC.View.LayoutStyleCalculator.calculate(this);
-    // 'hasAcceleratedLayer' is dependent on 'layout' so we don't need 'layout' to be a dependency here
+    var style = this._SC_STYLE_MAP; // Shared object used to avoid continually initializing/destroying objects.
+
+    // Create the object once. Note: This is a shared object; all properties must be overwritten each time.
+    if (!style) { style = this._SC_STYLE_MAP = {}; }
+
+    return SC.View.LayoutStyleCalculator.calculate(this, style);
+
+  // 'hasAcceleratedLayer' is dependent on 'layout' so we don't need 'layout' to be a dependency here
   }.property('hasAcceleratedLayer', 'useStaticLayout').cacheable()
+
 });

data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js

@@ -109,7 +109,13 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @returns {SC.Store} receiver
   */
   cascade: function(dataSource) {
-    var dataSources = SC.A(arguments) ;
+    var dataSources;
+
+    // Fast arguments access.
+    // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+    dataSources = new Array(arguments.length); //  SC.A(arguments)
+    for (var i = 0, len = dataSources.length; i < len; i++) { dataSources[i] = arguments[i]; }
+
     dataSource = SC.CascadeDataSource.create({
       dataSources: dataSources
     });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js

@@ -91,7 +91,7 @@ module("SC.ScrollView", {
     SC.run(function () {
       pane.destroy();
     });
-    pane = view = null;
+    pane = view = view2 = view3 = view4 = null;
   }
 });
 
@@ -117,6 +117,194 @@ test("Scrolling to a certain co-ordinate of the container view", function () {
   });
 });
 
+
+test("Scroll offsets are correct when scroll view's frame changes", function () {
+
+  // Scenario: left & top aligned, at maximums, scroll view shrinks: don't move content
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    pane.adjust({ width: 64, height: 64 });
+    equals(view.get('horizontalScrollOffset'), 3900, "After resizing the pane with adjust height of 64, horizontal offset must not change");
+    equals(view.get('verticalScrollOffset'), 3900, "After resizing the pane with adjust width of 64, vertical offset must not change");
+  });
+
+  // Reset the parent view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    pane.adjust({ width: 114, height: 114 });
+  });
+
+  // Scenario: left & top aligned, at maximums, scroll view grows: hug the right & bottom sides.
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    pane.adjust({ width: 1014, height: 1014 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the pane with adjust height of 1014, horizontal offset must be maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the pane with adjust width of 1014, vertical offset must be maximum");
+  });
+
+  // Reset the parent view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    pane.adjust({ width: 114, height: 114 });
+  });
+
+  // Set alignments to hug right and bottom edges.
+  SC.run(function() {
+    view.set('horizontalAlign', SC.ALIGN_RIGHT);
+    view.set('verticalAlign', SC.ALIGN_BOTTOM);
+  });
+
+  // Scenario: right & bottom aligned, at maximums, scroll view shrinks: hug the right & bottom sides.
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    pane.adjust({ width: 64, height: 64 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the pane with adjust height of 64, horizontal offset must be maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the pane with adjust width of 64, vertical offset must be maximum");
+  });
+
+  // Reset the parent view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    pane.adjust({ width: 114, height: 114 });
+  });
+
+  // Scenario: right & bottom aligned, at maximums, scroll view grows: hug the right & bottom sides.
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    pane.adjust({ width: 1014, height: 1014 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the pane with adjust height of 1014, horizontal offset must be maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the pane with adjust width of 1014, vertical offset must be maximum");
+  });
+
+  // Reset the parent view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    pane.adjust({ width: 114, height: 114 });
+  });
+
+  // Set alignments to be center and middle.
+  SC.run(function() {
+    view.set('horizontalAlign', SC.ALIGN_CENTER);
+    view.set('verticalAlign', SC.ALIGN_MIDDLE);
+  });
+
+  // Scenario: center & middle aligned, at center & middle, scroll view shrinks: stick to center & middle
+  SC.run(function () {
+    view.scrollBy(1950, 1950);
+    pane.adjust({ width: 64, height: 64 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset') / 2, "After resizing the pane with adjust height of 64, horizontal offset should stay centered");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset') / 2, "After resizing the pane with adjust width of 64, vertical offset should stay centered");
+  });
+
+  // Reset the parent view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    pane.adjust({ width: 114, height: 114 });
+  });
+
+  // Scenario: center & middle aligned, at center & middle, scroll view grows: stick to center & middle
+  SC.run(function () {
+    view.scrollBy(1950, 1950);
+    pane.adjust({ width: 1014, height: 1014 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset') / 2, "After resizing the pane with adjust height of 1014, horizontal offset should stay centered");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset') / 2, "After resizing the pane with adjust width of 1014, vertical offset should stay centered");
+  });
+});
+
+test("Scroll offsets are correct when scroll view's content frame changes", function () {
+  var contentView = view.get('contentView');
+
+  // Scenario: left & top aligned, at maximums, content view shrinks: hug the right & bottom sides
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    contentView.adjust({ width: 3900, height: 3900 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the content with adjust width of 3900, horizontal offset must be at maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the content with adjust height of 3900 vertical offset must be at maximum");
+  });
+
+  // Reset the view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    contentView.adjust({ width: 4000, height: 4000 });
+  });
+
+  // Scenario: left & top aligned, at maximums, content view grows: don't move
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    contentView.adjust({ width: 4100, height: 4100 });
+    equals(view.get('horizontalScrollOffset'), 3900, "After resizing the content with adjust width of 4100, horizontal offset must not change");
+    equals(view.get('verticalScrollOffset'), 3900, "After resizing the content with adjust height of 4100, vertical offset must not change");
+  });
+
+  // Reset the view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    contentView.adjust({ width: 4000, height: 4000 });
+  });
+
+  // Set alignments to hug right and bottom edges.
+  SC.run(function() {
+    view.set('horizontalAlign', SC.ALIGN_RIGHT);
+    view.set('verticalAlign', SC.ALIGN_BOTTOM);
+  });
+
+  // Scenario: right & bottom aligned, at maximums, content view shrinks: hug the right & bottom sides.
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    contentView.adjust({ width: 3900, height: 3900 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the content with adjust width of 3900, horizontal offset must be at maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the content with adjust height of 3900 vertical offset must be at maximum");
+  });
+
+  // Reset the view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    contentView.adjust({ width: 4000, height: 4000 });
+  });
+
+  // Scenario: right & bottom aligned, at maximums, content view grows: hug the right & bottom sides.
+  SC.run(function () {
+    view.scrollBy(3900, 3900);
+    contentView.adjust({ width: 4100, height: 4100 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "After resizing the content with adjust width of 4100, horizontal offset must be at maximum");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "After resizing the content with adjust height of 4100 vertical offset must be at maximum");
+  });
+
+  // Reset the view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    contentView.adjust({ width: 4000, height: 4000 });
+  });
+
+  // Set alignments to be center and middle.
+  SC.run(function() {
+    view.set('horizontalAlign', SC.ALIGN_CENTER);
+    view.set('verticalAlign', SC.ALIGN_MIDDLE);
+  });
+
+  // Scenario: center & middle aligned, at center & middle, content view shrinks: stick to center & middle
+  SC.run(function () {
+    view.scrollBy(1950, 1950);
+    contentView.adjust({ width: 3900, height: 3900 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset') / 2, "After resizing the content with adjust width of 3900, horizontal offset should stay centered");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset') / 2, "After resizing the content with adjust height of 3900 vertical offset should stay centered");
+  });
+
+  // Reset the view.
+  SC.run(function () {
+    view.scrollTo(0, 0);
+    contentView.adjust({ width: 4000, height: 4000 });
+  });
+
+  // Scenario: center & middle aligned, at center & middle, scroll view grows: stick to center & middle
+  SC.run(function () {
+    view.scrollBy(1950, 1950);
+    contentView.adjust({ width: 4100, height: 4100 });
+    equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset') / 2, "After resizing the content with adjust width of 4100, horizontal offset should stay centered");
+    equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset') / 2, "After resizing the content with adjust height of 4100 vertical offset should stay centered");
+  });
+});
+
 test("Scrolling relative to the current possition of the container view", function () {
   equals(view.get('horizontalScrollOffset'), 0, "Initial horizontal offset must be zero");
   equals(view.get('verticalScrollOffset'), 0, "Initial vertical offset must be zero");
@@ -156,22 +344,26 @@ test("Scrolling to a rectangle", function () {
 });
 
 test("Scrolling to a view", function() {
-  var pane = SC.MainPane.create({
-    childViews: ['scrollView'],
-    scrollView: SC.ScrollView.create({
-      layout: { height: 100, width: 100 },
-      canScale: YES,
-      contentView: SC.View.create({
-        layout: { height: 500, width: 500 },
-        childViews: ['innerView1', 'innerView2'],
-        innerView1: SC.View.create({
-          layout: { height: 100, width: 100, top: 150, left: 150 }
-        }),
-        innerView2: SC.View.create({
-          layout: { height: 100, width: 100, top: 200, left: 200 }
+  var pane;
+
+  SC.run(function () {
+    pane = SC.MainPane.create({
+      childViews: ['scrollView'],
+      scrollView: SC.ScrollView.create({
+        layout: { height: 100, width: 100 },
+        canScale: YES,
+        contentView: SC.View.create({
+          layout: { height: 500, width: 500 },
+          childViews: ['innerView1', 'innerView2'],
+          innerView1: SC.View.create({
+            layout: { height: 100, width: 100, top: 150, left: 150 }
+          }),
+          innerView2: SC.View.create({
+            layout: { height: 100, width: 100, top: 200, left: 200 }
+          })
         })
       })
-    })
+    });
   });
 
   var scrollView = pane.scrollView,
@@ -286,7 +478,7 @@ test("maximumVerticalScrollOffset() returns the maximum vertical scroll dimensio
 
 // ------------------------------------
 // mouseWheel events
-//
+
 
 test("Mouse wheel events should only be captured if the scroll can scroll in the direction (both TOP-LEFT).", function () {
   // FIRST GROUP: everything scrolled all the way to the top left
@@ -344,18 +536,13 @@ test("Mouse wheel events not capturable by the inner scroll should bubble to the
     view4.scrollTo(114, 114);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 10, wheelDeltaY: 0 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('horizontalScrollOffset'), 114, 'The inner scroll view should still have horizontalScrollOffset');
     equals(view3.get('horizontalScrollOffset'), 10, 'The outer scroll view should now have horizontalScrollOffset');
-    window.start();
-  }, interval: 200});
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events not capturable by the inner scroll should bubble to the outer scroll (scroll down).", function () {
@@ -367,18 +554,13 @@ test("Mouse wheel events not capturable by the inner scroll should bubble to the
     view4.scrollTo(114, 114);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 0, wheelDeltaY: 10 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('verticalScrollOffset'), 114, 'The inner scroll view should still have verticalScrollOffset');
     equals(view3.get('verticalScrollOffset'), 10, 'The outer scroll view should now have verticalScrollOffset');
-    window.start();
-  }, interval: 200});
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events not capturable by the inner scroll should bubble to the outer scroll (scroll left).", function () {
@@ -388,19 +570,16 @@ test("Mouse wheel events not capturable by the inner scroll should bubble to the
   SC.run(function () {
     view3.scrollTo(114, 114);
     view4.scrollTo(0, 0);
-
-    SC.Timer.schedule({ target: this, action: function () {
-      equals(view4.get('horizontalScrollOffset'), 0, 'The inner scroll view should still have horizontalScrollOffset');
-      equals(view3.get('horizontalScrollOffset'), 104, 'The outer scroll view should now have horizontalScrollOffset');
-      window.start();
-    }, interval: 200});
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: -10, wheelDeltaY: 0 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
+  SC.run(function () {
+      equals(view4.get('horizontalScrollOffset'), 0, 'The inner scroll view should still have horizontalScrollOffset');
+      equals(view3.get('horizontalScrollOffset'), 104, 'The outer scroll view should now have horizontalScrollOffset');
+
+  });
 });
 
 test("Mouse wheel events not capturable by the inner scroll should bubble to the outer scroll (scroll up).", function () {
@@ -412,18 +591,13 @@ test("Mouse wheel events not capturable by the inner scroll should bubble to the
     view4.scrollTo(0, 0);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 0, wheelDeltaY: -10 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('verticalScrollOffset'), 0, 'The inner scroll view should still have verticalScrollOffset');
     equals(view3.get('verticalScrollOffset'), 104, 'The outer scroll view should now have verticalScrollOffset');
-    window.start();
-  }, interval: 200 });
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events capturable by the inner scroll should not bubble to the outer scroll (scroll right).", function () {
@@ -435,18 +609,13 @@ test("Mouse wheel events capturable by the inner scroll should not bubble to the
     view4.scrollTo(0, 0);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 10, wheelDeltaY: 0 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('horizontalScrollOffset'), 10, 'The inner scroll view should now have horizontalScrollOffset');
     equals(view3.get('horizontalScrollOffset'), 0, 'The outer scroll view should still have horizontalScrollOffset');
-    window.start();
-  }, interval: 200 });
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events capturable by the inner scroll should not bubble to the outer scroll (scroll up).", function () {
@@ -458,18 +627,13 @@ test("Mouse wheel events capturable by the inner scroll should not bubble to the
     view4.scrollTo(114, 114);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 0, wheelDeltaY: -10 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('verticalScrollOffset'), 104, 'The inner scroll view should now have verticalScrollOffset');
     equals(view3.get('verticalScrollOffset'), 114, 'The outer scroll view should still have verticalScrollOffset');
-    window.start();
-  }, interval: 200 });
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events capturable by the inner scroll should not bubble to the outer scroll (scroll left).", function () {
@@ -481,18 +645,13 @@ test("Mouse wheel events capturable by the inner scroll should not bubble to the
     view4.scrollTo(114,  114);
   });
 
-  window.stop();
-
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: -10, wheelDeltaY: 0 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('horizontalScrollOffset'), 104, 'The inner scroll view should now have horizontalScrollOffset');
     equals(view3.get('horizontalScrollOffset'), 114, 'The outer scroll view should still have horizontalScrollOffset');
-    window.start();
-  }, interval: 200 });
-  SC.RunLoop.end();
+  });
 });
 
 test("Mouse wheel events capturable by the inner scroll should not bubble to the outer scroll (scroll down).", function () {
@@ -504,18 +663,15 @@ test("Mouse wheel events capturable by the inner scroll should not bubble to the
     view4.scrollTo(0, 0);
   });
 
-  window.stop();
+  // window.stop();
 
   event = SC.Event.simulateEvent(elem, 'mousewheel', { wheelDeltaX: 0, wheelDeltaY: 10 });
   SC.Event.trigger(elem, 'mousewheel', event);
 
-  SC.RunLoop.begin();
-  SC.Timer.schedule({ target: this, action: function () {
+  SC.run(function () {
     equals(view4.get('verticalScrollOffset'), 10, 'The inner scroll view should now have verticalScrollOffset');
     equals(view3.get('verticalScrollOffset'), 0, 'The outer scroll view should still have verticalScrollOffset');
-    window.start();
-  }, interval: 200 });
-  SC.RunLoop.end();
+  });
 });
 
 // ------------------------------------