sproutcore 0.9.7 → 0.9.8

data/History.txt

@@ -1,4 +1,8 @@
-== SVN HEAD
+== SproutCore 0.9.8
+
+* [FIX] Plugged memory leak in view_helper that would cause sc-server to slow down after repeated use.
+
+== SproutCore 0.9.7
 
 * [FIX] build tools could puke on strings files that contains quotes.  This should fix it.
 

data/frameworks/sproutcore/HISTORY

@@ -1,4 +1,8 @@
-== SVN HEAD
+== GIT HEAD
+
+== 0.9.8
+
+* [FIX] collection views now update group views appropriately.
 
 * [IE] offsetParent and viewportOffset() are now IE compliant.
 

data/frameworks/sproutcore/README

@@ -13,3 +13,4 @@ http://www.sproutcore.com
 If you would like to contact the authors, you can reach the current maintainer
 at charles@sproutit.com
 
+

data/frameworks/sproutcore/drag/drag.js

@@ -138,7 +138,7 @@ SC.Drag = SC.Object.extend(
       for(var key in this._data) {
         if (this.data.hasOwnProperty(key)) ret.push(key) ;
       }
-      return key ;
+      return ret ;
     }    
     
     // if that fails, then check to see if the source object is a dataSource.

data/frameworks/sproutcore/lib/button_views.rb

@@ -100,10 +100,11 @@ view_helper :button_view do
   var :theme, :regular
   var :size, :normal
 
-  attribute(:href) { |x| (x.nil? && (@tag.downcase.to_s == 'a')) ? 'javascript:;' : nil } 
+  attribute(:href) { |x| (x.nil? && (@tag.downcase.to_s == 'a')) ? 'javascript:;' : x } 
 
   # Add the theme to the CSS class.
   css_class_names << 'sc-button-view'
+  css_class_names << 'button'
   css_class_names << @theme unless @theme.nil? || @theme == false
   css_class_names << @size unless @size.nil? || @size == false
 

data/frameworks/sproutcore/mixins/inline_editor_delegate.js

@@ -17,6 +17,16 @@
 */
 SC.InlineEditorDelegate = {
   
+    /**
+     This is a  classname you can apply to the inline editor field
+     to configure it's styling, in addition to the the editor's 
+     default style-cloning behavior.
+      
+      @property inlineEditorClassName {String} A class name to use with the inline editor.
+    */
+    inlineEditorClassName: "",
+  
+  
     /**
       Called just before the inline edit displays itself but after it has been 
       configured for display.  

data/frameworks/sproutcore/panes/overlay.js

@@ -130,7 +130,7 @@ SC.OverlayPaneView = SC.PaneView.extend({
   },
   
   cancel: function(sender, evt) {
-    var button = this._findViewWithKeyIn('isDefault', SC.ButtonView, this) ;    
+    var button = this._findViewWithKeyIn('isCancel', SC.ButtonView, this) ;    
     if (button) {
       button.triggerAction(evt) ;
       return true ;

data/frameworks/sproutcore/tests/views/view/innerFrame.rhtml

@@ -44,6 +44,7 @@ Test.context("CASE 1: Auto-layout view with no padding & no border", {
   
 });
 
+
 // CASE 2: Auto-layout of view with padding
 // - same as Case 1, except innerFrame = frame less padding
 CASE2_OFFSET = 2;

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

@@ -222,6 +222,9 @@ SC.ButtonView = SC.View.extend(SC.Control,
   */
   keyEquivalent: null,
   
+  /** @private {String} used to store a previously defined key equiv */
+  _lastKeyEquivalent: null,
+  
   performKeyEquivalent: function( keystring, evt )
   {
     if (!this.get('isEnabled')) return false;
@@ -329,12 +332,26 @@ SC.ButtonView = SC.View.extend(SC.Control,
   _isDefaultOrCancelObserver: function() {
     var isDef = !!this.get('isDefault') ;
     var isCancel = !isDef && this.get('isCancel') ;
-
-    this.setClassName('def', isDef) ;
-
-    var key = this.get('keyEquivalent') ;
-    if (isDef && key != 'return') this.set('keyEquivalent', 'return') ;
-    if (isCancel && key != 'escape') this.set('keyEquivalent', 'escape') ;
+    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);
+      }
+    }
+      
   }.observes('isDefault', 'isCancel'),
     
   // on mouse down, set active only if enabled.  

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

@@ -691,7 +691,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     var didChange = false ;
     
     // If this is a fullUpdate, then rebuild the itemViewsByContent hash
