sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js

@@ -25,7 +25,7 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
 
     This property must be set before instantiation; any changes after instantiation
     will not function properly.
-    
+
     @property
     @type {Boolean}
     @default YES
@@ -34,20 +34,20 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
 
   /**
     The minimum width for this menu if it is to be automatically resized.
-    
+
     If no value is specified, it will be determined from the controlSize.
-    
-    @property {Number}
+
+    @type Number
     @default minimumMenuWidth from render delegate, or 0.
   */
   minimumMenuWidth: SC.propertyFromRenderDelegate('minimumMenuWidth', 0),
 
   /**
     The amount to add to any calculated width.
-    
+
     If no value is specified, it will be determined from the controlSize.
-    
-    @property {Number}
+
+    @type Number
     @default menuWidthPadding from render delegate, or 0
   */
   menuWidthPadding: SC.propertyFromRenderDelegate('menuWidthPadding', 0),
@@ -58,7 +58,7 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
   */
   init: function() {
     sc_super();
-    
+
     this.set('exampleView', SC.AutoResizingMenuItemView);
 
     if (this.get('shouldAutoResize')) {

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js

@@ -28,7 +28,7 @@ SC.SelectView = SC.PopupButtonView.extend({
     various itemKey properties to tell the menu how to extract the information
     it needs.
 
-    @property {Array}
+    @type Array
     @default []
   */
   items: null,
@@ -74,27 +74,27 @@ SC.SelectView = SC.PopupButtonView.extend({
 
   /**
      Key used to extract icons from the items array.
-     
+
      @property
      @type {String}
      @default null
   */
   itemIconKey: null,
-  
+
   /**
     Key to use to identify separators.
-    
+
     Items that have this property set to YES will be drawn as separators.
-    
+
     @property
     @type {String}
     @default null
   */
   itemSeparatorKey: "separator",
-  
+
   /**
     Key used to indicate if the item is to be enabled.
-    
+
     @property
     @type {String}
     @default null
@@ -104,13 +104,13 @@ SC.SelectView = SC.PopupButtonView.extend({
 
   /**
    The menu that will pop up when this button is clicked.
-   
+
    The default menu has its properties bound to the SC.SelectView,
    meaning that it will get all its items from the SelectView.
    You may override the menu entirely with one of your own; if you
    mix in SC.SelectViewMenu, it'll get the bindings and the extended
    MenuItemView that draws its checkbox when it is the selected item.
-   
+
    @property
    @type {SC.MenuPane}
    @default SC.AutoResizingMenuPane.extend(SC.SelectViewMenu)
@@ -119,9 +119,9 @@ SC.SelectView = SC.PopupButtonView.extend({
 
   /**
     The currently selected item. If no item is selected, `null`.
-    
+
     @private
-    @property {SC.Object}
+    @type SC.Object
     @default null
     @isReadOnly
    */
@@ -130,9 +130,9 @@ SC.SelectView = SC.PopupButtonView.extend({
 
 
   /**
-    This is a property to enable/disable focus rings in buttons. 
+    This is a property to enable/disable focus rings in buttons.
     For SelectView, it is a default.
-    
+
     @property
     @type {Boolean}
     @default YES
@@ -196,7 +196,7 @@ SC.SelectView = SC.PopupButtonView.extend({
       last.removeObserver(titleKey, this, this._scsv_selectedItemPropertyDidChange);
       last.removeObserver(valueKey, this, this._scsv_selectedItemPropertyDidChange);
     }
-    
+
     if (sel && sel.addObserver && sel !== last) {
       sel.addObserver(titleKey, this, this._scsv_selectedItemPropertyDidChange);
       sel.addObserver(valueKey, this, this._scsv_selectedItemPropertyDidChange);
@@ -262,7 +262,7 @@ SC.SelectView = SC.PopupButtonView.extend({
 
   /**
     SelectView must set the selectView property on the menu so that the menu's
-    properties get bound to the SelectView's. The bindings get set up by 
+    properties get bound to the SelectView's. The bindings get set up by
     the SelectViewMenu mixin, which should be mixed in to any SelectView menu.
 
     In addition, the initial selected item and the initial minimum menu width are set.
@@ -283,9 +283,9 @@ SC.SelectView = SC.PopupButtonView.extend({
     This can be used to make sure the selected menu item is directly on top of
     the label in the SelectView.
 
-    By default, this comes from the render delegate's menuLeftOffset property. 
+    By default, this comes from the render delegate's menuLeftOffset property.
     If you are writing a theme, you should set the value there.
-    
+
     @property
     @type Number
     @default 'menuLeftOffset' from render delegate if present, or 0.
@@ -324,7 +324,7 @@ SC.SelectView = SC.PopupButtonView.extend({
   /**
     The prefer matrix for menu positioning. It is calculated so that the selected
     menu item is positioned directly over the SelectView.
-    
+
     @property
     @type Array
     @private
@@ -384,7 +384,7 @@ SC.SelectView = SC.PopupButtonView.extend({
     menu always cover the entire SelectView--or, alternatively, cover all but the
     arrows on the side.
 
-    By default, it is calculated by adding the menuMinimumWidthOffset to the view's 
+    By default, it is calculated by adding the menuMinimumWidthOffset to the view's
     width. If you are writing a theme and want to change the width so the menu covers
     a specific part of the select view, change your render delegate's menuMinimumWidthOffset
     property.
@@ -433,7 +433,7 @@ SC.SelectView = SC.PopupButtonView.extend({
   },
 
   /** @private
-   Function overridden - tied to the isEnabled state 
+   Function overridden - tied to the isEnabled state
   */
   acceptsFirstResponder: function() {
     return this.get('isEnabled');

data/lib/frameworks/sproutcore/frameworks/formatters/formatters/date_formatter.js

@@ -15,28 +15,28 @@
 */
 SC.DateFormatter = function(date, f) {
   if (!date) {
-    throw "No date passed to date formatter.";
+    throw new Error("No date passed to date formatter.");
   } else if (!date.getFullYear) {
-    throw "Object passed to date formatter was not a date!";
+    throw new Error("Object passed to date formatter was not a date!");
   }
   
   // f is expected to be a character, potentially repeated.
   // What we do is figure out what letter, and how many times it is repeated.
   // we also sanity-check.
   if (!f) {
-    throw "No formatting string passed to date formatter. Date: " + date;
+    throw new Error("No formatting string passed to date formatter. Date: " + date);
   }
   
   var len = f.length, first = f[0], idx;
   for (idx = 1; idx < len; idx++) {
     if (f[idx] !== first) {
-      throw "Invalid format string for a date; all characters must be the same: " + f + "; date: " + date;
+      throw new Error("Invalid format string for a date; all characters must be the same: " + f + "; date: " + date);
     }
   }
   
   var formatter = SC.DateFormatter[first];
   if (!formatter) {
-    throw "No formatter `" + first + "` exists for date: " + date;
+    throw new Error("No formatter `" + first + "` exists for date: " + date);
   }
   
   return formatter(date, len);
@@ -57,7 +57,7 @@ SC.DateFormatter.G = function(date, count) {
   } else if (count === 5) {
     return (era + ".Letter").loc();
   } else {
-    throw "Invalid era format: expected at most 5 digits; found " + count + ".";
+    throw new Error("Invalid era format: expected at most 5 digits; found " + count + ".");
   }
 };
 
@@ -111,7 +111,7 @@ SC.DateFormatter.Q = function(date, count, isStandAlone) {
   } else if (count == 4) {
     return (quarterName + ".Full").loc();
   } else {
-    throw "Unrecognized number of characters for quarter: " + count;
+    throw new Error("Unrecognized number of characters for quarter: " + count);
   }
 };
 
@@ -152,7 +152,7 @@ SC.DateFormatter.M = function(date, count, isStandAlone) {
   } else if (count === 5) {
     return (monthName + ".Letter").loc();
   } else {
-    throw "The number of Ms or Ls must be from 1 to 5. Supplied: " + count;
+    throw new Error("The number of Ms or Ls must be from 1 to 5. Supplied: " + count);
   }
 };
 
@@ -161,17 +161,17 @@ SC.DateFormatter.L = function(date, count) {
 };
 
 // OMITTED: l; used only with Chinese calendar.
-SC.DateFormatter.l = function() { throw "`l` date formatter not implemented."; };
+SC.DateFormatter.l = function() { throw new Error("`l` date formatter not implemented."); };
 
 //
 // Omitted for now: Week Number
 //
 SC.DateFormatter.w = function(date, count) {
-  throw "Week number currently not supported for date formatting.";
+  throw new Error("Week number currently not supported for date formatting.");
 };
 
 SC.DateFormatter.W = function(date, count) {
-  throw "Week number currently not supported for date formatting.";
+  throw new Error("Week number currently not supported for date formatting.");
 };
 
 //
@@ -198,13 +198,13 @@ SC.DateFormatter.D = function(date, count) {
 
 SC.DateFormatter.F = function(date, count) {
   // day of week in month; for instance, 2 if it is the second wednesday in the month.
-  throw "Day of week in month (F) is not supported in date formatting";
+  throw new Error("Day of week in month (F) is not supported in date formatting");
 };
 
 SC.DateFormatter.g = function(date, count) {
   // Julian day, modified: should be based on local timezone,
   // and, more than that, local timezone midnight (not noon)
-  throw "Julian day not supported in date formatting.";
+  throw new Error("Julian day not supported in date formatting.");
 };
 
 //
@@ -244,7 +244,7 @@ SC.DateFormatter.e = function(date, count, isStandAlone) {
   } else if (count === 5) {
     return (dayName + ".Letter").loc();
   } else {
-    throw "Unrecognized number of `e`s, `c`s, or `E`s in date format string.";
+    throw new Error("Unrecognized number of `e`s, `c`s, or `E`s in date format string.");
   }
 };
 
@@ -259,7 +259,7 @@ SC.DateFormatter.c = function(date, count) {
 //
 SC.DateFormatter.a = function(date, count) {
   if (count !== 1) {
-    throw "`a` can only be included in a date format string once.";
+    throw new Error("`a` can only be included in a date format string once.");
   }
   
   var name = "SC.Date.Period." + (date.getHours() > 11 ? "PM" : "AM");
@@ -345,7 +345,7 @@ SC.DateFormatter.z =
 SC.DateFormatter.Z = 
 SC.DateFormatter.v = 
 SC.DateFormatter.V = function(date, count) {
-  throw "Timezone not supported in date format strings.";
+  throw new Error("Timezone not supported in date format strings.");
 };
 
 

data/lib/frameworks/sproutcore/frameworks/foundation/controllers/tree.js

@@ -67,19 +67,27 @@ SC.TreeController = SC.ObjectController.extend(SC.SelectionSupport,
     use this property directly.  Instead, work on the tree content using the
     TreeController like you would any other ObjectController.
 
-    @property {SC.Array}
+    @type SC.Array
   */
-  arrangedObjects: function() {
-    var ret, content = this.get('content');
+  arrangedObjects: function () {
+    var content = this.get('content'),
+      ret;
+
     if (content) {
       ret = SC.TreeItemObserver.create({ item: content, delegate: this });
       ret.bind('allowsSelection', this, 'allowsSelection');
       ret.bind('allowsMultipleSelection', this, 'allowsMultipleSelection');
       ret.bind('allowsEmptySelection', this, 'allowsEmptySelection');
-    } else ret = null; // empty!
-    this._sctc_arrangedObjects = ret ;
 
-    return ret ;
+      ret.addObserver('[]', this, this._sctc_arrangedObjectsContentDidChange);
+    } else {
+      ret = null; // empty!
+    }
+
+    // Cache the current tree item observer, so we have it when it changes.
+    this._sctc_arrangedObjects = ret;
+
+    return ret;
   }.property().cacheable(),
 
   // ..........................................................
@@ -94,19 +102,23 @@ SC.TreeController = SC.ObjectController.extend(SC.SelectionSupport,
     immediately instead of waiting on some other component to get
     arrangedObjects again.
   */
-  _sctc_invalidateArrangedObjects: function() {
+  _sctc_invalidateArrangedObjects: function () {
     this.propertyWillChange('arrangedObjects');
 
+    // Clean up!  Destroy the previous tree item observer.
     var ret = this._sctc_arrangedObjects;
-    if (ret) ret.destroy();
+    if (ret) { ret.destroy(); }
     this._sctc_arrangedObjects = null;
 
     this.propertyDidChange('arrangedObjects');
+
+    // Fix up the selection with the new arrangedObjects.
+    this.updateSelectionAfterContentChange();
   }.observes('content', 'treeItemIsExpandedKey', 'treeItemChildrenKey', 'treeItemIsGrouped'),
 
-  _sctc_arrangedObjectsContentDidChange: function() {
+  _sctc_arrangedObjectsContentDidChange: function () {
     this.updateSelectionAfterContentChange();
-  }.observes('*arrangedObjects.[]'),
+  },
 
   canSelectGroups: NO,
 
@@ -117,19 +129,19 @@ SC.TreeController = SC.ObjectController.extend(SC.SelectionSupport,
     a brute force approach right now; we assume you probably don't have a lot
     of groups up front.
   */
-  firstSelectableObject: function() {
+  firstSelectableObject: function () {
     var objects = this.get('arrangedObjects'),
         indexes, len, idx     = 0;
 
     if (!objects) return null; // fast track
 
     // other fast track. if you want something fancier use collectionViewDelegate
-    if(this.get('canSelectGroups')) return objects.get('firstObject');
+    if (this.get('canSelectGroups')) return objects.get('firstObject');
 
     indexes = objects.contentGroupIndexes(null, objects);
     len = objects.get('length');
-    while(indexes.contains(idx) && (idx<len)) idx++;
-    return idx>=len ? null : objects.objectAt(idx);
+    while (indexes.contains(idx) && (idx < len)) idx++;
+    return idx >= len ? null : objects.objectAt(idx);
   }.property()
 
 });

data/lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js

@@ -7,60 +7,60 @@
 /*global test Q$ */
 
 // TODO: IMPROVE CODE QUALITY.  This code was put together quickly in order to
-// test the SproutCore framework.  It does not match up to the project's 
-// normal documentation, design and coding standards.  Do not rely on this 
+// test the SproutCore framework.  It does not match up to the project's
+// normal documentation, design and coding standards.  Do not rely on this
 // code as an example of how to build your own applications.
 
 /** @class
   Generates a pane that will display vertically stacked views for testing.
   You can use this class in test mode to easily create a palette with views
   configured in different ways.
-  
+
   # Example
-  
+
       var pane = SC.ControlTestPane.design()
         .add('basic', SC.CheckboxView.design({ title: "Hello World" }))
         .add('disabled', SC.CheckboxView.design({
           title: "Hello World", isEnabled: NO
         }));
-      
+
       module("CheckboxView UI", pane);
-    
+
       test("basic", function() {
         var view = pane.view('basic');
         ok(view.get('isEnabled'), 'should be enabled');
       });
-  
+
   @extends SC.Pane
   @since SproutCore 1.0
 */
 SC.ControlTestPane = SC.Pane.extend(
 /** @scope SC.ControlTestPane.prototype */ {
-  
+
   classNames: ['sc-control-test-pane'],
   layout: { right: 20, width: 350, top: 65, bottom: 5 },
 
   /**
-    The starting top location for the first row.  This will increment as 
+    The starting top location for the first row.  This will increment as
     views are added to the pane.
-    
+
     @type Number
     @default 0
   */
   top: 0,
-  
+
   /**
     The default height of each row.  This will be used for a view unless you
     manually specify a height in the view's layout.
-    
+
     @type Number
     @default 20
   */
   height: 20,
-  
+
   /**
     The default padding added to the edges and between each row.
-    
+
     @type Number
     @default 4
   */
@@ -68,24 +68,24 @@ SC.ControlTestPane = SC.Pane.extend(
 
   /**
     Retrieves the test sample view that was added with the passed key name.
-    
+
     @param {String} keyName the key used to register the view.
     @returns {SC.View} view instance
   */
-  view: function(keyName) { 
+  view: function(keyName) {
     var idx = this._views[keyName];
-    if (!idx) throw "SC.ControlTestPane does not have a view named %@".fmt(keyName);
-    return this.childViews[idx].childViews[0]; 
+    if (!idx) throw new Error("SC.ControlTestPane does not have a view named %@".fmt(keyName));
+    return this.childViews[idx].childViews[0];
   },
-  
+
   /** @private */
   init: function() {
     sc_super();
     if (!this._views) this._views = {};
     this.append(); // auto-add to screen
-    
+
     // Also adjust unit test results to make space
-    // use setTimeout to avoid screwing with the RunLoop which we might be 
+    // use setTimeout to avoid screwing with the RunLoop which we might be
     // testing.
     var l = this.get('layout'), w = l.right + l.width;
     setTimeout(function() {
@@ -100,7 +100,7 @@ SC.ControlTestPane = SC.Pane.extend(
   as the key which you can use to find the view layer.  You can either pass
   a view that is already designed or pass an array of attributes that will be
   used to create a design on the view.
-  
+
   @param {String} label the view key name
   @param {SC.View} view a view class or view design
   @param {Hash} attrs optional attrs to use when designing the view
@@ -115,26 +115,26 @@ SC.ControlTestPane.add = function(label, view, attrs) {
   var top = this.prototype.top + padding*2, layout;
   var labelHeight =14;
   if (top === padding*2) top = padding; // reduce padding @ top
-  
-  // if the passed in view has a layout property and the layout has an 
+
+  // if the passed in view has a layout property and the layout has an
   // explicit, numerical height, then use that instead.
   if (view.prototype.layout && (typeof view.prototype.layout.height === SC.T_NUMBER)) height = view.prototype.layout.height;
-  
+
   this.prototype.top = top + height+labelHeight+(padding*2); // make room
-  
+
   // calculate labelView and add it
   layout = { left: padding, width: 150, top: top, height: 20 };
   var labelView = SC.LabelView.design({
-    value: label + ':', 
-    layout: { left: 0, right: 0, top: 0, height: labelHeight }, 
-   // textAlign: SC.ALIGN_RIGHT, 
-    fontWeight: SC.BOLD_WEIGHT 
+    value: label + ':',
+    layout: { left: 0, right: 0, top: 0, height: labelHeight },
+   // TODO: textAlign: SC.ALIGN_RIGHT,
+    // TODO: fontWeight: SC.BOLD_WEIGHT
   });
 
   // wrap label in parent view in order to center text vertically
   labelView = SC.View.design().layout(layout).childView(labelView);
   this.childView(labelView);
-  
+
   // now layout view itself...
   var wrapper = SC.View.design({
     classNames: ['wrapper'],
@@ -143,11 +143,11 @@ SC.ControlTestPane.add = function(label, view, attrs) {
   });
   var idx = this.prototype.childViews.length ;
   this.childView(wrapper);
-  
+
   var views = this.prototype._views;
   if (!views) views = this.prototype._views = {};
   views[label] = idx ;
-  
+
   return this;
 };
 
@@ -157,17 +157,17 @@ SC.ControlTestPane.add = function(label, view, attrs) {
 SC.ControlTestPane.standardSetup = function() {
   var pane = this ;
   return {
-    setup: function() { 
+    setup: function() {
       SC.RunLoop.begin();
-      pane._pane = pane.create(); 
+      pane._pane = pane.create();
       SC.RunLoop.end();
     },
-    
+
     teardown: function() {
       SC.RunLoop.begin();
-      if (pane._pane) pane._pane.remove();
+      if (pane._pane) pane._pane.destroy();
       SC.RunLoop.end();
-      
+
       pane._pane = null ;
     }
   } ;
@@ -176,26 +176,26 @@ SC.ControlTestPane.standardSetup = function() {
 /**
   Convenience method.  Returns the view with the given name on the current
   pane instance if there is one.
-  
+
   @param {String} keyName the key used to register the view.
   @returns {SC.View} view instance
 */
 SC.ControlTestPane.view = function(viewKey) {
   var pane = this._pane || this._showPane ;
-  if (!pane) throw "view() cannot be called on a class";
+  if (!pane) throw new Error("view() cannot be called on a class");
   return pane.view(viewKey);
 };
 
 /**
-  Registers a final test that will instantiate the control test pane and 
+  Registers a final test that will instantiate the control test pane and
   display it.  This allows the developer to interact with the controls once
   the test has completed.
 */
 SC.ControlTestPane.show = function() {
   var pane = this ;
-  test("show control test pane", function() { 
+  test("show control test pane", function() {
     SC.RunLoop.begin();
-    pane._showPane = pane.create(); 
+    pane._showPane = pane.create();
     SC.RunLoop.end();
   });
 };