sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroll.js

@@ -72,7 +72,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
   autohidesHorizontalScroller: NO,
 
   /**
-    YES if the view shuld maintain a vertical scroller.
+    YES if the view should maintain a vertical scroller.
     This property must be set when the view is created.
 
     @type Boolean
@@ -317,7 +317,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
 
   /** @private
     Invoked whenever the contentView's frame changes.  This will update the
-    scroller maxmimum and optionally update the scroller visibility if the
+    scroller maximum and optionally update the scroller visibility if the
     size of the contentView changes.  We don't care about the origin since
     that is tracked separately from the offset values.
    */

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js

@@ -69,7 +69,7 @@
         guid: '1'
       });
     } catch (e) {
-      ok(true, "Error occured when trying to create type with same guid");
+      ok(true, "Error occurred when trying to create type with same guid");
     }
   });
 

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroll.js

@@ -378,7 +378,7 @@ SC.CoreScrollView = SC.View.extend(
   autohidesHorizontalScroller: YES,
 
   /**
-    YES if the view shuld maintain a vertical scroller.   This property must
+    YES if the view should maintain a vertical scroller.   This property must
     be set when the view is created.
 
     @type Boolean
@@ -443,7 +443,7 @@ SC.CoreScrollView = SC.View.extend(
   /**
     Use this to overlay the vertical scroller.
 
-    This ensures that the container frame will not resize to accomodate the
+    This ensures that the container frame will not resize to accommodate the
     vertical scroller, hence overlaying the scroller on top of
     the container.
 
@@ -455,7 +455,7 @@ SC.CoreScrollView = SC.View.extend(
   /**
     Use this to overlay the horizontal scroller.
 
-    This ensures that the container frame will not resize to accomodate the
+    This ensures that the container frame will not resize to accommodate the
     horizontal scroller, hence overlaying the scroller on top of
     the container
 
@@ -520,7 +520,7 @@ SC.CoreScrollView = SC.View.extend(
     offset into the contentView you want to appear at the top-left corner of
     the scroll view.
 
-    This method will contrain the actual scroll based on whether the view
+    This method will contain the actual scroll based on whether the view
     can scroll in the named direction and the maximum distance it can
     scroll.
 
@@ -1003,7 +1003,7 @@ SC.CoreScrollView = SC.View.extend(
 
   /** @private
     Invoked whenever the contentView's frame changes.  This will update the
-    scroller maxmimum and optionally update the scroller visibility if the
+    scroller maximum and optionally update the scroller visibility if the
     size of the contentView changes.  We don't care about the origin since
     that is tracked separately from the offset values.
 
@@ -1086,7 +1086,7 @@ SC.CoreScrollView = SC.View.extend(
   },
 
   /** @private
-    If our frame changes, then we need to re-calculate the visiblility of our
+    If our frame changes, then we need to re-calculate the visibility of our
     scrollers, etc.
    */
   frameDidChange: function () {

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroll.js

@@ -139,7 +139,7 @@ SC.DesktopScrollView = SC.CoreScrollView.extend(
 
     wheelEvent: function () {
       // Firefox emits different mousewheel events than other browsers
-      return SC.browser.mozilla ? 'DOMMouseScroll' : 'mousewheel';
+      return SC.browser.isMozilla ? 'DOMMouseScroll' : 'mousewheel';
     }.property().cacheable(),
 
     /** @private
@@ -161,7 +161,7 @@ SC.DesktopScrollView = SC.CoreScrollView.extend(
 
     _scdsv_scrollDebounce: function (evt) {
       var self = this;
-      
+
       if (this._debounce != null) {
         this._debounce.invalidate();
         this._debounce = null;

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroll.js

@@ -45,7 +45,7 @@ SC.TouchScrollView = SC.CoreScrollView.extend(
   /**
     Use this to overlay the vertical scroller.
 
-    This ensures that the container frame will not resize to accomodate the
+    This ensures that the container frame will not resize to accommodate the
     vertical scroller, hence overlaying the scroller on top of
     the container.
 
@@ -57,7 +57,7 @@ SC.TouchScrollView = SC.CoreScrollView.extend(
   /**
     Use this to overlay the horizontal scroller.
 
-    This ensures that the container frame will not resize to accomodate the
+    This ensures that the container frame will not resize to accommodate the
     horizontal scroller, hence overlaying the scroller on top of
     the container
 

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

@@ -5,14 +5,15 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+sc_require('ext/menu_item');
+
 /**
   @class
-  Enhances SC.MenuPane to add support for automatic resizing.
+  Extends SC.MenuPane to add support for automatic resizing.
 */
-SC.MenuPane = SC.MenuPane; // for docs
 
-SC.MenuPane.reopen(
-/** @scope SC.MenuPane.prototype */ {
+SC.AutoResizingMenuPane = SC.MenuPane.extend(
+/** @scope SC.AutoResizingMenuPane.prototype */ {
 
   /**
     If YES, the menu should automatically resize its width to fit its items.
@@ -55,13 +56,15 @@ SC.MenuPane.reopen(
     @private
     In addition to the normal init, we need to schedule an automatic resize.
   */
-  init: function(orig) {
-    orig();
+  init: function() {
+    sc_super();
+    
+    this.set('exampleView', SC.AutoResizingMenuItemView);
 
     if (this.get('shouldAutoResize')) {
       this.invokeOnce('_updateMenuWidth');
     }
-  }.enhance(),
+  },
 
   /**
     The array of child menu item views that compose the menu.
@@ -73,10 +76,10 @@ SC.MenuPane.reopen(
     @readOnly
     @private
   */
-  createMenuItemViews: function(orig) {
+  createMenuItemViews: function() {
     // EXTENDED to set shouldMeasureSize to its initial value and to
     // observe the measured size.
-    var views = orig();
+    var views = sc_super();
 
     var idx, len = views.length, view;
     if (this.get('shouldAutoResize')) {
@@ -90,7 +93,7 @@ SC.MenuPane.reopen(
     }
 
     return views;
-  }.enhance(),
+  },
 
   _menuItemViewsDidChange: function() {
     if (this.get('shouldAutoResize')) this.invokeOnce('_updateMenuWidth');
@@ -117,5 +120,6 @@ SC.MenuPane.reopen(
     }
 
     this.adjust('width', width);
+    this.positionPane();
   }
 });

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

@@ -7,13 +7,11 @@
 
 /**
   @class
-  Enhances SC.MenuItemView to support auto resize.
+  Extends SC.MenuItemView to support auto resize.
 */
-SC.MenuItemView = SC.MenuItemView; // for docs
 
-SC.MenuItemView.reopen(SC.AutoResize);
-SC.MenuItemView.reopen(
-/** @scope SC.MenuItemView.prototype */{
+SC.AutoResizingMenuItemView = SC.MenuItemView.extend(SC.AutoResize,
+/** @scope SC.AutoResizingMenuItemView.prototype */ {
 
   //
   // For automatic resizing, if enabled (to be enabled by parent menu)
@@ -60,6 +58,19 @@ SC.MenuItemView.reopen(
   autoResizeLayer: function() {
     return this.$('.value')[0];
   }.property('layer').cacheable(),
+  
+  /** 
+    @private
+    The batch resize id is computed to be "good enough." It is unlikely that
+    multiple menus of different size will need to resize at the same time, but
+    we guard against this a little bit by giving it a name based on the menu's guid.
+    
+    This won't cover cases where the menu has items of multiple sizes, but that's
+    an edge case that can address the issue by overriding batchResizeId to null.
+  */
+  batchResizeId: function() {
+    return 'menu-' + SC.guidFor(this.parentMenu);
+  }.property().cacheable(),
 
   /**
    * @private
@@ -83,7 +94,7 @@ SC.MenuItemView.reopen(
   didUpdateLayer: function() {
     this.notifyPropertyChange('autoResizeLayer');
     this.scheduleMeasurement();
-  }.enhance()
+  }
 
 }) ;
 

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

@@ -186,8 +186,25 @@ SC.PopupButtonView = SC.ButtonView.extend({
     this.set('_mouseDown', YES);
 
     this.showMenu();
-
-    this._mouseDownTimestamp = new Date().getTime();
+    
+    this._mouseDownTimestamp = null;
+    
+    // Some nutty stuff going on here. If the number of menu items is large, and
+    // it takes over 400 ms to create, then invokeLater will not return control
+    // to the browser, thereby causing the menu pane to dismiss itself
+    // instantly. Using setTimeout will guarantee that control goes back to the
+    // browser.
+    var self = this;
+
+    // there is a bit of a race condition: we could get mouse up immediately.
+    // In that case, we will take note that the timestamp is 0 and treat it
+    // as if it were Date.now() at the time of checking.
+    self._mouseDownTimestamp = 0;
+
+    setTimeout(function() {
+      self._mouseDownTimestamp = Date.now();
+    }, 1);
+    
     this.becomeFirstResponder();
 
     return YES;
@@ -200,19 +217,26 @@ SC.PopupButtonView = SC.ButtonView.extend({
     if (menu && this.get('_mouseDown')) {
       targetMenuItem = menu.getPath('rootMenu.targetMenuItem');
 
-      if (targetMenuItem && menu.get('mouseHasEntered')) {
-        // Have the menu item perform its action.
-        // If the menu returns NO, it had no action to
-        // perform, so we should close the menu immediately.
-        if (!targetMenuItem.performAction()) {
-          menu.remove();
+      // normalize the mouseDownTimestamp: it may not have been set yet.
+      if (this._mouseDownTimestamp === 0) {
+        this._mouseDownTimestamp = Date.now();
+      }
+
+      // If the user waits more than 400ms between mouseDown and mouseUp,
+      // we can assume that they are clicking and dragging to the menu item,
+      // and we should close the menu if they mouseup anywhere not inside
+      // the menu.
+      if(evt.timeStamp - this._mouseDownTimestamp > 400) {
+        if (targetMenuItem && menu.get('mouseHasEntered') && this._mouseDownTimestamp) {
+          // Have the menu item perform its action.
+          // If the menu returns NO, it had no action to
+          // perform, so we should close the menu immediately.
+          if (!targetMenuItem.performAction()) {
+            menu.remove();
+          }
         }
-      } else {
-        // If the user waits more than 200ms between mouseDown and mouseUp,
-        // we can assume that they are clicking and dragging to the menu item,
-        // and we should close the menu if they mouseup anywhere not inside
-        // the menu.
-        if (this._mouseDownTimestamp && evt.timeStamp - this._mouseDownTimestamp > 400) {
+
+        else {
           menu.remove();
         }
       }

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

@@ -5,6 +5,7 @@
 
 sc_require('views/popup_button');
 sc_require('mixins/select_view_menu');
+sc_require('ext/menu');
 
 /**
  * @class
@@ -112,9 +113,9 @@ SC.SelectView = SC.PopupButtonView.extend({
    
    @property
    @type {SC.MenuPane}
-   @default SC.MenuPane.extend(SC.SelectViewMenu)
+   @default SC.AutoResizingMenuPane.extend(SC.SelectViewMenu)
   */
-  menu: SC.MenuPane.extend(SC.SelectViewMenu),
+  menu: SC.AutoResizingMenuPane.extend(SC.SelectViewMenu),
 
   /**
     The currently selected item. If no item is selected, `null`.
@@ -339,7 +340,8 @@ SC.SelectView = SC.PopupButtonView.extend({
 
     var idx = this.get('_selectedItemIndex'), itemViews = menu.get('menuItemViews');
     if (idx > -1) {
-      return [leftPosition, topPosition - itemViews[idx].get('layout').top, 2];
+      var layout = itemViews[idx].get('layout');
+      return [leftPosition, topPosition - layout.top + (layout.height/2), 2];
     }
 
     return [leftPosition, topPosition, 2];
@@ -377,16 +379,6 @@ SC.SelectView = SC.PopupButtonView.extend({
     return -1;
   }.property('value', 'menu').cacheable(),
 
-
-  /*
-    Documented in base class; supplying documentation here will break the argument list.
-  */
-  showMenu: function(orig) {
-    orig();
-
-    var menu = this.get('menu'), itemViews = menu.get('menuItemViews');
-  }.enhance(),
-
   /**
     The minimum width for the child menu. For instance, this property can make the
     menu always cover the entire SelectView--or, alternatively, cover all but the

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_child.js

@@ -229,7 +229,7 @@ SC.SplitChild =
   // NOTE: While an edge case, this is implemented because it makes it _much_
   // easier to write the sample in the Test Controls app.
   splitViewLayoutDirection: null,
-  splitViewLayoutDirectionBinding: '*splitView.layoutDirection',
+  splitViewLayoutDirectionBinding: SC.Binding.oneWay('*splitView.layoutDirection'),
   
   splitViewLayoutDirectionDidChange: function() {
     this.invokeOnce('splitChildLayoutDidChange');

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_thumb.js

@@ -131,7 +131,7 @@ SC.SplitThumb = {
   // NOTE: While an edge case, this is implemented because it makes it _much_
   // easier to write the sample in the Test Controls app.
   splitViewLayoutDirection: null,
-  splitViewLayoutDirectionBinding: '*splitView.layoutDirection',
+  splitViewLayoutDirectionBinding: SC.Binding.oneWay('*splitView.layoutDirection'),
   
   /**
    * The name of the CSS cursor that should be used for splitting.
@@ -176,6 +176,8 @@ SC.SplitThumb = {
     this._isDragging = YES;
     
     var splitView = this.get('splitView');
+    splitView.beginLiveResize();
+    
     this._scst_mouseStartPosition = splitView.get('layoutDirection') === SC.LAYOUT_HORIZONTAL ? 
       touch.pageX : touch.pageY;
     
@@ -194,7 +196,7 @@ SC.SplitThumb = {
         start = this._scst_childStartPosition;
     
     splitView.adjustPositionForChild(this.get('movesChild'), start + diff);
-    
+
     return YES;
   },
   
@@ -212,7 +214,7 @@ SC.SplitThumb = {
     splitView.adjustPositionForChild(this.get('movesChild'), start + diff);
     
     splitView.set('splitChildCursorStyle', null);
-    
+    splitView.endLiveResize();
     return YES;
   },
 

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/children.js

@@ -98,3 +98,22 @@ test("Works with dividers", function() {
   
   validateChildren(splitView, 7);
 });
+
+test("Destroying the split view with dividers doesn't break things", function() {
+  var add = SC.View.create(SC.SplitChild, { name: 'add' });
+
+  splitView.splitDividerView = SC.SplitDividerView;
+
+  SC.RunLoop.begin();
+  splitView.appendChild(add); // trigger _scsv_setupChildViews
+  SC.RunLoop.end();
+
+  try {
+    SC.RunLoop.begin();
+    splitView.destroy();
+    SC.RunLoop.end();
+    ok(true, "No error was thrown");
+  } catch(e) {
+    ok(false, "An error was thrown - " + e);
+  }
+});

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/methods.js

@@ -244,8 +244,26 @@ test("Resizing split view", function() {
   splitView.adjust('height', 300);
   SC.RunLoop.end();
   
-  // there should be no change, because everything is at minimum
-  confirmPositions(0, 100, 200, 300);
+  // there should be change, because the left side collapses.
+  confirmPositions(0, 0, 100, 200);
+  
+  // and if we shrink further still...
+  SC.RunLoop.begin();
+  splitView.adjust('width', 200);
+  splitView.adjust('height', 200);
+  SC.RunLoop.end();
+  
+  // there should be no change
+  confirmPositions(0, 0, 100, 200);
+  
+  // and if we shrink further still, way beyond the smallest it can get...
+  SC.RunLoop.begin();
+  splitView.adjust('width', 100);
+  splitView.adjust('height', 100);
+  SC.RunLoop.end();
+  
+  // there should be no change
+  confirmPositions(0, 0, 100, 200);
 });
 
 test("Fitting to fill disabled", function() {

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/split_thumb.js

@@ -135,7 +135,7 @@ test("mouse events move the movesChild", function() {
   mm(divider1, 10, 0);
   equals(adjustedChild, divider2, "Attempts to move divider2.");
 
-  // note: it _attempts_ to move to 420; doesn't neccessarily succeed.
+  // note: it _attempts_ to move to 420; doesn't necessarily succeed.
   equals(adjustedPosition, 420, "Attempts to move divider2 to 420.");
 });