sproutcore 0.9.8 → 0.9.9

data/History.txt

@@ -1,3 +1,5 @@
+* [FIX] Changed default language mapping for Japanese from jp to ja.
+
 == SproutCore 0.9.8
 
 * [FIX] Plugged memory leak in view_helper that would cause sc-server to slow down after repeated use.

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen actionpack activesupport].each do |req_gem|
+%w[rake hoe newgem rubigen activesupport actionpack].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/frameworks/sproutcore/drag/drag.js

@@ -438,7 +438,7 @@ SC.Drag = SC.Object.extend(
   //
   // This means that if you change the view hierarchy of your drop targets
   // during a drag, it will probably be wrong.
-  _dropTargets: function() {
+  _getOrderedDropTargets: function() {
     if (this._cachedDropTargets) return this._cachedDropTargets ;
     var ret = [];
     
@@ -448,15 +448,29 @@ SC.Drag = SC.Object.extend(
       if (!dt.hasOwnProperty(key)) continue ;
       ret.push(dt[key]) ;      
     }
-    
-    // now resort.  This custom function will sort nested drop targets
-    // at the start of the list.
-    ret = ret.sort(function(a,b) {
-      var view = a;
-      while((view = view.parentNode) && (view != SC.window)) {
-        if (b == view) return -1 ;
+
+    // views must be sorted so that drop targets with the deepest nesting 
+    // levels appear first in the array.  The getDepthFor().
+    var depth = {} ;
+    var getDepthFor = function(x) {
+      if (!x) return 0 ;
+      var guid = SC.guidFor(x);
+      var ret = depth[guid];
+      if (!ret) {
+        ret = 1 ;
+        while((x = x.parentNode) && (x !== SC.window)) {
+          if (dt[SC.guidFor(x)] !== undefined) ret++ ;
+        }
+        depth[guid] = ret ;
       }
-      return 1; 
+      return ret ;
+    } ;
+
+    ret.sort(function(a,b) {
+      if (a===b) return 0;
+      a = getDepthFor(a) ;
+      b = getDepthFor(b) ;
+      return (a > b) ? -1 : 1 ;
     }) ;
 
     this._cachedDropTargets = ret ;
@@ -467,7 +481,7 @@ SC.Drag = SC.Object.extend(
   // This will search through the drop targets, looking for one in the 
   // target area.
   _findDropTarget: function(evt) {
-    var dt = this._dropTargets() ;
+    var dt = this._getOrderedDropTargets() ;
     var loc = Event.pointerLocation(evt) ;
 
     var ret = null ;

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

@@ -223,12 +223,11 @@ SC.ButtonView = SC.View.extend(SC.Control,
   keyEquivalent: null,
   
   /** @private {String} used to store a previously defined key equiv */
-  _lastKeyEquivalent: null,
+  _defaultKeyEquivalent: null,
   
   performKeyEquivalent: function( keystring, evt )
   {
     if (!this.get('isEnabled')) return false;
-    
     var keyEquivalent = this.get('keyEquivalent');
     if (keyEquivalent && (keyEquivalent == keystring))
     {
@@ -266,6 +265,8 @@ SC.ButtonView = SC.View.extend(SC.Control,
   init: function() {
     arguments.callee.base.call(this) ;
     
+    //cache the key equivalent
+    if(this.get("keyEquivalent")) this._defaultKeyEquivalent = this.get("keyEquivalent"); 
     // setup initial CSS clases
     this._isDefaultOrCancelObserver() ;
     
@@ -332,23 +333,20 @@ SC.ButtonView = SC.View.extend(SC.Control,
   _isDefaultOrCancelObserver: function() {
     var isDef = !!this.get('isDefault') ;
     var isCancel = !isDef && this.get('isCancel') ;
+    
     if(this.didChangeFor('defaultCancelChanged','isDefault','isCancel')) {
       this.setClassName('def', isDef) ;
-      var key = this.get('keyEquivalent') ;
       if (isDef) {
-        //cache the previously defined key equivalent
-        this._lastKeyEquivalent = key;
         this.setIfChanged('keyEquivalent', 'return');
       } 
       else if (isCancel)
       {
-        //cache the previously defined key equivalent
-        this._lastKeyEquivalent = key;
         this.setIfChanged('keyEquivalent', 'escape') ;
       }
       else
       {
-        this.setIfChanged("keyEquivalent",this._lastKeyEquivalent);
+        //restore the default key equivalent
+        this.set("keyEquivalent",this._defaultKeyEquivalent);
       }
     }
       

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

@@ -1701,7 +1701,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     // Make sure that saved mouseDown state is always reset in case we do
     // not get a paired mouseUp. (Only happens if subclass does not call us 
     // like it should)
-    this._mouseDownAt = this._shouldDeselect =
+    this._mouseDownAt = this._shouldSelect = this._shouldDeselect =
       this._shouldReselect = this._refreshSelection = false;
 
     // find the actual view the mouse was pressed down on.  This will call
@@ -1724,18 +1724,18 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     // collection some basic setup info
     var selection  = this.get('selection') || [];
     var isSelected = selection.include(mouseDownContent);
-    var modifierKeyPressed = ev.ctrlKey || ev.altKey || ev.metaKey;
+    var modifierKeyPressed = ev.ctrlKey || ev.metaKey ;
     if (mouseDownView.checkboxView && (Event.element(ev) == el.checkboxView.rootElement)) {
       modifierKeyPressed = true ;
-    } 
+    }
+    this._modifierKeyPressed = modifierKeyPressed ;  
 
     this._mouseDownAt = Date.now();
 
-    // holding down a modifier key while clicking a selected item should deselect that item...
-    // deselect and bail.
+    // holding down a modifier key while clicking a selected item should 
+    // deselect that item...deselect and bail.
     if (modifierKeyPressed && isSelected) {
       this._shouldDeselect = mouseDownContent;
-    
     // if the shiftKey was pressed, then we want to extend the selection
     // from the last selected item
     } else if (ev.shiftKey && selection.get('length') > 0) {
@@ -1747,20 +1747,17 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     } else if (!modifierKeyPressed && isSelected) {
       this._shouldReselect = mouseDownContent;
       
-    // Otherwise, if selecting on mouse down,  simply select the clicked on item, 
-    // adding it to the current
-    // selection if a modifier key was pressed.
+    // Otherwise, if selecting on mouse down,  simply select the clicked on 
+    // item, adding it to the current selection if a modifier key was pressed.
     } else {
-       if(this.get("selectOnMouseDown")){
+      if (this.get("selectOnMouseDown")){
          this.selectItems(mouseDownContent, modifierKeyPressed);
-      } 
-      
-       
-      
+      } else this._shouldSelect = mouseDownContent ;
     }
-
+    
     // saved for extend by shift ops.
     this._previousMouseDownContent = mouseDownContent;
+    
     return true;
   },
   
@@ -1782,11 +1779,19 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
       
     } else {
       var content = (view) ? view.get('content') : null ;
-      if(this._previousMouseDownContent == content) { this.selectItems(content); }
+
+      // this will be set if the user simply clicked on an unselected item and 
+      // selectOnMouseDown was NO.
+      if (this._shouldSelect) this.selectItems(this._shouldSelect, this._modifierKeyPressed);
+      
+      // This is true if the user clicked on a selected item with a modifier
+      // key pressed.
       if (this._shouldDeselect) this.deselectItems(this._shouldDeselect);
 
-      // begin editing of an item view IF all of the following is true:
-      //   otherwise, just reselect.
+      // This is true if the user clicked on a selected item without a 
+      // modifier-key pressed.  When this happens we try to begin editing 
+      // on the content.  If that is not allowed, then simply clear the 
+      // selection and reselect the clicked on item.
       if (this._shouldReselect) {
 
         // - contentValueIsEditable is true
@@ -1821,7 +1826,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
   },
   
   _cleanupMouseDown: function() {
-    this._mouseDownAt = this._shouldDeselect = this._shouldReselect = this._refreshSelection = false;
+    this._mouseDownAt = this._shouldDeselect = this._shouldReselect = this._refreshSelection = this._shouldSelect = false;
     this._mouseDownEvent = this._mouseDownContent = this._mouseDownView = null ;
   },
   
@@ -1851,33 +1856,39 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
   },
 
   _findSelectionExtendedByShift: function(selection, mouseDownContent) {
-    var collection = this.get('content');
+    var content = this.get('content');
 
     // bounds of the collection...
-    var collectionLowerBounds = 0;
-    var collectionUpperBounds = (collection.get('length') - 1);
+    var contentLowerBounds = 0;
+    var contentUpperBounds = (content.get('length') - 1);
 
-    var selectionBeginIndex = collection.indexOf(selection.first());
-    var selectionEndIndex   = collection.indexOf(selection.last());
+    var selectionBeginIndex = content.indexOf(selection.first());
+    var selectionEndIndex   = content.indexOf(selection.last());
 
-    var previousMouseDownIndex = collection.indexOf(this._previousMouseDownContent);
+    var previousMouseDownIndex = content.indexOf(this._previousMouseDownContent);
     // _previousMouseDownContent couldn't be found... either it hasn't been set yet or the record has been deleted by the user
     // fall back to the first selected item.
     if (previousMouseDownIndex == -1) previousMouseDownIndex = selectionBeginIndex;
 
 
-    var currentMouseDownIndex = collection.indexOf(mouseDownContent);
+    var currentMouseDownIndex = content.indexOf(mouseDownContent);
     // sanity check...
-    if (currentMouseDownIndex == -1) throw "Unable to extend selection to an item that's not in the collection!";
+    if (currentMouseDownIndex == -1) throw "Unable to extend selection to an item that's not in the content array!";
 
     // clicked before the current selection set... extend it's beginning...
-    if (currentMouseDownIndex < selectionBeginIndex) selectionBeginIndex = currentMouseDownIndex;
+    if (currentMouseDownIndex < selectionBeginIndex) {
+      selectionBeginIndex = currentMouseDownIndex;
+    }
+    
     // clicked after the current selection set... extend it's ending...
-    if (currentMouseDownIndex > selectionEndIndex) selectionEndIndex = currentMouseDownIndex;
-    // clicked inside the selection set... need to determine where the las
-    if ((currentMouseDownIndex > selectionBeginIndex) && (currentMouseDownIndex < selectionEndIndex))
-    {
-      if (currentMouseDownIndex == previousMouseDownIndex) {
+    if (currentMouseDownIndex > selectionEndIndex) {
+      selectionEndIndex = currentMouseDownIndex;
+    }
+    
+    // clicked inside the selection set... need to determine where the last
+    // selection was and use that as an anchor.
+    if ((currentMouseDownIndex > selectionBeginIndex) && (currentMouseDownIndex < selectionEndIndex)) {
+      if (currentMouseDownIndex === previousMouseDownIndex) {
         selectionBeginIndex = currentMouseDownIndex;
         selectionEndIndex   = currentMouseDownIndex;
       } else if (currentMouseDownIndex > previousMouseDownIndex) {
@@ -1888,12 +1899,14 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
         selectionEndIndex   = previousMouseDownIndex;
       }
     }
+    
     // slice doesn't include the last index passed... silly..
     selectionEndIndex++;
 
-    // shouldn't need to sanity check that the selection is in bounds due to the indexOf checks above...
-    // I'll have faith that indexOf hasn't lied to me...
-    return collection.slice(selectionBeginIndex, selectionEndIndex);
+    // shouldn't need to sanity check that the selection is in bounds due to 
+    // the indexOf checks above...I'll have faith that indexOf hasn't lied to 
+    // me...
+    return content.slice(selectionBeginIndex, selectionEndIndex);
   },
   
 
@@ -1940,11 +1953,24 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
   // DRAG AND DROP SUPPORT
   //
 
-  _reorderDataType: function() {
+  /**
+    When reordering its content, the collection view will store its reorder
+    data using this special data type.  The data type is unique to each 
+    collection view instance.  You can use this data type to detect reorders
+    if necessary.
+    
+    @field
+    @type {String}
+  */
+  reorderDataType: function() {
     if (!this._reorderDataTypeKey) {
       this._reorderDataTypeKey = "SC.CollectionView.Reorder.%@".fmt(SC.guidFor(this)) ;
     }
     return this._reorderDataTypeKey ;
+  }.property(),
+  
+  _reorderDataType: function() {
+    return this.get('reorderDataType') ;
   },
   
   /**
@@ -2007,8 +2033,12 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
       // Set this to the dragContent property.
       var content = this.get('content') || [] ;
       var dragContent;
-      if (this.get("selectOnMouseDown") == false) {
-        dragContent = [this._previousMouseDownContent];
+      
+      // if we don't select on mouse down, then the selection has not been 
+      // updated to whatever the user clicked.  Instead use
+      // mouse down content.
+      if (!this.get("selectOnMouseDown")) {
+        dragContent = [this._mouseDownContent];
       } else {
         dragContent = this.get('selection').sort(function(a,b) {
           a = content.indexOf(a) ;
@@ -2072,7 +2102,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     if (canReorderContent) {
       ret = (ret) ? ret.slice() : [] ;
       
-      var key = this._reorderDataType() ;
+      var key = this.get('reorderDataType') ;
       if (ret.indexOf(key) < 0) ret.push(key) ;
     }
     return ret ;
@@ -2090,7 +2120,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     
     // if this is a reorder, then return drag content.
     if (this.get('canReorderContent')) {
-      if (dataType === this._reorderDataType()) return this.get('dragContent') ;
+      if (dataType === this.get('reorderDataType')) return this.get('dragContent') ;
     }
     
     // otherwise, just pass along to the delegate.
@@ -2103,17 +2133,21 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
   */
   dragEntered: function(drag, evt) {
 
-    // the proposed drag operation is either DRAG_MOVE only if we can reorder
+    // the proposed drag operation is DRAG_REORDER only if we can reorder
     // content and the drag contains reorder content.
     var op = SC.DRAG_NONE ;
     if (this.get('canReorderContent')) {
       var types = drag.get('dataTypes') ;
-      if (types.indexOf(this._reorderDataType()) >= 0) op = SC.DRAG_MOVE ;
+      if (types.indexOf(this.get('reorderDataType')) >= 0) {
+        op = SC.DRAG_REORDER ;
+      }
     }
     
     // Now pass this onto the delegate.
     op = this.invokeDelegateMethod(this.delegate, 'collectionViewValidateDrop', this, drag, SC.DROP_ANY, -1, op) ;
     
+    if (op === SC.DRAG_REORDER) op = SC.DRAG_MOVE ;
+    
     // return
     return op ;
   },
@@ -2180,30 +2214,32 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     // is DROP_BEFORE.  DROP_ON is not handled by reordering content.
     if ((idx >= 0) && this.get('canReorderContent') && (dropOp === SC.DROP_BEFORE)) {
 
-      var objects = drag.dataForType(this._reorderDataType()) || [];
-      var content = this.get('content') || [] ;
+      var objects = drag.dataForType(this.get('reorderDataType')) ;
+      if (objects) {
+        var content = this.get('content') || [] ;
 
-      // if the insertion index is in between two items in the drag itself, 
-      // then this is not allowed.  Either use the last insertion index or 
-      // find the first index that is not in between selections.  Stop when
-      // we get to the beginning.
-      var previousContent = (idx > 0) ? content.objectAt(idx-1) : null ;
-      var nextContent = (idx < content.get('length')) ? content.objectAt(idx) : null;
-
-      var isPreviousInDrag = (previousContent) ? objects.indexOf(previousContent)>=0 : NO;
-      var isNextInDrag = (nextContent) ? objects.indexOf(nextContent)>=0 : NO;
-
-      if (isPreviousInDrag && isNextInDrag) {
-        if (this._lastInsertionIndex == null) {
-          while((idx >= 0) && (objects.indexOf(content.objectAt(idx)) >= 0)) {
-            idx-- ;
-          } 
-        } else idx = this._lastInsertionIndex ;
-      }
+        // if the insertion index is in between two items in the drag itself, 
+        // then this is not allowed.  Either use the last insertion index or 
+        // find the first index that is not in between selections.  Stop when
+        // we get to the beginning.
+        var previousContent = (idx > 0) ? content.objectAt(idx-1) : null ;
+        var nextContent = (idx < content.get('length')) ? content.objectAt(idx) : null;
+
+        var isPreviousInDrag = (previousContent) ? objects.indexOf(previousContent)>=0 : NO;
+        var isNextInDrag = (nextContent) ? objects.indexOf(nextContent)>=0 : NO;
+
+        if (isPreviousInDrag && isNextInDrag) {
+          if (this._lastInsertionIndex == null) {
+            while((idx >= 0) && (objects.indexOf(content.objectAt(idx)) >= 0)) {
+              idx-- ;
+            } 
+          } else idx = this._lastInsertionIndex ;
+        }
 
-      // If we found a valid insertion point to reorder at, then set the op
-      // to custom DRAG_REORDER.
-      if (idx >= 0) dragOp = SC.DRAG_REORDER ;
+        // If we found a valid insertion point to reorder at, then set the op
+        // to custom DRAG_REORDER.
+        if (idx >= 0) dragOp = SC.DRAG_REORDER ;
+      }
     }
 
     // Now save the insertion index and the dropOp.  This may be changed by
@@ -2303,7 +2339,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     // If the delegate did not handle the drag (i.e. returned SC.DRAG_NONE),
     // and the op type is REORDER, then do the reorder here.
     if ((performed === SC.DRAG_NONE) && (op === SC.DRAG_REORDER)) {
-      var objects = drag.dataForType(this._reorderDataType()) ;
+      var objects = drag.dataForType(this.get('reorderDataType')) ;
       if (!objects) return SC.DRAG_NONE ;
 
       var content = this.get('content') ;

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

@@ -35,7 +35,7 @@ SC.SourceListView = SC.CollectionView.extend(
     Allows reordering without modifiying the selection
   */
   
-  selectOnMouseDown: false,
+  selectOnMouseDown: NO,
   
   /**
     Set to YES if you want source list items to display an icon.

data/lib/sproutcore/bundle.rb

@@ -68,12 +68,12 @@ module SproutCore
   # 
   class Bundle 
 
-    LONG_LANGUAGE_MAP = { :english => :en, :french => :fr, :german => :de, :japanese => :jp, :spanish => :es, :italian => :it }
-    SHORT_LANGUAGE_MAP = { :en => :english, :fr => :french, :de => :german, :jp => :japanese, :es => :spanish, :it => :italian }
+    LONG_LANGUAGE_MAP = { :english => :en, :french => :fr, :german => :de, :japanese => :ja, :spanish => :es, :italian => :it }
+    SHORT_LANGUAGE_MAP = { :en => :english, :fr => :french, :de => :german, :ja => :japanese, :es => :spanish, :it => :italian }
 
-    # The default build mode for bundles.  This should be set once before you start using
-    # bundles.  You can override this when you create a specific bundle, but that should not
-    # be the typical behavior
+    # The default build mode for bundles.  This should be set once before you 
+    # start using bundles.  You can override this when you create a specific 
+    # bundle, but that should not be the typical behavior
     def self.build_mode; @build_mode || :development; end
     
     def self.build_mode=(new_mode); @build_mode = new_mode; end
@@ -90,8 +90,8 @@ module SproutCore
     end
     
     # ==== Returns 
-    # All bundles required directly or indirectly by this bundles.  These are returned in
-    # their proper load order.
+    # All bundles required directly or indirectly by this bundles.  These are 
+    # returned in their proper load order.
     #
     def all_required_bundles(seen=nil)
       seen ||= Set.new
@@ -143,19 +143,21 @@ module SproutCore
     def initialize(bundle_name, opts ={})
       
       # You must provide the following properties to every build:
-      # bundle_name::       A name used to identify the client for required URLs, etc.
+      # bundle_name::       A name used to identify the client for required 
+      #  URLs, etc.
       @bundle_name = bundle_name.to_sym
 
-      # The following are not required by the build system, but they can be used to
-      # automatically construct the key paths listed below.  Often times defaults will
-      # do the right thing
+      # The following are not required by the build system, but they can be 
+      # used to automatically construct the key paths listed below.  Often 
+      # times defaults will do the right thing
       #
       # library::      The root URL of the library holding the client
       @library = opts[:library]
       @library_root = opts[:library_root]
       raise "Bundles must belong to a library or have a library_root" if library_root.nil?
 
-      # The following properties are also required, but have defaults you can rely use:
+      # The following properties are also required, but have defaults you can 
+      # rely use:
       #  bundle_type::       :framework|:client (default :client)
       @bundle_type = (opts[:bundle_type] || opts[:type] || :client).to_sym
 
@@ -223,10 +225,12 @@ module SproutCore
       BuildTools::JavaScriptResourceBuilder.sort_entries_by_load_order(entries, opts[:language], self)
     end
     
-    # This method returns the manifest entries for resources of the specified type.
+    # This method returns the manifest entries for resources of the specified 
+    # type.
     # 
     # ==== Params
-    # type::  must be one of :javascript, :stylesheet, :resource, :html, :fixture, :test
+    # type::  must be one of :javascript, :stylesheet, :resource, :html, 3
+    #  :fixture, :test
     # 
     # ==== Options
     # language::  The language to use.  Defaults to preferred language.
@@ -250,7 +254,7 @@ module SproutCore
       return ret
     end
     
-    # This method returns the manifest entry for a resource with the specified name.
+    # Returns the manifest entry for a resource with the specified name.
     #
     # ==== Params
     # name: The name of the entry.

data/lib/sproutcore/library.rb

@@ -2,13 +2,14 @@ require 'yaml'
 
 module SproutCore
   
-  # Describes a single library that can contain one or more clients and frameworks. 
-  # This class is used to automatically locate all installed libraries and to register the
-  # clients within them.
+  # Describes a single library that can contain one or more clients and 
+  # frameworks. This class is used to automatically locate all installed 
+  # libraries and to register the clients within them.
   # 
-  # Libraries are chained, with the child library replacing the parent library's settings.
-  # In general, the root library is always the current app while its parent libraries are 
-  # those found in the load path or explicitly stated in the configs.
+  # Libraries are chained, with the child library replacing the parent 
+  # library's settings. In general, the root library is always the current app 
+  # while its parent libraries are those found in the load path or explicitly 
+  # stated in the configs.
   class Library
 
     # Creates a chained set of libraries from the passed location and the load path

data/lib/sproutcore/version.rb

@@ -2,7 +2,7 @@ module SproutCore #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-01 00:00:00 -07:00
+date: 2008-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency