sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js

@@ -82,6 +82,11 @@ sc_require('views/text_field') ;
 SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
 /** @scope SC.InlineTextFieldView.prototype */ {
 
+  /**
+    Over-write magic number from SC.TextFieldView
+  */
+  _topOffsetForFirefoxCursorFix: 0,
+
   /**
     Invoked by the class method to begin editing on an inline editor.
     
@@ -93,7 +98,10 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     @returns {Boolean} YES if editor began editing, NO if it failed.
   */
   beginEditing: function(options) {
-    var layout={}, pane;
+    if (!options) return;
+    
+    var layout={}, pane, delLayout, paneElem;
+    
     // end existing editing if necessary
     this.beginPropertyChanges();
     if (this.get('isEditing') && !this.blurEditor()) {
@@ -111,6 +119,11 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     
     this._originalValue = options.value || '' ;
     this._multiline = (options.multiline !== undefined) ? options.multiline : NO ;
+    if(this._multiline){
+      this.set('isTextArea', YES);
+    }else{
+    this.set('isTextArea', NO);
+    }
     this._commitOnBlur =  (options.commitOnBlur !== undefined) ? options.commitOnBlur : YES ;
 
     // set field values
@@ -126,15 +139,17 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
 
     layout.height = this._optframe.height;
     layout.width=this._optframe.width;
-    if(this._optIsCollection && this._delegate.get('layout').left){
-      layout.left=this._optframe.x-this._delegate.get('layout').left-pane.$()[0].offsetLeft-1;
+    delLayout = this._delegate.get('layout');
+    paneElem = pane.$()[0];
+    if(this._optIsCollection && delLayout.left){
+      layout.left=this._optframe.x-delLayout.left-paneElem.offsetLeft-1;
     }else{
-      layout.left=this._optframe.x-pane.$()[0].offsetLeft-1;
+      layout.left=this._optframe.x-paneElem.offsetLeft-1;
     }
-    if(this._optIsCollection && this._delegate.get('layout').top){
-      layout.top=this._optframe.y-this._delegate.get('layout').top-pane.$()[0].offsetTop;
+    if(this._optIsCollection && delLayout.top){
+      layout.top=this._optframe.y-delLayout.top-paneElem.offsetTop;
     }else{
-      layout.top=this._optframe.y-pane.$()[0].offsetTop;  
+      layout.top=this._optframe.y-paneElem.offsetTop;  
     }
 
     this.set('layout', layout);
@@ -146,7 +161,6 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     
     SC.RunLoop.begin().end();
     
-    
     var del = this._delegate ;
 
     this._className = this.getDelegateProperty(del,"inlineEditorClassName");
@@ -158,15 +172,17 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     // this.resizeToFit(this.getFieldValue()) ;
 
     // allow notifications to go
-    this.endPropertyChanges() ;
+    
     
     // and become first responder
-    this.becomeFirstResponder() ;
-  
-    if(SC.browser.msie) this.invokeLater(this._selectRootElement, 200) ;
-    else this._selectRootElement();
-  
+    this._previousFirstResponder = pane ? pane.get('firstResponder') : null;
+   
+    this.endPropertyChanges() ;
+
     this.invokeDelegateMethod(del, 'inlineEditorDidBeginEditing', this) ;
+    //if(SC.browser.mozilla)this.invokeOnce(this.becomeFirstResponder) ;
+    this.invokeLast(this.becomeFirstResponder) ;
+
   },
   
   
@@ -230,7 +246,14 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
 
     // resign first responder if not done already.  This may call us in a 
     // loop but since isEditing is already NO, nothing will happen.
-    if (this.get('isFirstResponder')) this.resignFirstResponder();
+    if (this.get('isFirstResponder')) {
+      var pane = this.get('pane');
+      if (pane && this._previousFirstResponder) {
+        pane.makeFirstResponder(this._previousFirstResponder);
+      } else this.resignFirstResponder();
+    }
+    this._previousFirstResponder = null ; // clearout no matter what
+    
     if (this.get('parentNode')) this.removeFromParent() ;  
     
     return YES ;
@@ -283,7 +306,7 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   /** @private */
   keyDown: function(evt) {
     var ret = this.interpretKeyEvents(evt) ;
-    if(!ret) this.fieldValueDidChange(true);
+    this.fieldValueDidChange(true);
     return !ret ? NO : ret ;
   },
   
@@ -296,17 +319,22 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   // remove it from the DOM key events are no longer sent to the browser.
   /** @private */
   willRemoveFromParent: function() {
-    this.$('input')[0].blur();
+    this.$input()[0].blur();
   },
   
   // ask owner to end editing.
   /** @private */
   willLoseFirstResponder: function(responder) {
     if (responder !== this) return;
+
+    // if we're about to lose first responder for any reason other than
+    // ending editing, make sure we clear the previous first responder so 
+    // isn't cached
+    this._previousFirstResponder = null;
     
     // should have been covered by willRemoveFromParent, but this was needed 
     // too.
-    this.$('input')[0].blur();
+    this.$input()[0].blur();
     return this.blurEditor() ;
   },
 
@@ -334,6 +362,7 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   /** @private */
   insertNewline: function(evt) { 
     if (this._multiline) {
+      evt.allowDefault();
       return arguments.callee.base.call(this, evt) ;
     } else {
       // TODO : this is a work around. There is a bug where the 
@@ -354,8 +383,9 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   // editable, begins editing.
   /** @private */
   insertTab: function(evt) {
-    var next = this._delegate.nextValidKeyView();
+    this.resignFirstResponder();
     this.commitEditing() ;
+    var next = this._delegate.nextValidKeyView();
     if(next) next.beginEditing();
     return YES ;
   },
@@ -366,9 +396,20 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     this.commitEditing() ;
     if(prev) prev.beginEditing();
     return YES ;
+  },
+  
+  /** @private */
+  deleteForward: function(evt) {
+    evt.allowDefault();
+    return YES;
+  },
+  
+  /** @private */
+  deleteBackward: function(evt) {
+    evt.allowDefault();
+    return YES ;
   }
-
-
+  
 });
 
 
@@ -459,6 +500,14 @@ SC.InlineTextFieldView.mixin(
     if(s && s.length>0) styles = styles + "line-height: " + s + " !important; ";
     s=SC.getStyle(el,'text-align');
     if(s && s.length>0) styles = styles + "text-align: " + s + " !important; ";
+    s=SC.getStyle(el,'top-margin');
+    if(s && s.length>0) styles = styles + "top-margin: " + s + " !important; ";
+    s=SC.getStyle(el,'bottom-margin');
+    if(s && s.length>0) styles = styles + "bottom-margin: " + s + " !important; ";
+    s=SC.getStyle(el,'left-margin');
+    if(s && s.length>0) styles = styles + "left-margin: " + s + " !important; ";
+    s=SC.getStyle(el,'right-margin');
+    if(s && s.length>0) styles = styles + "right-margin: " + s + " !important; ";
     
     return styles;
   },

data/frameworks/sproutcore/frameworks/foundation/mixins/selection_support.js

@@ -62,6 +62,19 @@ SC.SelectionSupport = {
   */
   allowsEmptySelection: YES,
   
+  /**
+    Override to return the first selectable object.  For example, if you 
+    have groups or want to otherwise limit the kinds of objects that can be
+    selected.
+    
+    the default imeplementation returns firstObject property.
+    
+    @returns {Object} first selectable object
+  */
+  firstSelectableObject: function() {
+    return this.get('firstObject');
+  }.property(),
+  
   /**
     This is the current selection.  You can make this selection and another
     controller's selection work in concert by binding them together. You
@@ -70,44 +83,57 @@ SC.SelectionSupport = {
     @property {SC.SelectionSet}
   */
   selection: function(key, value) {
-    var content, empty;
-    
-    if (value !== undefined) {
-      
-      // are we even allowing selection at all?  Also, must be enumerable
-      if (this.get('allowsSelection') && value && value.isEnumerable) {
         
-        // ok, new decide if the *type* of selection is allowed...
-        switch (value.get('length')) {
-          
-          // check to see if we're attempting to set an empty array
-          // if that's not allowed, set to the first available item in 
-          // arrangedObjects
-          case 0:
-            empty   = this.get('allowsEmptySelection');
-            content = this.get('arrangedObjects');
-            if (empty && content && content.get('length')>0) {
-                value = SC.SelectionSet.create().add(content, 0).freeze();
-            } else value = null ;
-            break;
-            
-          // single items are always allows
-          case 1:
-            break;
+    var old = this._scsel_selection,
+        oldlen = old ? old.get('length') : 0,
+        content, empty, len;
 
-          // fall through for >= 2, only allow if configured for multi-select
-          default:
-            if (!this.get('allowsMultipleSelection')) value = null;
-            break;
-        }
-      } else value = null;
-      
-      // always make selection into something then save
-      if (!value) value = SC.SelectionSet.EMPTY;
-      this._scsel_selection = value;
-      
-    // read only mode
-    } else return this._scsel_selection ;
+    // whenever we have to recompute selection, reapply all the conditions to
+    // the selection.  This ensures that changing the conditions immediately
+    // updates the selection.
+    // 
+    // Note also if we don't allowSelection, we don't clear the old selection;
+    // we just don't allow it to be changed.
+    if ((value === undefined) || !this.get('allowsSelection')) value = old ;
+
+    len = (value && value.isEnumerable) ? value.get('length') : 0;
+    
+    // if we don't allow multiple selection
+    if ((len>1) && !this.get('allowsMultipleSelection')) {
+
+      if (oldlen>1) {
+        value = SC.SelectionSet.create()
+                  .addObject(old.get('firstObject')).freeze();
+        len   = 1;
+      } else {
+        value = old;
+        len = oldlen;
+      }
+    }
+    
+    // if we don't allow empty selection, block that also.  select first 
+    // selectable item if necessary.
+    if ((len===0) && !this.get('allowsEmptySelection')) {
+      if (oldlen===0) {
+        value = this.get('firstSelectableObject');
+        if (value) value = SC.SelectionSet.create().addObject(value).freeze();
+        else value = SC.SelectionSet.EMPTY;
+        len = value.get('length');
+        
+      } else {
+        value = old;
+        len = oldlen;
+      }
+    }
+    
+    // if value is empty or is not enumerable, then use empty set
+    if (len===0) value = SC.SelectionSet.EMPTY;
+    
+    // always use a frozen copy...
+    value = value.frozenCopy();
+    this._scsel_selection = value;
+    
+    return value;
     
   }.property('arrangedObjects', 'allowsEmptySelection', 
       'allowsMultipleSelection', 'allowsSelection').cacheable(),
@@ -205,28 +231,36 @@ SC.SelectionSupport = {
     
     var content = this.get('arrangedObjects'),
         sel     = this.get('selection'),
-        indexes, len, max, ret;
+        ret     = sel,
+        indexes, len, max;
 
-    if (!sel) sel = SC.SelectionSet.EMPTY;
-    
-    // if selection is not allowed, just force to be empty.
-    if (!this.get('allowsSelection') && sel.get('length')>0) {
-      ret = SC.SelectionSet.EMPTY;
-      
-      
-    // selection is allowed, make sure it is valid
-    } else {
-      
-      // remove from the sel any items selected beyond the length of the new
-      // arrangedObjects
-      indexes = content ? sel.indexSetForSource(content) : null;
-      len     = content ? content.get('length') : 0;
+    // first, make sure selection goes beyond current items...
+    if (ret && content && ret.get('sources').indexOf(content)>=0) {
+      indexes = ret.indexSetForSource(content);
+      len     = content.get('length') ;
       max     = indexes ? indexes.get('max') : 0;
-      if (max > len) ret = sel.copy().constrain(content).freeze();
       
+      // to clean this up, just copy the selection and remove the extra 
+      // indexes
+      if (max > len) {
+        ret = ret.copy().remove(content, len, max-len).freeze();
+        this.set('selection', ret);
+      }
     }
-  
-    if (ret) this.set('selection', ret);
+
+    // if we didn't have to recompute the selection anyway, do a quick check
+    // to make sure there are no constraints that need to be recomputed.
+    if (ret === sel) {
+      len = sel ? sel.get('length') : 0;
+      max = content ? content.get('length') : 0;
+      
+      // need to recompute if the selection is empty and it shouldn't be but
+      // only if we have some content; otherwise what's the point?
+      if ((len===0) && !this.get('allowsEmptySelection') && max>0) {
+        this.notifyPropertyChange('selection');
+      }
+    }
+
     return this ;
   }
     

data/frameworks/sproutcore/frameworks/foundation/mixins/static_layout.js

@@ -84,31 +84,6 @@ SC.StaticLayout = {
     context.setClass('sc-static-layout', this.get('useStaticLayout'));
   },
   
-  /**
-    Not available on views with static layout.  Calling this method will raise 
-    an exception.
-    
-    @function
-  */
-  convertFrameToView: null,
-
-  /**
-    Not available on views with static layout.  Calling this method will raise 
-    an exception.
-    
-    @function
-  */
-  convertFrameFromView: null,
-  
-  /**
-    Frame is not available on views with static layout.  This property will
-    always return null.
-    
-    @function
-  */
-  frame: null,
-  
-
   /**
     clippingFrame is not available on views with static layout.  This 
     property will always return null.

data/frameworks/sproutcore/frameworks/foundation/mixins/string.js

@@ -312,13 +312,31 @@ SC.String = {
   },
   
   /**
-    Removes any extra whitespace from the edges of the strings. This method is 
+    Removes any extra whitespace from the edges of the string. This method is 
     also aliased as strip().
     
     @returns {String} the trimmed string
   */
   trim: function () {
     return this.replace(/^\s+|\s+$/g,"");
+  },
+  
+  /**
+    Removes any extra whitespace from the left edge of the string.
+    
+    @returns {String} the trimmed string
+  */
+  trimLeft: function () {
+    return this.replace(/^\s+/g,"");
+  },
+  
+  /**
+    Removes any extra whitespace from the right edge of the string.
+    
+    @returns {String} the trimmed string
+  */
+  trimRight: function () {
+    return this.replace(/\s+$/g,"");
   }
     
 };
@@ -327,7 +345,10 @@ SC.String = {
 SC.String.strip = SC.String.trim; // convenience alias.
 
 // Apply SC.String mixin to built-in String object
-SC.mixin(String.prototype, SC.String) ;
+SC.supplement(String.prototype, SC.String) ;
+
+/** @private */
+String.prototype.loc = SC.String.loc; // Two places define it, and we want the version at SC.String.loc
 
 /** @private */
 SC.String.fmt = String.prototype.fmt; // copy from runtime

data/frameworks/sproutcore/frameworks/foundation/panes/pane.js

@@ -112,12 +112,6 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
   */
   currentWindowSize: null,
   
-  /** @private 
-  
-    @property {SC.Pane}
-  */
-  previousKeyPane: null,
-  
   /** 
     The parent dimensions are always the last known window size. 
     
@@ -378,12 +372,6 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
   didBecomeKeyPaneFrom: function(pane) {
     var isKeyPane = this.get('isKeyPane');
     this.set('isKeyPane', YES);
-    // check if the previousKeyPane is a menu. If it is a menu, don't set as 
-    // a previous keypane, set the previousKeyPane to the keypane before
-    // the menu as it is an the menu is an intermediate pane that you dont want to go back to.
-    if(pane && pane.kindOf(SC.MenuPane)) this.set('previousKeyPane', pane.get('previousKeyPane'));
-    else if(pane) this.set('previousKeyPane', pane);
-    else this.set('previousKeyPane', null);
     this._forwardKeyChange(!isKeyPane, 'didBecomeKeyResponderFrom', pane, YES);
     return this ;
   },
@@ -473,16 +461,14 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     if (dom.parentNode) dom.parentNode.removeChild(dom) ;
     dom = null ;
     
-    // remove from the RootResponder also
-    var responder = this.rootResponder ;
-    if (this.get('isKeyPane')) { // orders matter, remove keyPane first
-      var oldKeyPane = this.get('previousKeyPane');
-      if (!oldKeyPane) responder.makeKeyPane(null) ; 
-      else responder.makeKeyPane(oldKeyPane) ;
-    }
-    if (this.get('isMainPane')) responder.makeMainPane(null) ;
-    responder.panes.remove(this) ;
-    this.rootResponder = responder = null ;
+    // resign keyPane status, if we had it
+    this.resignKeyPane();
+    
+    // remove the pane
+    var rootResponder = this.rootResponder ;
+    if (this.get('isMainPane')) rootResponder.makeMainPane(null) ;
+    rootResponder.panes.remove(this) ;
+    this.rootResponder = null ;
     
     // clean up some of my own properties 
     this.set('isPaneAttached', NO) ;
@@ -503,6 +489,11 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
   appendTo: function(elem) {
     var layer = this.get('layer');
     if (!layer) layer =this.createLayer().get('layer'); 
+    
+    if (this.get('isPaneAttached') && (layer.parentNode === elem)) {
+      return this; // nothing to do
+    }
+    
     elem.insertBefore(layer, null); // add to DOM
     elem = layer = null ;
 
@@ -516,8 +507,15 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     @returns {SC.Pane} receiver
   */
   prependTo: function(elem) {
+    if (this.get('isPaneAttached')) return this;
+    
     var layer = this.get('layer');
     if (!layer) layer =this.createLayer().get('layer'); 
+    
+    if (this.get('isPaneAttached') && (layer.parentNode === elem)) {
+      return this; // nothing to do
+    }
+    
     elem.insertBefore(layer, elem.firstChild); // add to DOM
     elem = layer = null ;
 
@@ -532,10 +530,17 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     @returns {SC.Pane} receiver
   */
   before: function(elem) {
+    if (this.get('isPaneAttached')) return this;
+    
     var layer = this.get('layer');
     if (!layer) layer =this.createLayer().get('layer');
     
     var parent = elem.parentNode ; 
+
+    if (this.get('isPaneAttached') && (layer.parentNode === parent)) {
+      return this; // nothing to do
+    }
+    
     parent.insertBefore(layer, elem); // add to DOM
     parent = elem = layer = null ;
 
@@ -550,11 +555,17 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     @returns {SC.Pane} receiver
   */
   after: function(elem) {
+    
     var layer = this.get('layer');
     if (!layer) layer =this.createLayer().get('layer'); 
     
     var parent = elem.parentNode ;
-    elem.insertBefore(layer, elem.nextSibling); // add to DOM
+  
+    if (this.get('isPaneAttached') && (layer.parentNode === parent)) {
+      return this; // nothing to do
+    }
+    
+    parent.insertBefore(layer, elem.nextSibling); // add to DOM
     parent = elem = layer = null ;
 
     return this.paneDidAttach(); // do the rest of the setup

data/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js

@@ -209,11 +209,31 @@ SC.TreeItemObserver = SC.Object.extend(SC.Array, SC.CollectionContent, {
     range you replace must lie entirely within the same parent item, otherwise
     this will raise an exception.
     
+    h3. The Operation Parameter
+    
     Note that this replace method accepts an additional parameter "operation"
     which is used when you try to insert an item on a boundary between 
     branches whether it should be inserted at the end of the previous group
     after the group.  If you don't pass operation, the default is 
     SC.DROP_BEFORE, which is the expected behavior.
+    
+    Even if the operation is SC.DROP_AFTER, you should still pass the actual
+    index where you expect the item to be inserted.  For example, if you want
+    to insert AFTER the last index of an 3-item array, you would still call:
+    
+    {{{
+      observer.replace(3, 0, [object1 .. objectN], SC.DROP_AFTER)
+    }}}
+    
+    The operation is simply used to disambiguate whether the insertion is
+    intended to be AFTER the previous item or BEFORE the items you are
+    replacing.
+    
+    @param {Number} start the starting index
+    @param {Number} amt the number of items to replace
+    @param {SC.Array} objects array of objects to insert
+    @param {Number} operation either SC.DROP_BEFORE or SC.DROP_AFTER
+    @returns {SC.TreeItemObserver} receiver
   */
   replace: function(start, amt, objects, operation) {