-    // from scratch.  This is necessary of the content of the visible range
+    // from scratch.  This is necessary if the content or the visible range
     // might have changed.
     if (fullUpdate) {
      
@@ -1059,9 +1059,27 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     if (!ret) throw "Could not create itemView for content: %@".fmt(content);
 
     // Determine proper parent view and insert itemView if needed.
-    // Also update count of itemViews.  
-    var parentView = (groupBy && content) ? this._insertGroupViewFor(content.get(groupBy), contentIndex) : this ;
-    if (ret.get('parentNode') != parentView) {
+    // Also update count of itemViews.
+    var canGroup = !!(groupBy && content) ;
+    var groupValue = (canGroup) ? content.get(groupBy) : null;  
+    var parentView = (canGroup) ? this._insertGroupViewFor(groupValue, contentIndex) : this ;
+    var curParentView = ret.get('parentNode') ;
+    
+    if (curParentView != parentView) {
+      
+      // if the item is already inside of another group, then it is probably
+      // just being moved, so remove it from its parent group first...
+      if (groupBy && curParentView) {
+        
+        // reduce the group view count.  If this it the last item in the 
+        // group view, the count will be <= 0 and we will need to remove t
+        // the group view itself.
+        if (--this._groupViewCounts[SC.guidFor(curParentView)] <= 0) {
+          this._removeGroupView(curParentView, groupValue) ;
+        }
+        
+      }
+      
       parentView.appendChild(ret) ;
       if (groupBy) this._groupViewCounts[SC.guidFor(parentView)]++ ;
     }
@@ -2494,7 +2512,10 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
     while(--idx >= 0) {
       var itemView = this.itemViewForContent(dragContent[idx]) ;
       if (!itemView) continue ;
+
       var f = itemView.get('frame') ;
+      f = this.convertFrameFromView(f, itemView) ;
+      
       var dom = itemView.rootElement ;
       if (!dom) continue ;
       
@@ -2510,6 +2531,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate,
       // even if the CSS styles do not match.  Make sure the items are 
       // properly positioned.
       dom = dom.cloneNode(true) ;
+
       Element.setStyle(dom, { position: "absolute", left: "%@px".fmt(f.x), top: "%@px".fmt(f.y), width: "%@px".fmt(f.width), height: "%@px".fmt(f.height) }) ;
       view.rootElement.appendChild(dom) ;
     }

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

@@ -367,7 +367,7 @@ SC.SourceListView = SC.CollectionView.extend(
       } ;
     
       var insertionPoint = this._insertionPointView ;
-      f = { height: 0, x: 8, y: itemView.get('frame').y, width: itemView.owner.get('frame').width };
+      var f = this.calculateInsertionPointFrame(itemView);
       insertionPoint.set('frame', f) ;
 
       if (insertionPoint.parentNode != itemView.parentNode) {
@@ -377,6 +377,16 @@ SC.SourceListView = SC.CollectionView.extend(
     
   },
   
+  /**
+    This is the default frame for the insertion point.  Override this method 
+    if your insertion point's styling needs to be customized, or if you need 
+    more control of the insertion point's positioning (i.e., heirarchical 
+    placement)
+  */
+  calculateInsertionPointFrame: function(itemView) {
+    return { height: 0, x: 8, y: itemView.get('frame').y, width: itemView.owner.get('frame').width };
+  },
+
   hideInsertionPoint: function() {
     var insertionPoint = this._insertionPointView ;
     if (insertionPoint) insertionPoint.removeFromParent() ;
@@ -401,7 +411,7 @@ SC.SourceListView = SC.CollectionView.extend(
     var retOp = SC.DROP_BEFORE ;
 
     // search groups until we find one that matches
-    var top = 0;
+    var top = 0 ;
     var idx = 0 ;
     while((ret<0) && (range = this.groupRangeForContentIndex(idx)).length>0){
       var max = top + ((range.length+headerRowCount) * rowHeight) ;

data/frameworks/sproutcore/views/field/text_field.js

@@ -100,9 +100,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.Editable,
       this._isFocused = true ;
       if (this.get('isVisibleInWindow')) {
         this.rootElement.focus();
-
-		this.invokeLater(this._selectRootElement, 1) ;
-
+		    this.invokeLater(this._selectRootElement, 1) ;
       }
     }
 
@@ -110,8 +108,8 @@ SC.TextFieldView = SC.FieldView.extend(SC.Editable,
     this._updateFieldHint() ;
   },
 
-  // In IE, you can't modify functions on DOM elements so we need to wrap the call to select() 
-  // like this.
+  // In IE, you can't modify functions on DOM elements so we need to wrap the 
+  // call to select() like this.
   _selectRootElement: function() {
 	this.rootElement.select() ;
   },
@@ -125,8 +123,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.Editable,
       this._isFocused = false ;
       this._updateFieldHint() ;
       return this.rootElement.blur() ;
-    }
-    else {
+    } else {
       this._value = this.rootElement.value ;
       this.fieldValueDidChange() ;
       this._updateFieldHint() ;

data/frameworks/sproutcore/views/inline_text_field.js

@@ -131,6 +131,12 @@ SC.InlineTextFieldView = SC.View.extend(SC.DelegateSupport, SC.InlineEditorDeleg
     this.updateViewStyle() ;
 
     var del = this._delegate ;
+
+    this._className = this.getDelegateProperty(del,"inlineEditorClassName");
+    if(this._className && !this.hasClassName(this._className)) {
+        this.setClassName(this._className,true);
+      }
+    
     this.invokeDelegateMethod(del, 'inlineEditorWillBeginEditing', this) ;
     this.resizeToFit(field.getFieldValue()) ;
 
@@ -190,8 +196,11 @@ SC.InlineTextFieldView = SC.View.extend(SC.DelegateSupport, SC.InlineEditorDeleg
     // and clean up.
     this.invokeDelegateMethod(del, 'inlineEditorDidEndEditing', this, finalValue) ;
 
+    // If the delegate set a class name, let's clean it up:
+    if(this._className) this.setClassName(this._className, false);
+    
     // cleanup cached values
-    this._originalValue = this._delegate = this._exampleElement = this._optframe = null ;
+    this._originalValue = this._delegate = this._exampleElement =  this._optframe = this._className = null ;
     this.set('isEditing', NO) ;
 
     // resign first responder if not done already.  This may call us in a 
@@ -328,6 +337,25 @@ SC.InlineTextFieldView = SC.View.extend(SC.DelegateSupport, SC.InlineEditorDeleg
         this.owner.commitEditing() ;
         return YES ;
       }
+    },
+    
+    // Tries to find the next key view when tabbing.  If the next view is 
+    // editable, begins editing.
+    
+    insertTab: function(evt)
+    {
+      var next = this.get("owner")._delegate.nextValidKeyView();
+      this.owner.commitEditing() ;
+      if(next) next.beginEditing();
+      return YES ;
+    },
+
+    insertBacktab: function(evt)
+    {
+      var prev = this.get("owner")._delegate.previousValidKeyView();
+      this.owner.commitEditing() ;
+      if(prev) prev.beginEditing();
+      return YES ;
     }
 
   }).outletFor('.inner-field?'),
@@ -385,6 +413,8 @@ SC.InlineTextFieldView.mixin(
     return (this.sharedEditor) ? this.sharedEditor.discardEditing() : YES ;  
   },
   
+
+  
   /**
     The current shared inline editor.  This property will often remain NULL
     until you actually begin editing for the first time.

data/frameworks/sproutcore/views/view.js

@@ -470,12 +470,19 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
   //
 
   /**
-    Read-only array of currently applied classNames.
+    An array of currently applied classNames.
     
     @field
     @type {Array}
+    @param value {Array} Array of class names to apply to the element
   */
-  classNames: function() { 
+  classNames: function(key, value) { 
+    if (value !== undefined) {
+        value = Array.from(value) ;
+        if (this.rootElement) this.rootElement.className = value.join(' ') ;
+        this._classNames = value.slice() ;
+    }
+    
     if (!this._classNames) {
       var classNames = this.rootElement.className;
       this._classNames = (classNames && classNames.length > 0) ? classNames.split(' ') : [] ;
@@ -502,11 +509,9 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
   addClassName: function(className) {
     if (this.hasClassName(className)) return ; // nothing to do
 
-    this.propertyWillChange('classNames') ;
     var classNames = this._classNames || this.get('classNames') ;
     classNames.push(className) ;
-    if (this.rootElement) this.rootElement.className = classNames.join(' ');
-    this.propertyDidChange('classNames') ;
+    this.set('classNames', classNames) ;
     return className ;
   },
 
@@ -519,11 +524,9 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
   removeClassName: function(className) {
     if (!this.hasClassName(className)) return ; // nothing to do
     
-    this.propertyWillChange('classNames') ;
     var classNames = this._classNames || this.get('classNames') ;
     classNames = this._classNames = classNames.without(className) ;
-    if (this.rootElement) this.rootElement.className = classNames.join(' ');
-    this.propertyDidChange('classNames') ;
+    this.set('classNames', classNames) ;
     return className ;
   },
 

data/lib/sproutcore/bundle.rb

@@ -543,7 +543,7 @@ module SproutCore
       
       return cached[:contents] 
     end
-
+    
     ######################################################
     ## LOCALIZATION
     ##

data/lib/sproutcore/version.rb

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

data/lib/sproutcore/view_helpers.rb

@@ -605,16 +605,11 @@ module SproutCore
       SproutCore::ViewHelperSupport.set_helper(helper_name, hs)
 
       ## install the helper method
-      SproutCore::ViewHelpers.class_eval %{
+      eval %{
         def #{helper_name}(item_id=nil, opts={}, &block)
           SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, self, &block)
         end }
 
-      SproutCore::ViewHelpers.class_eval %{
-          def self.#{helper_name}(item_id=nil, opts={}, &block)
-            SproutCore::ViewHelperSupport.render_view(:#{helper_name}, item_id, opts, bundle, self, &block)
-          end }
-
     end
     
     def render_page_views
@@ -654,7 +649,7 @@ module SproutCore
       
       # restore old bundle helper.
       unless bundle.nil?
-        @helper_bundler = old_helper_bundle
+        @helper_bundle = old_helper_bundle
       end
     end
     

metadata

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