sproutcore 1.6.0.rc.2-x86-mingw32 → 1.6.0.1-x86-mingw32

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md

@@ -43,4 +43,5 @@ the `isPolymorphic` property:
 
 ## Contributors
 
-- Colin Campbell (<colin@sproutcore.com>)
+- Colin Campbell (<colin@sproutcore.com>)
+- Tyler Keating (<tyler@sproutcore.com>)

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js

@@ -13,7 +13,7 @@
 
     // ..........................................................
     // Properties
-    // 
+    //
 
     /**
       If YES, then searches for records of this type will return
@@ -38,7 +38,7 @@
 
     // ..........................................................
     // Propagation Support
-    // 
+    //
 
     /**
       Like the original SC.Record.storeKeyFor,
@@ -49,23 +49,35 @@
     */
     storeKeyFor: function(id) {
       var storeKeys = this.storeKeysById(),
-          ret = storeKeys[id];
+          ret = storeKeys[id],
+          superclass = this.superclass;
 
       if (!ret) {
-        ret = SC.Store.generateStoreKey();
-        SC.Store.idsByStoreKey[ret] = id;
+        // If this is a polymorphic record, send the key generation recursively up to its polymorphic
+        // superclasses.  This allows the key, which may exist or may be generated, to then propagate
+        // back down so that it exists at each level.
+        if (this.isPolymorphic && superclass.isPolymorphic && superclass !== SC.Record) {
+          ret = superclass.storeKeyFor(id);
+        } else {
+          ret = SC.Store.generateStoreKey();
+          SC.Store.idsByStoreKey[ret] = id;
+        }
+
+        // Update the RecordType for the key on each recursion return, so that it ends as the lowest class
         SC.Store.recordTypesByStoreKey[ret] = this;
+
+        // Each Record must keep track of its own storeKeys so that a find at any level on the same ID
+        // doesn't generate new storeKeys.  Plus it will be faster than always running back up to the 
+        // superclass method to retrieve the key.
         storeKeys[id] = ret;
-        this._propagateIdForStoreKey(id, ret);
       }
 
       return ret ;
     },
 
-
     // ..........................................................
     // Internal Support
-    // 
+    //
 
     extend: function() {
       var ret = oldExtend.apply(this, arguments);
@@ -76,34 +88,6 @@
       }
 
       return ret;
-    },
-
-    /** @private */
-    _propagateIdForStoreKey: function(id, storeKey) {
-      var superclass = this.superclass;
-      if (this.isPolymorphic) {
-        while (superclass.isPolymorphic && superclass !== SC.Record) {
-          superclass._storeKeyForId(storeKey, id);
-          superclass = superclass.superclass;
-        }
-      }
-    },
-
-    /** @private */
-    _storeKeyForId: function(storeKey, id) {
-      var storeKeys;
-      if (!this.isPolymorphic) return;
-
-      /*
-        TODO [CC] SC.Store.recordTypesByStoreKey will be broken
-      */
-
-      storeKeys = this.storeKeysById();
-      if (storeKeys[id]) {
-        throw "A store key (%@) already existing for %@ on %@".fmt(storeKey, id, this);
-      }
-
-      storeKeys[id] = storeKey;
     }
 
   });

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

@@ -0,0 +1,121 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  @class
+  Enhances SC.MenuPane to add support for automatic resizing.
+*/
+SC.MenuPane = SC.MenuPane; // for docs
+
+SC.MenuPane.reopen(
+/** @scope SC.MenuPane.prototype */ {
+
+  /**
+    If YES, the menu should automatically resize its width to fit its items.
+
+    This will swap out the default SC.MenuItemView. If you are using a custom
+    exampleView, you will need to mix SC.AutoResize into your exampleView
+    and set shouldAutoResize to NO (the actual resizing will be handled
+    by SC.MenuPane).
+
+    This property must be set before instantiation; any changes after instantiation
+    will not function properly.
+    
+    @property
+    @type {Boolean}
+    @default YES
+  */
+  shouldAutoResize: YES,
+
+  /**
+    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}
+    @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}
+    @default menuWidthPadding from render delegate, or 0
+  */
+  menuWidthPadding: SC.propertyFromRenderDelegate('menuWidthPadding', 0),
+
+  /**
+    @private
+    In addition to the normal init, we need to schedule an automatic resize.
+  */
+  init: function(orig) {
+    orig();
+
+    if (this.get('shouldAutoResize')) {
+      this.invokeOnce('_updateMenuWidth');
+    }
+  }.enhance(),
+
+  /**
+    The array of child menu item views that compose the menu.
+
+    This computed property parses @displayItems@ and constructs an SC.MenuItemView (or whatever class you have set as the @exampleView@) for every item.
+
+    @property
+    @type Array
+    @readOnly
+    @private
+  */
+  createMenuItemViews: function(orig) {
+    // EXTENDED to set shouldMeasureSize to its initial value and to
+    // observe the measured size.
+    var views = orig();
+
+    var idx, len = views.length, view;
+    if (this.get('shouldAutoResize')) {
+      for (idx = 0; idx < len; idx++) {
+        view = views[idx];
+
+        // set up resizing if we want
+        view.set('shouldMeasureSize', YES);
+        view.addObserver('measuredSize', this, this._menuItemMeasuredSizeDidChange);
+      }
+    }
+
+    return views;
+  }.enhance(),
+
+  _menuItemViewsDidChange: function() {
+    if (this.get('shouldAutoResize')) this.invokeOnce('_updateMenuWidth');
+  }.observes('menuItemViews'),
+
+  _menuItemMeasuredSizeDidChange: function(menuItem) {
+    this.invokeOnce('_updateMenuWidth');
+  },
+
+  _menuMinimumMenuWidthDidChange: function() {
+    this.invokeOnce('_updateMenuWidth');
+  }.observes('minimumMenuWidth'),
+
+  _updateMenuWidth: function() {
+    var menuItemViews = this.get('menuItemViews');
+    if (!menuItemViews) return;
+
+    var len = menuItemViews.length, idx, view,
+        width = this.get('minimumMenuWidth');
+
+    for (idx = 0; idx < len; idx++) {
+      view = menuItemViews[idx];
+      width = Math.max(width, view.get('measuredSize').width + this.get('menuWidthPadding'));
+    }
+
+    this.adjust('width', width);
+  }
+});

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

@@ -0,0 +1,90 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  @class
+  Enhances SC.MenuItemView to support auto resize.
+*/
+SC.MenuItemView = SC.MenuItemView; // for docs
+
+SC.MenuItemView.reopen(SC.AutoResize);
+SC.MenuItemView.reopen(
+/** @scope SC.MenuItemView.prototype */{
+
+  //
+  // For automatic resizing, if enabled (to be enabled by parent menu)
+  //
+  /**
+    The item view is capable of automatic resizing.
+    
+    @private
+    @property
+    @type {Boolean}
+  */
+  supportsAutoResize: YES,
+
+  /**
+    The menu item should NOT change its own width and height.
+    
+    @private
+    @property
+    @type {Boolean}
+  */
+  shouldAutoResize: NO,
+  
+  /**
+    If YES, the menu item will measure its width and height so that the menu
+    can automatically resize itself. This is usually set by the parent menu.
+    
+    @property
+    @type {Boolean}
+    @default NO
+  */
+  shouldMeasureSize: NO,
+
+  // NOTE: this property could come from the theme at some point, but MenuItemView
+  // would have to be migrated to render delegates first. MenuPane adds the
+  // necessary padding for now.
+  autoResizePadding: 0,
+  
+  /** @private */
+  autoResizeText: function() {
+    return this.get('title');
+  }.property('title'),
+
+  /** @private */
+  autoResizeLayer: function() {
+    return this.$('.value')[0];
+  }.property('layer').cacheable(),
+
+  /**
+   * @private
+   * When we render, we recreate all of the DOM, including the element that gets measured.
+   * This is a problem because our autoResizeLayer changes. So, we must invalidate that
+   * layer whenever we re-render.
+   *
+   * We need to move menu item rendering into a render delegate. When this happens, there
+   * are a few ways we could do it:
+   *
+   * - Give render delegate method to find clientWidth and return it: 
+   *   getMenuItemTitleWidth(dataSource, $)
+   *
+   * - Make render delegate provide the autoResizeLayer:
+   *   In this case, the autoResizeLayer might be a computed property that we invalidate
+   *   on didUpdateLayer, and that calls a method like getAutoResizeLayer. Alternatively,
+   *   if render delegate properties are added, we could make this one of those, but it
+   *   would need some way to access the DOM. Maybe data sources can have $ properties or
+   *   methods? Maybe a jQuery property/method?
+  */
+  didUpdateLayer: function() {
+    this.notifyPropertyChange('autoResizeLayer');
+    this.scheduleMeasurement();
+  }.enhance()
+
+}) ;
+
+

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js

@@ -0,0 +1,139 @@
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+ * Binds a menu view to an owning SC.SelectView, and checks selected items.
+ *
+ * @mixin
+ *
+ */
+SC.SelectViewMenu = {
+  /**
+    The SelectView to bind to.
+    
+    @property
+    @type {SC.SelectView}
+    @default null
+  */
+  selectView: null,
+
+  //
+  // CODE TO MAKE ITEMS BE CHECKED WHEN SELECTED:
+  //
+  
+  /**
+    The current value of the SelectView.
+    
+    @property
+    @default null
+  */
+  value: null,
+  valueBinding: '.selectView.value',
+
+
+  /** 
+    @private 
+    Invalidates menu items' isChecked property when the selectView's value changes.
+  */
+  valueDidChange: function() {
+    var items = this.get('menuItemViews'), idx, len = items.length, item;
+    for (idx = 0; idx < len; idx++) {
+      // if the item currently is checked, or if it _should_ be checked, we need to
+      // invalidate the isChecked property.
+      item = items[idx];
+      if (item._lastIsChecked) {
+        item.notifyPropertyChange('isChecked');
+      }
+
+      if (item.get('isChecked')) {
+        item.notifyPropertyChange('isChecked');
+      }
+    }
+  }.observes('value'),
+
+  /**
+    An overridden MenuItemView to create for each menu item that makes itself checked if
+    it is selected.
+    
+    @property
+    @type {SC.MenuItemView}
+    @default SC.MenuItemView subclass
+  */
+  exampleView: SC.MenuItemView.extend({
+    isChecked: function() {
+      // _lastIsChecked is used by the SelectViewMenu mixin above to determine whether
+      // the isChecked property needs to be invalidated.
+      this._lastIsChecked = this.getContentProperty('itemValueKey') === this.getPath('parentMenu.rootMenu.value');
+      return this._lastIsChecked;
+    }.property(),
+
+    displayProperties: ['isChecked']
+  }),
+
+  //
+  // CODE TO BIND TO SELECTVIEW PROPERTIES
+  //
+  
+  /** @private */
+  _svm_bindToProperties: [
+    'items',
+    'itemTitleKey', 'itemIsEnabledKey', 'itemValueKey', 'itemIconKey', 
+    'itemHeightKey', 'itemSubMenuKey', 'itemSeparatorKey', 'itemTargetKey',
+    'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey',
+    'itemKeyEquivalentKey', 'itemDisableMenuFlashKey', 'minimumMenuWidth',
+    
+    'preferType', 'preferMatrix'
+  ],
+
+  /** @private */
+  _svm_setupBindings: function() {
+    var bindTo = this.get('selectView');
+    if (!bindTo) {
+      return;
+    }
+
+    var props = this._svm_bindToProperties, idx, len = props.length, key;
+
+    for (idx = 0; idx < len; idx++) {
+      key = props[idx];
+      this[key + 'Binding'] = this.bind(key, bindTo, key);
+    }
+
+    this._svm_isBoundTo = bindTo;
+  },
+
+  /** @private */
+  _svm_clearBindings: function() {
+    var boundTo = this._svm_isBoundTo;
+    if (!boundTo) {
+      return;
+    }
+
+    var props = this._svm_bindToProperties, idx, len = props.length, key;
+
+    for (idx = 0; idx < len; idx++) {
+      key = props[idx];
+      this[key + 'Binding'].disconnect();
+    }
+  },
+
+  /** @private */
+  _svm_selectViewDidChange: function() {
+    this._svm_clearBindings();
+    this._svm_setupBindings();
+  }.observes('selectView'),
+
+  /** @private */
+  initMixin: function() {
+    this._svm_setupBindings();
+  },
+
+  /** @private */
+  destroyMixin: function() {
+    this._svm_clearBindings();
+  }
+};
+
+