sproutit-sproutcore 1.0.0.20090416161445 → 1.0.0.20090720093355

data/frameworks/sproutcore/frameworks/desktop/english.lproj/slider.css

@@ -26,6 +26,11 @@
 	border-radius: 3px;
 }
 
+.sc-slider-view .sc-inner .sc-leftcap,
+.sc-slider-view .sc-inner .sc-righcap {
+  display: none;
+}
+
 .blur .sc-slider-view .sc-inner,
 .focus .sc-slider-view.disabled .sc-inner {
 	border: 1px #ccc solid;

data/frameworks/sproutcore/frameworks/desktop/english.lproj/split_divider.css

@@ -4,5 +4,6 @@
   background-color: #ddd;
   border-left: 1px #999 solid;
   border-right: 1px #999 solid;
+  z-index: 1;
 }
 

data/frameworks/sproutcore/frameworks/desktop/english.lproj/tab.css

@@ -7,6 +7,6 @@
   overflow: visible;
 }
 
-.sc-tab-view .sc-container-view .sc-segmented-view{
+.sc-tab-view > .sc-segmented-view{
   z-index:100;
 }

data/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js

@@ -0,0 +1,61 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple, Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+
+
+/** 
+  @namespace
+  
+  CollectionRowDelegates are consulted by SC.ListView and SC.TableView to 
+  control the height of rows, including specifying custom heights for 
+  specific rows.  
+  
+  You can implement a custom row height in one of two ways.  
+  
+*/
+SC.CollectionRowDelegate = {
+
+  /** walk like a duck */
+  isCollectionRowDelegate: YES,
+  
+  /**
+    Default row height.  Unless you implement some custom row height 
+    support, this row height will be used for all items.
+    
+    @property
+    @type Number
+  */
+  rowHeight: 18,
+
+  /**
+    Index set of rows that should have a custom row height.  If you need 
+    certains rows to have a custom row height, then set this property to a 
+    non-null value.  Otherwise leave it blank to disable custom row heights.
+    
+    @property
+    @type SC.IndexSet
+  */
+  customRowHeightIndexes: null,
+  
+  /**
+    Called for each index in the customRowHeightIndexes set to get the 
+    actual row height for the index.  This method should return the default
+    rowHeight if you don't want the row to have a custom height.
+    
+    The default implementation just returns the default rowHeight.
+    
+    @param {SC.CollectionView} view the calling view
+    @param {Object} content the content array
+    @param {Number} contentIndex the index 
+    @returns {Number} row height
+  */
+  contentIndexRowHeight: function(view, content, contentIndex) {
+    return this.get('rowHeight');    
+  }
+  
+  
+};

data/frameworks/sproutcore/frameworks/desktop/mixins/collection_view_delegate.js

@@ -5,40 +5,37 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/**
-  Indicates that the collection view expects to accept a drop ON the specified
-  item.
-*/
-SC.DROP_ON = 0x01 ;
-
-/**
-  Indicates that the collection view expects to accept a drop BEFORE the 
-  specified item.
-*/
-SC.DROP_BEFORE = 0x02 ;
-
-/**
-  Indicates that the collection view want's to know which operations would 
-  be allowed for either drop operation.
-*/
-SC.DROP_ANY = 0x03 ;
-
 /**
   @namespace
 
-  A Collection View Delegate is consulted by a SC.CollectionView's to control
-  certain behaviors such as selection control and drag and drop behaviors.
+  A Collection View Delegate is consulted by a SC.CollectionView's to make
+  policy decisions about certain behaviors such as selection control and
+  drag and drop.  If you need to control other aspects of your data, you may
+  also want to add the SC.CollectionContent mixin.
+  
+  To act as a Collection Delegate, just apply this mixin to your class.  You
+  must then set the "delegate" property on the CollectionView to your object.
   
-  To act as a Collection Delegate, the object should be set as the delegate
-  property of the collection view and should implement one or more of the
-  methods below.
+  Alternatively, if no delegate is set on a CollectionView, but the content 
+  implements this mixin, the content object will be used as the delegate 
+  instead.
   
-  You can also choose to mixin this delegate to get suitable default 
-  implementations of these methods.
+  If you set an ArrayController or its arrangedObjects property as the content
+  of a CollectionView, the ArrayController will automatically act as the 
+  delegate for the view.
   
   @since SproutCore 1.0
 */
 SC.CollectionViewDelegate = {
+
+  /**
+    Used to detect the mixin by SC.CollectionView
+  */
+  isCollectionViewDelegate: YES,
+  
+  // ..........................................................
+  // SELECTION
+  // 
   
   /**
     This method will be called anytime the collection view is about to
@@ -48,14 +45,97 @@ SC.CollectionViewDelegate = {
     selected objects that cannot be selected.  The default implementation of
     this method simply returns the proposed selection.
     
-    @param view {SC.CollectionView} the collection view
-    @param sel {Array} Proposed array of selected objects.
-    @returns The actual array allowed or null if no change is allowed.
+    @param {SC.CollectionView} view the collection view
+    @param {SC.IndexSet} sel Proposed array of selected objects.
+    @returns {SC.IndexSet} Actual allow selection index set
   */
   collectionViewSelectionForProposedSelection: function(view, sel) {
     return sel ;
   },
 
+  /**
+    Called by the collection when attempting to select an item.  Return the 
+    actual indexes you want to allow to be selected.  Return null to disallow
+    the change.  The default allows all selection.
+    
+    @param {SC.CollectionView} view the view collection view
+    @param {SC.IndexSet} indexes the indexes to be selected
+    @param {Boolean} extend YES if the indexes will extend existing sel
+    @returns {SC.IndexSet} allowed index set
+  */
+  collectionViewShouldSelectIndexes: function (view, indexes, extend) { 
+    return indexes; 
+  },
+  
+  /**
+    Called by the collection when attempting to deselect an item.  Return the 
+    actual indexes you want to allow to be deselected.  Return null to 
+    disallow the change.  The default allows all selection.
+    
+    Note that you should not modify the passed in IndexSet.  clone it instead.
+    
+    @param {SC.CollectionView} view the view collection view
+    @param {SC.IndexSet} indexes the indexes to be selected
+    @returns {SC.IndexSet} allowed index set
+  */
+  collectionViewShouldDeselectIndexes: function (view, indexes) { 
+    return indexes; 
+  },
+
+  // ..........................................................
+  // EDIT OPERATIONS
+  // 
+  
+  /**
+    Called by the collection view whenever the deleteSelection() method is
+    called.  You can implement this method to get fine-grained control over
+    which items can be deleted.  To prevent deletion, return null.
+    
+    This method is only called if canDeleteContent is YES on the collection
+    view.
+    
+    @param {SC.CollectionView} view the collection view
+    @param {SC.IndexSet} indexes proposed index set of items to delete.
+    @returns {SC.IndexSet} index set allowed to delete or null.
+  */
+  collectionViewShouldDeleteIndexes: function(view, indexes) { 
+    return indexes; 
+  },
+  
+  /**
+    Called by the collection view to actually delete the selected items.
+    
+    The default behavior will use standard array operators to delete the 
+    indexes from the array.  You can implement this method to provide your own 
+    deletion method.
+    
+    If you simply want to control the items to be deleted, you should instead
+    implement collectionViewShouldDeleteItems().  This method will only be 
+    called if canDeleteContent is YES and collectionViewShouldDeleteIndexes()
+    returns a non-empty index set
+    
+    @param {SC.CollectionView} view collection view
+    @param {SC.IndexSet} indexes the items to delete
+    @returns {Boolean} YES if the deletion was a success.
+  */
+  collectionViewDeleteContent: function(view, content, indexes) {
+    if (!content) return NO ;
+    
+    if (SC.typeOf(content.destroyAt) === SC.T_FUNCTION) {
+      content.destroyAt(indexes);
+      return YES ;
+      
+    } else if (SC.typeOf(content.removeAt) === SC.T_FUNCTION) {
+      content.removeAt(indexes);
+      return YES;
+      
+    } else return NO ;
+  },
+  
+  // ..........................................................
+  // DRAGGING
+  // 
+  
   /**
     Called by the collection view just before it starts a drag to give you
     an opportunity to decide if the drag should be allowed. 
@@ -104,7 +184,9 @@ SC.CollectionViewDelegate = {
     
     The default implementation returns null.
     
-    @param view {SC.CollectionView} the collection view that initiated the drag
+    @param view {SC.CollectionView} 
+      the collection view that initiated the drag
+
     @param dataType {String} the data type to provide
     @param drag {SC.Drag} the drag object
     @returns {Object} the data object or null if the data could not be provided.
@@ -114,12 +196,18 @@ SC.CollectionViewDelegate = {
   },
   
   /**
-    Called once during a drag the first time view is entered. Return all possible
-    drag operations OR'd together.
+    Called once during a drag the first time view is entered. Return all 
+    possible drag operations OR'd together.
     
-    @param view {SC.CollectionView} the collection view that initiated the drag
-    @param drag {SC.Drag} the drag object
-    @param proposedDragOperations {Number} proposed logical OR of allowed drag operations.
+    @param {SC.CollectionView} view
+      the collection view that initiated the drag
+
+    @param {SC.Drag} drag
+      the drag object
+    
+    @param {Number} proposedDragOperations
+      proposed logical OR of allowed drag operations.
+
     @returns {Number} the allowed drag operations. Defaults to op
   */
   collectionViewComputeDragOperations: function(view, drag, proposedDragOperations) {
@@ -137,10 +225,10 @@ SC.CollectionViewDelegate = {
     general which operations you might support and specifically the operations
     you would support if the user dropped an item over a specific location.
     
-    If the proposedDropOperaration parameter is SC.DROP_ON or SC.DROP_BEFORE, then the
-    proposedInsertionPoint will be a non-negative value and you should
-    determine the specific operations you will support if the user dropped the
-    drag item at that point.
+    If the proposedDropOperaration parameter is SC.DROP_ON or SC.DROP_BEFORE, 
+    then the proposedInsertionPoint will be a non-negative value and you 
+    should determine the specific operations you will support if the user 
+    dropped the drag item at that point.
     
     If you do not like the proposed drop operation or insertion point, you 
     can override these properties as well by setting the proposedDropOperation
@@ -156,7 +244,7 @@ SC.CollectionViewDelegate = {
     @returns the allowed drag operation.  Defaults to op
   */
   collectionViewValidateDragOperation: function(view, drag, op, proposedInsertionIndex, proposedDropOperaration) {
-    return op ;
+    return (op & SC.DROP_ON) ? SC.DRAG_NONE : op ;
   },
   
   /**
@@ -181,46 +269,15 @@ SC.CollectionViewDelegate = {
   },
   
   /**
-    Called by the collection view whenever the deleteSelection() method is
-    called.  You can implement this method to get fine-grained control over
-    which items can be deleted.  To prevent deletion, return null.
+    Renders a drag view for the passed content indexes. If you return null
+    from this, then a default drag view will be generated for you.
     
-    This method is only called if canDeleteContent is YES on the collection
-    view.
-    
-    @param view {SC.CollectionView} the collection view
-    @param item {Array} proposed array  of items to delete.
-    @returns {Array} items allowed to delete or null.
-  */
-  collectionViewShouldDeleteContent: function(view, items) { return items; },
-  
-  /**
-    Called by the collection view to actually delete the selected items.
-    
-    The default behavior will use standard array operators to remove the 
-    items from the content array.  You can implement this method to provide
-    your own deletion method.
-    
-    If you simply want to controls the items to be deleted, you should instead
-    implement collectionViewShouldDeleteItems().  This method will only be 
-    called if canDeleteContent is YES and collectionViewShouldDeleteContent()
-    returns a non-empty array.
-    
-    @param view {SC.CollectionView} the view collection view
-    @param items {Array} the items to delete
-    @returns {Boolean} YES if the operation succeeded, NO otherwise.
+    @param {SC.CollectionView} view
+    @param {SC.IndexSet} dragContent
+    @returns {SC.View} view or null
   */
-  collectionViewDeleteContent: function(view, items) { return NO; },
-  
-  /**
-    Called by the collection when attempting to select an item.
-    
-    The default implementation always returns YES.
-    
-    @param view {SC.CollectionView} the view collection view
-    @param item {Object} the item to be selected
-    @returns {Boolean} YES to alow, NO to prevent it
-  */
-  collectionViewShouldSelectItem: function (view, item) { return YES; }
-  
+  collectionViewDragViewFor: function(view, dragContent) {
+    return null;
+  }
+
 };

data/frameworks/sproutcore/frameworks/desktop/panes/alert.js

@@ -192,12 +192,24 @@ SC.AlertPane = SC.PanelPane.extend({
     
     @property {SC.ButtonView}
   */
-  buttonThree: SC.outlet('contentView.childViews.2'),
+  buttonThree: SC.outlet('contentView.childViews.2.childViews.0'),
+
+  /**
+    The view for the button 3 (Extra) wrapper.
+    
+    @property {SC.View}
+  */
+  buttonThreeWrapper: SC.outlet('contentView.childViews.2'),
   
+  layout: { centerX: 0, width: 500, top: 55 },
+
   /** @private - internal view that is actually displayed */
   contentView: SC.View.extend({
-    layout: { centerX: 0, width: 460, top: 100, height: 'auto' },
     
+    useStaticLayout: YES,
+    
+    layout: { left: 0, right: 0, top: 0, height: "auto" },
+		
     childViews: [
       SC.View.extend(SC.StaticLayout, {
         classNames: ['info'],
@@ -210,43 +222,54 @@ SC.AlertPane = SC.PanelPane.extend({
           context.begin('h1').text(pane.get('message') || '').end();
           context.push(pane.get('displayDescription') || '');
           context.push(pane.get('displayCaption') || '');
-          context.push('<div class="seperator" />');
+          context.push('<div class="seperator"></div>');
         }
       }),
 
       SC.View.extend({
-        layout: { bottom: 14, height: 'auto', right: 18, width: 'auto' },
-        childViews: [
-          SC.ButtonView.extend({
+        layout: { bottom: 13, height: 24, right: 18, width: 466 },
+        childViews: ['cancelButton', 'okButton'],
+        classNames: ['textAlignRight'],
+        cancelButton : SC.ButtonView.extend({
             useStaticLayout: YES,
             actionKey: SC.BUTTON2_STATUS,
             localize: YES,
-            titleMinWidth: 64,
-            layout: { right: 0, height: 'auto', width: 'auto', bottom: 0 },
+            titleMinWidth: 80,
+            layout: { right: 5, height: 'auto', width: 'auto', bottom: 0 },
+            theme: 'capsule',
             title: "Cancel", 
             action: "dismiss",
             isVisible: NO
           }),
 
-          SC.ButtonView.extend({
+        okButton : SC.ButtonView.extend({
             useStaticLayout: YES,
             actionKey: SC.BUTTON1_STATUS,
             localize: YES,
-            titleMinWidth: 64,
-            layout: { right: 0, height: 'auto', width: 'auto', bottom: 0 },
+            titleMinWidth: 80,
+            layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
+            theme: 'capsule',
             title: "OK", 
+            isDefault: YES,
             action: "dismiss"
-          })]
+          })
       }),
       
-      SC.ButtonView.extend({
-        actionKey: SC.BUTTON3_STATUS,
-        localize: YES,
-        titleMinWidth: 64,
-        layout: { bottom: 14, height: 'auto', left: 18, width: 'auto' },
-        title: "Extra", 
-        action: "dismiss",
-        isVisible: NO
+      SC.View.extend({
+        layout: { bottom: 13, height: 24, left: 18, width: 150 },
+        isVisible: NO,
+        childViews: [
+          SC.ButtonView.extend({
+            useStaticLayout: YES,
+            actionKey: SC.BUTTON3_STATUS,
+            localize: YES,
+            titleMinWidth: 80,
+            layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
+            theme: 'capsule',
+            title: "Extra", 
+            action: "dismiss",
+            isVisible: NO
+          })]
       })]
   }),
 
@@ -325,10 +348,18 @@ SC.AlertPane.show = function(message, description, caption, button1Title, button
   for(var idx=0;idx<3;idx++) {
     button = ret.get(buttonKeys[idx]);
     title = args[idx + 3];
-    if (title) button.set('title', title).set('isVisible', YES);
+    if (title) {
+      button.set('title', title).set('isVisible', YES);
+      if (idx==2) {
+        var button_wrapper = ret.get('buttonThreeWrapper');
+        button_wrapper.set('isVisible', YES);
+      }
+    }
   }
-  
-  return ret.append(); // make visible.
+  var show = ret.append() ; // make visible.
+  ret.adjust('height', ret.childViews[0].$().height()) ;
+  ret.updateLayout() ;
+  return show ;
 };
 
 /**
@@ -374,4 +405,4 @@ SC.AlertPane.plain = function(message, description, caption, button1Title, butto
   var args = this._normalizeArguments(arguments);
   args[6] = 'blank';
   return this.show.apply(this, args);
-};
+};