sproutcore 1.10.0.rc.2 → 1.10.0.rc.3

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js

@@ -33,21 +33,30 @@ SC.ContentValueSupport = {
   hasContentValueSupport: YES,
 
   /** @private */
-  initMixin: function() {
+  initMixin: function () {
     // setup content observing if needed.
     this._control_contentKeysDidChange();
   },
-  
+
+  /** @private */
+  destroyMixin: function () {
+    // Remove old observers on self.
+    this._cleanup_old_observers();
+
+    // Remove old observers on content.
+    this._cleanup_old_content_observers();
+  },
+
   /**
     The value represented by this control.
-    
+
     Most controls represent a value of some type, such as a number, string
     or image URL.  This property should hold that value.  It is bindable
     and observable.  Changing this value will immediately change the
-    appearance of the control.  Likewise, editing the control 
+    appearance of the control.  Likewise, editing the control
     will immediately change this value.
-    
-    If instead of setting a single value on a control, you would like to 
+
+    If instead of setting a single value on a control, you would like to
     set a content object and have the control display a single property
     of that control, then you should use the content property instead.
 
@@ -55,23 +64,23 @@ SC.ContentValueSupport = {
     @default null
   */
   value: null,
-  
+
   /**
     The content object represented by this control.
-    
-    Often you need to use a control to display some single aspect of an 
+
+    Often you need to use a control to display some single aspect of an
     object, especially if you are using the control as an item view in a
     collection view.
-    
+
     In those cases, you can set the content and contentValueKey for the
     control.  This will cause the control to observe the content object for
-    changes to the value property and then set the value of that property 
+    changes to the value property and then set the value of that property
     on the "value" property of this object.
-    
-    Note that unless you are using this control as part of a form or 
+
+    Note that unless you are using this control as part of a form or
     collection view, then it would be better to instead bind the value of
     the control directly to a controller property.
-    
+
     @type SC.Object
     @default null
   */
@@ -92,42 +101,42 @@ SC.ContentValueSupport = {
   _default_contentKeys: {
     contentValueKey: 'value'
   },
-  
+
   /**
-    The property on the content object that would want to represent the 
+    The property on the content object that would want to represent the
     value of this control.  This property should only be set before the
     content object is first set.  If you have a displayDelegate, then
     you can also use the contentValueKey of the displayDelegate.
-    
+
     @type String
     @default null
   */
   contentValueKey: null,
-  
+
   /**
-    Invoked whenever any property on the content object changes.  
-    
+    Invoked whenever any property on the content object changes.
+
     The default implementation will update the value property of the view
     if the contentValueKey property has changed.  You can override this
     method to implement whatever additional changes you would like.
-    
-    The key will typically contain the name of the property that changed or 
+
+    The key will typically contain the name of the property that changed or
     '*' if the content object itself has changed.  You should generally do
     a total reset if '*' is changed.
-    
+
     @param {Object} target the content object
     @param {String} key the property that changes
     @returns {void}
     @test in content
   */
-  contentPropertyDidChange: function(target, key) {
+  contentPropertyDidChange: function (target, key) {
     var contentKeys = this.get('contentKeys');
 
-    if(contentKeys) {
+    if (contentKeys) {
       var contentKey;
 
-      for(contentKey in contentKeys) {
-        if(key === '*' || key === this.getDelegateProperty(contentKey, this, this.get('displayDelegate'), contentKeys)) return this.updatePropertyFromContent(contentKeys[contentKey], key, contentKey, target);
+      for (contentKey in contentKeys) {
+        if (key === '*' || key === this.getDelegateProperty(contentKey, this, this.get('displayDelegate'), contentKeys)) return this.updatePropertyFromContent(contentKeys[contentKey], key, contentKey, target);
       }
     }
 
@@ -137,65 +146,65 @@ SC.ContentValueSupport = {
   },
 
   /**
-    Helper method you can use from your own implementation of 
+    Helper method you can use from your own implementation of
     contentPropertyDidChange().  This method will look up the content key to
     extract a property and then update the property if needed.  If you do
-    not pass the content key or the content object, they will be computed 
+    not pass the content key or the content object, they will be computed
     for you.  It is more efficient, however, for you to compute these values
     yourself if you expect this method to be called frequently.
-    
+
     @param {String} prop local property to update
     @param {String} key the contentproperty that changed
     @param {String} contentKey the local property that contains the key
     @param {Object} content
     @returns {SC.Control} receiver
   */
-  updatePropertyFromContent: function(prop, key, contentKey, content) {
+  updatePropertyFromContent: function (prop, key, contentKey, content) {
     var del, v;
 
-    if (contentKey === undefined) contentKey = "content"+prop.capitalize()+"Key";
-    
+    if (contentKey === undefined) contentKey = "content" + prop.capitalize() + "Key";
+
     // prefer our own definition of contentKey
-    if(this[contentKey]) contentKey = this.get(contentKey);
+    if (this[contentKey]) contentKey = this.get(contentKey);
     // if we don't have one defined check the delegate
-    else if((del = this.get('displayDelegate')) && (v = del[contentKey])) contentKey = del.get ? del.get(contentKey) : v;
+    else if ((del = this.get('displayDelegate')) && (v = del[contentKey])) contentKey = del.get ? del.get(contentKey) : v;
     // if we have no key we can't do anything so just short circuit out
     else return this;
 
     // only bother setting value if the observer triggered for the correct key
     if (key === '*' || key === contentKey) {
       if (content === undefined) content = this.get('content');
-      
-      if(content) v = content.get ? content.get(contentKey) : content[contentKey];
+
+      if (content) v = content.get ? content.get(contentKey) : content[contentKey];
       else v = null;
 
-      this.setIfChanged(prop, v) ;
+      this.setIfChanged(prop, v);
     }
-    
-    return this ;
+
+    return this;
   },
-  
+
   /**
     Relays changes to the value back to the content object if you are using
     a content object.
-    
+
     This observer is triggered whenever the value changes.  It will only do
     something if it finds you are using the content property and
     contentValueKey and the new value does not match the old value of the
-    content object.  
-    
+    content object.
+
     If you are using contentValueKey in some other way than typically
     implemented by this mixin, then you may want to override this method as
     well.
-    
+
     @returns {void}
   */
-  updateContentWithValueObserver: function(target, key) {
+  updateContentWithValueObserver: function (target, key) {
     var reverseContentKeys = this._reverseContentKeys;
 
     // if everything changed, iterate through and update them all
-    if(!key || key === '*') {
-      for(key in reverseContentKeys) {
+    if (!key || key === '*') {
+      for (key in reverseContentKeys) {
         this.updateContentWithValueObserver(this, key);
       }
     }
@@ -217,7 +226,7 @@ SC.ContentValueSupport = {
 
     // avoid re-writing inherited props
     else if (content[contentKey] !== value) {
-      content[contentKey] = value ;
+      content[contentKey] = value;
     }
   },
 
@@ -230,56 +239,34 @@ SC.ContentValueSupport = {
   _old_contentKeys: null,
 
   /** @private
-    Observes when a content object has changed and handles notifying 
+    Observes when a content object has changed and handles notifying
     changes to the value of the content object.
 
     Optimized for the default case of only observing contentValueKey. If you use
     a custom value for contentKeys it will switch to using a CoreSet to track
     observed keys.
   */
-  _control_contentDidChange: function(target, key) {
+  _control_contentDidChange: function (target, key) {
     var content = this.get('content'),
     contentKeys = this.get('contentKeys'), contentKey,
-    old = this._control_content,
     oldKeys = this._old_contentValueKeys,
-    oldType = SC.typeOf(oldKeys),
     f = this.contentPropertyDidChange;
 
     // remove an observer from the old content if necessary
-    if (old && old.removeObserver && oldKeys) {
-      // default case
-      if(oldType === SC.T_STRING) {
-        old.removeObserver(oldKeys, this, f);
-
-        oldKeys = null;
-      }
-
-      // set case
-      else {
-        var i, len = oldKeys.get('length');
-
-        for(i = 0; i < len; i++) {
-          contentKey = oldKeys[i];
-
-          old.removeObserver(contentKey, this, f);
-        }
-
-        oldKeys.clear();
-      }
-    }
+    this._cleanup_old_content_observers();
 
     // add observer to new content if necessary.
     if (content && content.addObserver) {
       // set case
-      if(contentKeys) {
+      if (contentKeys) {
         // lazily create the key set
-        if(!oldKeys) oldKeys = SC.CoreSet.create();
+        if (!oldKeys) oldKeys = SC.CoreSet.create();
 
         // add observers to each key
-        for(contentKey in contentKeys) {
+        for (contentKey in contentKeys) {
           contentKey = this.getDelegateProperty(contentKey, this, this.get('displayDelegate'));
 
-          if(contentKey) {
+          if (contentKey) {
             content.addObserver(contentKey, this, f);
 
             oldKeys.add(contentKey);
@@ -291,11 +278,11 @@ SC.ContentValueSupport = {
       else {
         contentKey = this.getDelegateProperty('contentValueKey', this, this.get('displayDelegate'));
 
-        if(contentKey) {
+        if (contentKey) {
           content.addObserver(contentKey, this, f);
 
           // if we had a set before, continue using it
-          if(oldKeys) oldKeys.add(contentKey);
+          if (oldKeys) oldKeys.add(contentKey);
           // otherwise just use a string
           else oldKeys = contentKey;
         }
@@ -303,40 +290,31 @@ SC.ContentValueSupport = {
     }
 
     // update previous values
-    this._control_content = content ;
+    this._control_content = content;
     this._old_contentValueKeys = oldKeys;
 
     // notify that value did change.
     key = (!key || key === 'content') ? '*' : this.get(key);
-    if(key) this.contentPropertyDidChange(content, key) ;
+    if (key) this.contentPropertyDidChange(content, key);
   }.observes('content'),
 
-  // holds the previous value of contentKeys
-  _old_contentKeys: null,
-
   /** @private
     Observes changes to contentKeys and sets up observers on the local keys to
     update the observers on the content object.
   */
-  _control_contentKeysDidChange: function() {
+  _control_contentKeysDidChange: function () {
     var key, reverse = {},
     // if no hash is present, use the default contentValueKey -> value
-    contentKeys = this.get('contentKeys') || this._default_contentKeys, contentKey,
-    oldContentKeys = this._old_contentKeys,
+    contentKeys = this.get('contentKeys') || this._default_contentKeys,
+    contentKey,
     f = this._control_contentDidChange,
     reverseF = this.updateContentWithValueObserver;
 
-    // remove old observers
-    for(key in oldContentKeys) {
-      contentKey = oldContentKeys[key];
-
-      this.removeObserver(contentKey, this, reverseF);
-
-      this.removeObserver(key, this, f);
-    }
+    // Remove old observers.
+    this._cleanup_old_observers();
 
     // add new observers
-    for(key in contentKeys) {
+    for (key in contentKeys) {
       contentKey = contentKeys[key];
 
       // build reverse mapping to update content with value
@@ -356,6 +334,53 @@ SC.ContentValueSupport = {
 
     // call the other observer now to update all the observers
     this._control_contentDidChange();
-  }.observes('contentKeys')
+  }.observes('contentKeys'),
+
+  /** @private */
+  _cleanup_old_content_observers: function () {
+    var old = this._control_content,
+      oldKeys = this._old_contentValueKeys,
+      oldType = SC.typeOf(oldKeys),
+      f = this.contentPropertyDidChange,
+      contentKey;
+
+    if (old && old.removeObserver && oldKeys) {
+      // default case
+      if (oldType === SC.T_STRING) {
+        old.removeObserver(oldKeys, this, f);
+
+        oldKeys = null;
+      }
+
+      // set case
+      else {
+        var i, len = oldKeys.get('length');
+
+        for (i = 0; i < len; i++) {
+          contentKey = oldKeys[i];
+
+          old.removeObserver(contentKey, this, f);
+        }
+
+        oldKeys.clear();
+      }
+    }
+  },
+
+  /** @private */
+  _cleanup_old_observers: function () {
+    var oldContentKeys = this._old_contentKeys,
+      f = this._control_contentDidChange,
+      reverseF = this.updateContentWithValueObserver,
+      contentKey, key;
+
+    // remove old observers
+    for (key in oldContentKeys) {
+      contentKey = oldContentKeys[key];
+
+      this.removeObserver(contentKey, this, reverseF);
+      this.removeObserver(key, this, f);
+    }
+  }
 };
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js

@@ -4,10 +4,10 @@
 //            ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-var view, contentA, contentB;
+var view, pane, contentA, contentB;
 
 module('ContentDisplay', {
-  setup: function() {
+  setup: function () {
     contentA = SC.Object.create({
       foo: 'foo.A',
       bar: 'bar.A'
@@ -18,32 +18,43 @@ module('ContentDisplay', {
       bar: 'bar.B'
     });
 
+    pane = SC.Pane.create();
     view = SC.View.create(SC.ContentDisplay, {
       contentDisplayProperties: ['foo', 'bar'],
       content: contentA
     });
+    pane.appendChild(view);
+    pane.append();
+  },
 
-    view.set('layerNeedsUpdate', NO);
+  teardown: function () {
+    pane.destroy();
+    contentA.destroy();
+    contentB.destroy();
+    pane = view = contentA = contentB = null;
   }
 });
 
 test('should dirty layer when content changes', function () {
   SC.run(function () {
     view.set('content', contentB);
+
+    ok(view.get('layerNeedsUpdate'), "The view's layerNeedsUpdate should be true.");
   });
-  ok(view.get('layerNeedsUpdate'));
 });
 
 test('should dirty layer when any of contentDisplayProperties change', function () {
   SC.run(function () {
     contentA.set('foo', 'newFoo');
+
+    ok(view.get('layerNeedsUpdate'), "The view's layerNeedsUpdate should be true.");
   });
-  ok(view.get('layerNeedsUpdate'));
 });
 
 test('should stop observing old content when content changes', function () {
   ok(contentA.hasObserverFor('*'));
   view.set('content', contentB);
+
   ok(!contentA.hasObserverFor('*'));
 });
 
@@ -52,8 +63,9 @@ test('should begin observing new content when content changes', function () {
   view.set('layerNeedsUpdate', NO);
   SC.run(function () {
     contentB.set('bar', 'newBar');
+
+    ok(view.get('layerNeedsUpdate'), "The view's layerNeedsUpdate should be true.");
   });
-  ok(view.get('layerNeedsUpdate'));
 });
 
 test('should stop observing content when destroyed', function () {

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js

@@ -7,18 +7,19 @@
 
 /*global module test htmlbody ok equals same stop start Q$ */
 
-var field;
+var field, view;
 
 /**
   Track the public functions and properties of the class.  This will serve as an early warning
   when functions that people may depend on disappear between versions to ensure that we don't
   break promised support without proper deprecations.
-  
+
   tylerkeating: This is probably redundant since each of these functions and properties should
   be individually tested elsewhere.
 */
 module("Test the public functions and properties of SC.InlineTextFieldView", {
   setup: function() {
+    view = SC.View.create(SC.InlineEditable, {});
     field = SC.InlineTextFieldView.create({});
   },
 
@@ -27,15 +28,6 @@ module("Test the public functions and properties of SC.InlineTextFieldView", {
   }
 });
 
-
-test("contains all public class functions",
-function() {
-  ok(SC.typeOf(SC.InlineTextFieldView['beginEditing']) === SC.T_FUNCTION, "should respond to beginEditing()");
-  ok(SC.typeOf(SC.InlineTextFieldView['commitEditing']) === SC.T_FUNCTION, "should respond to commitEditing()");
-  ok(SC.typeOf(SC.InlineTextFieldView['discardEditing']) === SC.T_FUNCTION, "should respond to discardEditing()");
-});
-
-
 test("contains all public functions",
 function() {
   ok(field.respondsTo('beginEditing'), "should respond to beginEditing()");
@@ -45,6 +37,12 @@ function() {
   ok(field.respondsTo('cancel'), "should respond to cancel()");
 });
 
+test("a view with SC.InlineEditable mixin contains all public functions",
+function() {
+  ok(view.respondsTo('beginEditing'), "should respond to beginEditing()");
+  ok(view.respondsTo('commitEditing'), "should respond to commitEditing()");
+  ok(view.respondsTo('discardEditing'), "should respond to discardEditing()");
+});
 
 test("contains all public properties",
 function() {

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/transition_test.js

@@ -62,7 +62,7 @@ test("Test that the isTransitioning property of container view updates according
   window.stop(2000);
 
   SC.run(function () {
-    containerView.set('transition', SC.ContainerView.PUSH);
+    containerView.set('transitionSwap', SC.ContainerView.PUSH);
     containerView.set('nowShowing', view2);
   });
 
@@ -112,7 +112,7 @@ test("Test that the container view calls the proper transition plugin methods.",
     didBuildOutFromView: function () { didBuildOutFromViewCalled++; }
   };
 
-  containerView.set('transition', plugin);
+  containerView.set('transitionSwap', plugin);
   containerView.set('nowShowing', view2);
   equals(willBuildInToViewCalled, 1, "willBuildInToViewCalled() should have been called this many times");
   equals(willBuildOutFromViewCalled, 1, "willBuildOutFromViewCalled() should have been called this many times");

data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js

@@ -169,15 +169,25 @@ SC.ContainerView = SC.View.extend(
   // Methods
   //
 
-  /** @private
-    When a container view awakes, it will try to find the nowShowing, if
-    there is one, and set it as content if necessary.
-  */
-  awake: function () {
+  /** @private */
+  init: function () {
+    var view;
+
     sc_super();
 
     if (this.get('nowShowing')) {
+      // If nowShowing is directly set, invoke the instantiation of
+      // it as well.
       this.nowShowingDidChange();
+    } else {
+      // If contentView is directly set, then swap it into nowShowing so that it
+      // is properly instantiated and ready for swapping.
+      // Fixes: https://github.com/sproutcore/sproutcore/issues/1069
+      view = this.get('contentView');
+
+      if (view) {
+        this.set('nowShowing', view);
+      }
     }
   },
 
@@ -208,17 +218,6 @@ SC.ContainerView = SC.View.extend(
     return ret;
   }.property('parentView', 'frame').cacheable(),
 
-  /** @private */
-  createChildViews: function () {
-    // if contentView is defined, then create the content
-    var view = this.get('contentView');
-
-    if (view) {
-      view = this.contentView = this.createChildView(view);
-      this.childViews = [view];
-    }
-  },
-
   /** @private
     Invoked whenever the content property changes.  This method will simply
     call replaceContent.  Override replaceContent to change how the view is

data/lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js

@@ -96,6 +96,17 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
   */
   _topOffsetForFirefoxCursorFix: 0,
 
+  /**
+    The default size of the inline text field is 0 x 0 so that when it is
+    appended, but before it is positioned it doesn't fill the parent view
+    entirely.
+
+    This is important, because if the parent view layer allows overflow,
+    we could inadvertently alter the scrollTop or scrollLeft properties
+    of the layer.
+    */
+  layout: { height: 0, width: 0 },
+
   /*
   * @private
   * @method

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js

@@ -838,7 +838,7 @@ SC.Reducers = /** @scope SC.Reducers.prototype */ {
     // or lastObject properties changed, thus making them independently observable.
     if (!SC.none(start)) {
       if (start === 0) this.notifyPropertyChange('firstObject');
-      if (!SC.none(length) && start + length === this.get('length') - 1) this.notifyPropertyChange('lastObject');
+      if (!SC.none(length) && start + length >= this.get('length') - 1) this.notifyPropertyChange('lastObject');
     }
 
     this.notifyPropertyChange('[]');

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -598,7 +598,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     while ((queue = this._connectQueue).length > 0) {
       this._connectQueue = this._alternateConnectQueue;
       this._alternateConnectQueue = queue;
-      while (binding = queue.pop()) binding._connect();
+      while ((binding = queue.pop())) { binding._connect(); }
     }
 
     // loop through the changed queue...
@@ -617,7 +617,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       // next, apply any bindings in the current queue.  This may cause
       // additional bindings to trigger, which will end up in the new active
       // queue.
-      while (binding = queue.pop()) binding.applyBindingValue();
+      while ((binding = queue.pop())) { binding.applyBindingValue(); }
 
       // now loop back and see if there are additional changes pending in the
       // active queue.  Repeat this until all bindings that need to trigger
@@ -821,7 +821,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     var t = binding._transforms;
 
     // clone the transform array if this comes from the parent
-    if (t && (t === binding.parentBinding._transform)) {
+    if (t && (t === binding.parentBinding._transforms)) {
       t = binding._transforms = t.slice();
     }