sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module test htmlbody ok equals same stop start Q$*/
 
 var pane, view , view1, view2, view3;
 module("SC.SelectFieldView",{

data/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js

@@ -8,7 +8,7 @@
 /*global module test htmlbody ok equals same stop start */
 
 var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
-
+var pane, view;
 module("SC.TabView", {
   setup: function() {
     SC.RunLoop.begin();

data/frameworks/sproutcore/frameworks/desktop/views/button.js

@@ -230,13 +230,15 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     if (!this.get('isEnabled')) return YES ; // handled event, but do nothing
     this.set('isActive', YES);
     this._isMouseDown = YES;
-    if (!this._isFocused) {
+
+    if (!this._isFocused && (this.get('buttonBehavior')!==SC.PUSH_BEHAVIOR)) {
       this._isFocused = YES ;
       this.becomeFirstResponder();
       if (this.get('isVisibleInWindow')) {
         this.$()[0].focus();
       }
     }
+
     return YES ;
   },
 
@@ -353,8 +355,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   
   /** tied to the isEnabled state */
   acceptsFirstResponder: function() {
-    return this.get('isEnabled');
-  }.property('isEnabled'),
+        return this.get('isEnabled');
+      }.property('isEnabled'),
   
   willBecomeKeyResponderFrom: function(keyView) {
     // focus the text field.

data/frameworks/sproutcore/frameworks/desktop/views/checkbox.js

@@ -119,8 +119,9 @@ SC.CheckboxView = SC.FieldView.extend(SC.StaticLayout, SC.Button,
   },
   
   mouseDown: function(evt) {  
-    this.$input()[0].focus();
-    sc_super();
-  },
+    this.set('isActive', YES);
+    this._field_isMouseDown = YES;
+    return YES;
+  }
     
 }) ;

data/frameworks/sproutcore/frameworks/desktop/views/collection.js

@@ -107,8 +107,7 @@ SC.CollectionView = SC.View.extend(
     @type {SC.IndexSet}
   */
   nowShowing: function() {
-    var ret = this.computeNowShowing();
-    return ret ? ret.frozenCopy() : null;
+    return this.computeNowShowing();
   }.property('length', 'clippingFrame').cacheable(),
   
   /**
@@ -385,6 +384,30 @@ SC.CollectionView = SC.View.extend(
   */
   isActive: NO,
   
+  
+  /** 
+    This property is used to store the calculated height to have 
+    a consistent scrolling behavior due to the issues generated by using top
+    instead of scrollTop. We could look at the min-height set in the view, but
+    to avoid perf hits we simply store it and the scrollView will use it if 
+    different than 0.
+    
+    @type Number
+  */  
+  calculatedHeight: 0,
+  
+  /** 
+    This property is used to store the calculated width to have 
+    a consistent scrolling behavior due to the issues generated by using left
+    instead of scrollLeft. We could look at the min-width set in the view, but
+    to avoid perf hits we simply store it and the scrollView will use it if 
+    different than 0.
+    
+    @type Number
+  */
+  calculatedWidth: 0,
+  
+  
   // ..........................................................
   // SUBCLASS METHODS
   // 
@@ -415,6 +438,18 @@ SC.CollectionView = SC.View.extend(
     return null ;
   },
   
+  /**
+    This computed property returns an index set selecting all content indexes.
+    It will recompute anytime the length of the collection view changes.
+    
+    This is used by the default contentIndexesInRect() implementation.
+    
+    @property {SC.Range}
+  */
+  allContentIndexes: function() {
+    return SC.IndexSet.create(0, this.get('length')).freeze();
+  }.property('length').cacheable(),
+  
   /**
     Override to return an IndexSet with the indexes that are at least 
     partially visible in the passed rectangle.  This method is used by the 
@@ -429,7 +464,7 @@ SC.CollectionView = SC.View.extend(
     @returns {SC.IndexSet} now showing indexes
   */
   contentIndexesInRect: function(rect) {
-    return SC.IndexSet.create(0, this.get('length'));    
+    return null; // select all
   },
   
   /**
@@ -442,16 +477,16 @@ SC.CollectionView = SC.View.extend(
     @returns {SC.IndexSet} new now showing range
   */
   computeNowShowing: function() {
-    var r = this.contentIndexesInRect(this.get('clippingFrame')),
-        content = SC.makeArray(this.get('content')),
-        len     = content.get('length');
-         
-    // default show all.
-    if (!r) r = SC.IndexSet.create(0, len);
+    var r = this.contentIndexesInRect(this.get('clippingFrame'));
+    if (!r) r = this.get('allContentIndexes'); // default show all
 
     // make sure the index set doesn't contain any indexes greater than the
     // actual content.
-    if (r.get('max') > len) r.remove(len, r.get('max')-len);
+    else {
+      var len = this.get('length'), 
+          max = r.get('max');
+      if (max > len) r = r.copy().remove(len, max-len).freeze();
+    }
     
     return r ;
   },
@@ -811,6 +846,15 @@ SC.CollectionView = SC.View.extend(
         // if not nowShowing, then remove the item view if needed
         } else if (existing && existing.parentView === containerView) {
           delete itemViews[idx];
+          
+          // if the existing view has a layer, remove it immediately from
+          // the parent...
+          layer = existing.get('layer');
+          if (layer && layer.parentNode) {
+            layer.parentNode.removeChild(layer);
+          }
+          layer = null ; // avoid leaks
+          
           containerView.removeChild(existing);
         }
       },this);
@@ -958,6 +1002,15 @@ SC.CollectionView = SC.View.extend(
     return ret ;
   },
   
+  /**
+    Helper method for getting the item view of a specific content object
+    
+    @param {Object} object
+  */
+  itemViewForContentObject: function(object) {
+    return this.itemViewForContentIndex(this.get('content').indexOf(object));
+  },
+  
   _TMP_LAYERID: [],
   
   /**
@@ -1268,7 +1321,17 @@ SC.CollectionView = SC.View.extend(
     // build the selection object, merging if needed
     if (extend && (sel = this.get('selection'))) sel = sel.copy();
     else sel = SC.SelectionSet.create();
-    if (indexes) sel.add(content, indexes);
+    
+    if (indexes && indexes.get('length')>0) {
+
+      // when selecting only one item, always select by content
+      if (indexes.get('length')===1) {
+        sel.addObject(content.objectAt(indexes.get('firstObject')));
+        
+      // otherwise select an index range
+      } else sel.add(content, indexes);
+      
+    }
 
     // give delegate one last chance
     sel = del.collectionViewSelectionForProposedSelection(this, sel);
@@ -1560,12 +1623,6 @@ SC.CollectionView = SC.View.extend(
     // delegate implementation just uses standard SC.Array methods to do the
     // right thing.
     del.collectionViewDeleteContent(this, this.get('content'), indexes);
-    
-    // also, fix up the selection by removing the actual items we removed
-    // set selection directly instead of calling select() since we are just
-    // fixing up the selection.
-    
-    this.selectPreviousItem(false, 1) ;
 
     return YES ;
   },
@@ -1594,17 +1651,7 @@ SC.CollectionView = SC.View.extend(
     @returns {SC.CollectionView} receiver
   */
   scrollToItemView: function(view) {
-    if (!view.get('parentView')) return this; // nothing to do
-    if (!view.get('layer')) {
-      if (this.get('layer')) view.updateLayerLocation();
-      else return this; // nothing to do
-    }
-    
-    var scrollable = this;
-    while (scrollable && !scrollable.isPane) {
-      if (scrollable.get('isScrollable')) scrollable.scrollToVisible(view);
-      scrollable = scrollable.get('parentView');
-    }
+    if (view) view.scrollToVisible();
     return this ;
   },
 
@@ -1621,6 +1668,19 @@ SC.CollectionView = SC.View.extend(
   /** @private */
   keyUp: function() { return true; },
   
+  /** @private
+    Handle space key event.  Do action
+  */
+  insertText: function(chr, evt) {
+    if (chr === ' ') {
+      var sel = this.get('selection');
+      if (sel && sel.get('length')>0) {
+        this.invokeLater(this._cv_action, 0, null, evt);
+      } 
+      return YES ;
+    } else return NO ;
+  },
+  
   /** @private
     Handle select all keyboard event.
   */
@@ -2132,6 +2192,8 @@ SC.CollectionView = SC.View.extend(
         content = this.get('content'),
         sel     = this.get('selection'),
         info    = this.mouseDownInfo,
+        cdel    = this.get('contentDelegate'),
+        groupIndexes = cdel.contentGroupIndexes(this, content),
         dragContent, dragDataTypes, dragView;
     
     // if the mouse down event was cleared, there is nothing to do; return.
@@ -2154,7 +2216,16 @@ SC.CollectionView = SC.View.extend(
       if (!this.get("selectOnMouseDown")) {
         dragContent = SC.IndexSet.create(info.contentIndex);
       } else dragContent = sel ? sel.indexSetForSource(content) : null;
+      
+      // remove any group indexes.  groups cannot be dragged.
+      if (dragContent && groupIndexes && groupIndexes.get('length')>0) {
+        dragContent = dragContent.copy().remove(groupIndexes);
+        if (dragContent.get('length')===0) dragContent = null;
+        else dragContent.freeze();
+      }
+      
       if (!dragContent) return YES; // nothing to drag
+      else dragContent = dragContent.frozenCopy(); // so it doesn't change
       
       dragContent = { content: content, indexes: dragContent };
       this.set('dragContent', dragContent) ;
@@ -2334,7 +2405,7 @@ SC.CollectionView = SC.View.extend(
         dropOp = SC.DROP_BEFORE,
         del    = this.get('selectionDelegate'),
         canReorder = this.get('canReorderContent'),
-        objects, content, isPreviousInDrag, isNextInDrag, len;
+        objects, content, isPreviousInDrag, isNextInDrag, len, tmp;
     
     // STEP 1: Try with a DROP_ON option -- send straight to delegate if 
     // supported by view.
@@ -2357,13 +2428,13 @@ SC.CollectionView = SC.View.extend(
       // the collection delegate.
       this.set('proposedInsertionIndex', idx) ;
       this.set('proposedDropOperation', dropOp) ;
-      dragOp = del.collectionViewValidateDragOperation(this, drag, dragOp, idx, dropOp) ;
+      tmp = del.collectionViewValidateDragOperation(this, drag, dragOp, idx, dropOp) ;
       idx = this.get('proposedInsertionIndex') ;
       dropOp = this.get('proposedDropOperation') ;
       this._dropInsertionIndex = this._dropOperation = null ;
 
       // The delegate is OK with a drop on also, so just return.
-      if (dragOp !== SC.DRAG_NONE) return [idx, dropOp, dragOp] ;
+      if (tmp !== SC.DRAG_NONE) return [idx, dropOp, tmp] ;
         
       // The delegate is NOT OK with a drop on, try to get the insertion
       // index again, but this time prefer SC.DROP_BEFORE, then let the 
@@ -2416,7 +2487,7 @@ SC.CollectionView = SC.View.extend(
         if (idx >= 0) dragOp = SC.DRAG_REORDER ;
       }
     }
-    
+
     // Now save the insertion index and the dropOp.  This may be changed by
     // the collection delegate.
     this.set('proposedInsertionIndex', idx) ;
@@ -2482,11 +2553,12 @@ SC.CollectionView = SC.View.extend(
     reordering content.
   */
   performDragOperation: function(drag, op) { 
+        
     // Get the correct insertion point, drop operation, etc.
     var state = this._computeDropOperationState(drag, null, op),
         idx   = state[0], dropOp = state[1], dragOp = state[2],
         del   = this.get('selectionDelegate'),
-        performed, objects, data, content, shift;
+        performed, objects, data, content, shift, indexes;
         
     // The dragOp is the kinds of ops allowed.  The drag operation must 
     // be included in that set.
@@ -2509,6 +2581,16 @@ SC.CollectionView = SC.View.extend(
       if (!data) return SC.DRAG_NONE ;
       
       content = this.get('content') ;
+      
+      // check for special case - inserting BEFORE ourself...
+      // in this case just pretend the move happened since it's a no-op 
+      // anyway
+      indexes = data.indexes;
+      if (indexes.get('length')===1) {
+        if (((dropOp === SC.DROP_BEFORE) || (dropOp === SC.DROP_AFTER)) &&
+            (indexes.get('min')===idx)) return SC.DRAG_MOVE;
+      }
+      
       content.beginPropertyChanges(); // suspend notifications
 
       // get each object, then remove it from the content. they will be 
@@ -2520,11 +2602,11 @@ SC.CollectionView = SC.View.extend(
         content.removeAt(i-shift);
         shift++;
         if (i < idx) idx--;
-        if ((dropOp === SC.DROP_AFTER) && (i === idx)) idx--;
       }, this);
       
       // now insert objects into new insertion locaiton
-      content.replace(idx, 0, objects);
+      if (dropOp === SC.DROP_AFTER) idx++;
+      content.replace(idx, 0, objects, dropOp);
       this.select(SC.IndexSet.create(idx, objects.length));
       content.endPropertyChanges(); // restart notifications
 
@@ -2579,62 +2661,7 @@ SC.CollectionView = SC.View.extend(
     @returns {Array} [proposed drop index, drop operation] 
   */
   insertionIndexForLocation: function(loc, dropOperation) { 
-    var ret = 0 ;
-    
-    // var content    = this.get('content'),
-    //     nowShowing = this.get('nowShowing'),
-    //     orient     = this.get('insertionOrientation'),
-    //     lastSide   = null,
-    //     ret        = null,
-    //     itemView, curSide, f;
-    //     
-    // for(var idx=0; ((ret === null) && (idx<content.length)); idx++) {
-    //   // itemView = this.itemViewForContent(content.objectAt(idx));
-    //   itemView = this.itemViewForContentIndex(idx);
-    //   f = this.convertFrameFromView(itemView.get('frame'), itemView) ;
-    //   
-    //   // if we are a horizontal orientation, look for the first item that 
-    //   // will "switch sides" on the x path an the maxY is greater than Y.
-    //   // This assumes you will flow top to bottom, but it should work if you
-    //   // flow LTR or RTL.
-    //   if (orient == SC.HORIZONTAL_ORIENTATION) {
-    //     if (SC.maxY(f) > loc.y) {
-    //       curSide = (SC.maxX(f) < loc.x) ? -1 : 1 ;
-    //     } else curSide = null ;
-    //     
-    //   // if we are a vertical orientation, look for the first item that
-    //   // will "switch sides" on the y path and the maxX is greater than X.
-    //   // This assumes you will flow LTR, but it should work if you flow
-    //   // bottom to top or top to bottom.
-    //   } else {
-    //     if (SC.minX(f) < loc.x) {
-    //       curSide = (SC.maxY(f) < loc.y) ? -1 : 1 ;
-    //     } else curSide = null ;
-    //   }
-    //   
-    //   // if we "switched" sides then return this item view.
-    //   if (curSide !== null) {
-    //     
-    //     // OK, we found an item view, while we have this data, decide if
-    //     // we should insert before or after the view
-    //     if ((lastSide !== null) && (curSide != lastSide)) {
-    //       ret = idx ;
-    //       if (orient == SC.HORIZONTAL_ORIENTATION) {
-    //         if (SC.midX(f) < loc.x) ret++ ;
-    //       } else {
-    //         if (SC.midY(f) < loc.y) ret++ ;
-    //       }
-    //     }
-    //     lastSide =curSide ;
-    //   }
-    // }
-    // 
-    // // Handle some edge cases
-    // if ((ret === null) || (ret < 0)) ret = 0 ;
-    // if (ret > content.length) ret = content.length ;
-    
-    // Done. Phew.  Return.
-    return ret;
+    return -1; 
   },
   
   // ..........................................................
@@ -2678,11 +2705,13 @@ SC.CollectionView = SC.View.extend(
     // find the differences between the two
     // NOTE: reuse a TMP IndexSet object to avoid creating lots of objects
     // during scrolling
-    if (last && nowShowing && (last !== nowShowing)) {
-      diff1 = this._TMP_DIFF1.add(last).remove(nowShowing);
-      diff2 = this._TMP_DIFF2.add(nowShowing).remove(last);
-      diff = diff1.add(diff2);
-    } else diff = last || nowShowing ;
+    if (last !== nowShowing) {
+      if (last && nowShowing) {
+        diff1 = this._TMP_DIFF1.add(last).remove(nowShowing);
+        diff2 = this._TMP_DIFF2.add(nowShowing).remove(last);
+        diff = diff1.add(diff2);
+      } else diff = last || nowShowing ;
+    }
 
     // if nowShowing has actually changed, then update
     if (diff && diff.get('length') > 0) {

data/frameworks/sproutcore/frameworks/desktop/views/grid.js

@@ -104,6 +104,7 @@ SC.GridView = SC.ListView.extend(
     
     // set minHeight
     ret.minHeight = rows * rowHeight ;
+    this.calculatedHeight = ret.minHeight;
     return ret; 
   },
   

data/frameworks/sproutcore/frameworks/desktop/views/list.js

@@ -290,6 +290,7 @@ SC.ListView = SC.CollectionView.extend(
     var ret = this._sclv_layout;
     if (!ret) ret = this._sclv_layout = {};
     ret.minHeight = this.rowOffsetForContentIndex(this.get('length'))+4;
+    this.calculatedHeight = ret.minHeight;
     return ret ;
   },
   
@@ -373,11 +374,11 @@ SC.ListView = SC.CollectionView.extend(
     
     // if height is greater than 0, on some platforms we should just render
     // to specific windows in order to minimize render time.
-    if (height > 0 && !SC.browser.msie) {
-      start = start - (start % 50);
-      if (start < 0) start = 0 ;
-      end   = end - (end % 50) + 50;
-    }
+    // if (height > 0 && !SC.browser.msie) {
+    //   start = start - (start % 50);
+    //   if (start < 0) start = 0 ;
+    //   end   = end - (end % 50) + 50;
+    // }
     
     if (end<start) end = start;
     if (end>len) end = len ;
@@ -419,9 +420,24 @@ SC.ListView = SC.CollectionView.extend(
            = this.get('insertionPointView').create();
     }
     
-    var layout = SC.clone(itemView.get('layout')),
+    var index  = itemView.get('contentIndex'),
+        len    = this.get('length'),
+        layout = SC.clone(itemView.get('layout')),
         level  = itemView.get('outlineLevel'),
-        indent = itemView.get('outlineIndent') || 0;
+        indent = itemView.get('outlineIndent') || 0,
+        group;
+
+    // show item indented if we are inserting at the end and the last item
+    // is a group item.  This is a special case that should really be 
+    // converted into a more general protocol.
+    if ((index >= len) && index>0) {
+      group = this.itemViewForContentIndex(len-1);
+      if (group.get('isGroupView')) {
+        level = 1;
+        indent = group.get('outlineIndent');
+      }
+    }
+    
     if (SC.none(level)) level = -1;
     
     if (dropOperation & SC.DROP_ON) {
@@ -477,7 +493,7 @@ SC.ListView = SC.CollectionView.extend(
     var indexes = this.contentIndexesInRect(loc),
         index   = indexes.get('min'),
         len     = this.get('length'),
-        min, max, diff, clevel, cindent, plevel, pindent, itemView;
+        min, max, diff, clevel, cindent, plevel, pindent, itemView, pgroup;
 
     // if there are no indexes in the rect, then we need to either insert
     // before the top item or after the last item.  Figure that out by 
@@ -504,7 +520,7 @@ SC.ListView = SC.CollectionView.extend(
       }
     }
     
-    dropOperation = SC.DROP_BEFORE;
+    
     
     // ok, now if we are in last 10px, go to next item.
     if ((index<len) && (loc.y >= max-10)) index++;
@@ -512,28 +528,62 @@ SC.ListView = SC.CollectionView.extend(
     // finally, let's decide if we want to actually insert before/after.  Only
     // matters if we are using outlining.
     if (index>0) {
-      itemView = this.itemViewForContentIndex(index);
-      clevel   = itemView ? itemView.get('outlineLevel') : 0;
-      cindent  = (itemView ? itemView.get('outlineIndent') : 0) || 0;
-      cindent  *= clevel;
-      
-      itemView = this.itemViewForContentIndex(index);
+
+      itemView = this.itemViewForContentIndex(index-1);
       pindent  = (itemView ? itemView.get('outlineIndent') : 0) || 0;
       plevel   = itemView ? itemView.get('outlineLevel') : 0;
+      
+      if (index<len) {
+        itemView = this.itemViewForContentIndex(index);
+        clevel   = itemView ? itemView.get('outlineLevel') : 0;
+        cindent  = (itemView ? itemView.get('outlineIndent') : 0) || 0;
+        cindent  *= clevel;
+      } else {
+        clevel = itemView.get('isGroupView') ? 1 : 0; // special case...
+        cindent = pindent * clevel;  
+      }
+
       pindent  *= plevel;
 
       // if indent levels are different, then try to figure out which level 
       // it should be on.
       if ((clevel !== plevel) && (cindent !== pindent)) {
+        
         // use most inner indent as boundary
-        if (((pindent > cindent) && (loc.x >= pindent)) ||
-            ((pindent < cindent) && (loc.x <= cindent))) {
-          index-- ;
+        if (pindent > cindent) {
+          index--;
           dropOperation = SC.DROP_AFTER;
         }
       }
     }
 
+    // we do not support dropping before a group item.  If dropping before 
+    // a group item, always try to instead drop after the previous item.  If
+    // the previous item is also a group then, well, dropping is just not 
+    // allowed.  Note also that dropping at 0, first item must not be group
+    // and dropping at length, last item must not be a group
+    //
+    if (dropOperation === SC.DROP_BEFORE) {
+      itemView = (index<len) ? this.itemViewForContentIndex(index) : null;
+      if (!itemView || itemView.get('isGroupView')) {
+        if (index>0) {
+          itemView = this.itemViewForContentIndex(index-1);
+          
+          // don't allow a drop if the previous item is a group view and we're
+          // insert before the end.  For the end, allow the drop if the 
+          // previous item is a group view but OPEN.
+          if (!itemView.get('isGroupView') || (itemView.get('disclosureState') === SC.BRANCH_OPEN)) {
+            index = index-1;
+            dropOperation = SC.DROP_AFTER;
+          } else index = -1;
+
+        } else index = -1;
+      }
+      
+      if (index<0) dropOperation = SC.DRAG_NONE ;
+    } 
+    
+    // return whatever we came up with
     return [index, dropOperation];
   },