sproutcore 1.0.1003 → 1.0.1008

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

@@ -95,6 +95,8 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     accessory view wider, with empty space on the left.
   */
   rightAccessoryView: null,
+  
+  _isFocused: NO,
 
 
   /** isEditable maps to isEnabled with a TextField. */
@@ -115,12 +117,14 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   */
   selection: function(key, value) {
     var element = this.$input().get(0) ;
+    var range, start, end;
 
     // Are we being asked to set the value, or return the current value?
     if (value === undefined) {
       // The client is retrieving the value.
       if (element) {
-        var start = null, end = null ;
+        start = null;
+        end = null;
 
         if (!element.value) {
           start = end = 0 ;
@@ -140,7 +144,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
             if (selection) {
               var type = selection.type ;
               if (type  &&  (type === 'None'  ||  type === 'Text')) {
-                var range = selection.createRange() ;
+                range = selection.createRange() ;
 
                 if (!this.get('isTextArea')) {
                   // Input tag support.  Figure out the starting position by
@@ -194,8 +198,8 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
 
         // Support Internet Explorer.
         if (!setStart  ||  !setEnd) {
-         var range = element.createTextRange() ;
-         var start = value.get('start') ;
+         range = element.createTextRange() ;
+         start = value.get('start') ;
          range.move('character', start) ;
          range.moveEnd('character', value.get('end') - start) ;
          range.select() ;
@@ -334,15 +338,29 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (rightAdjustment) rightAdjustment += 'px' ;
 
     this._renderField(context, firstTime, v, leftAdjustment, rightAdjustment) ;
+    if(SC.browser.mozilla) this.invokeLast(this._applyFirefoxCursorFix);
   },
 
+
+  /**
+    If isTextArea is changed (this might happen in inlineeditor constantly)
+    force the field render to render like the firsttime to avoid writing extra
+    code. This can be useful also 
+  */
+  _forceRenderFirstTime: NO,
+    
+  _renderFieldLikeFirstTime: function(){
+    this.set('_forceRenderFirstTime', YES);
+  }.observes('isTextArea'),
+  
   _renderField: function(context, firstTime, value, leftAdjustment, rightAdjustment) {
     // TODO:  The cleanest thing might be to create a sub- rendering context
     //        here, but currently SC.RenderContext will render sibling
     //        contexts as parent/child.
     var hint = this.get('hint') ;
     
-    if (firstTime) {
+    if (firstTime || this._forceRenderFirstTime) {
+      this._forceRenderFirstTime = NO;
       var disabled = this.get('isEnabled') ? '' : 'disabled="disabled"' ;
       var name = SC.guidFor(this) ;
       
@@ -364,7 +382,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
       
       // Render the input/textarea field itself, and close off the padding.
       if (this.get('isTextArea')) {
-        context.push('<textarea name="%@" %@ value="%@"></textarea></span>'.fmt(name, disabled, value)) ;
+        context.push('<textarea name="%@" %@>%@</textarea></span>'.fmt(name, disabled, value)) ;
       }
       else {
         var type = this.get('isPassword') ? 'password' : 'text' ;
@@ -415,9 +433,11 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
         // Firefox needs a bit of help to recalculate the width of the text
         // field, if it has focus.  (Even though it's set to 100% of its
         // parent, if we adjust the parent it doesn't always adjust in kind.)
-        if (SC.browser.mozilla) {
-          element.style.width = paddingElement.clientWidth + "px";
-        }
+        // if (SC.browser.mozilla) {
+        //           if(paddingElement.clientWidth>0){
+        //             element.style.width = paddingElement.clientWidth + "px";
+        //           }
+        //         }
       }
     }
   },
@@ -465,6 +485,12 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     // our key/mouse down/up handlers (such as the user choosing Select All
     // from a menu).
     SC.Event.add(input, 'select', this, this._textField_selectionDidChange);
+    
+    if(SC.browser.mozilla){
+      // cache references to layer items to improve firefox hack perf
+       this._cacheInputElement = this.$input();
+       this._cachePaddingElement = this.$('.padding');
+    }
   },
 
   willDestroyLayer: function() {
@@ -487,48 +513,61 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     this.fieldDidBlur();
     SC.RunLoop.end();
   },
-
+  
   fieldDidFocus: function(evt) {
-    if (!this._isFocused) {
-      this._isFocused = YES ;
-      this.beginEditing();
-    }
+    this.beginEditing();
   },
-
+  
   fieldDidBlur: function() {
-    //if (this._isFocused) {
-      this._isFocused = NO ;
-      this.commitEditing();
-    //}
+    this.commitEditing();
   },
 
+  /**
+    Move magic number out so it can be over-written later in inline editor
+  */
+  _topOffsetForFirefoxCursorFix: 3,
+
   _applyFirefoxCursorFix: function() {
-    this._applyTimer = null; // clear
-    if (this._hasFirefoxCursorFix) return this;
+    // Be extremely careful changing this code.  !!!!!!!! 
+    // Contact me if you need to change or improve the code. After several 
+    // iterations the new way to apply the fix seems to be the most 
+    // consistent.
+    // This fixes: selection visibility, cursor visibility, and the ability 
+    // to fix the cursor at any position. As of FF 3.5.3 mozilla hasn't fixed this 
+    // bug, even though related bugs that I've found on their database appear
+    // as fixed.  
+    // 
+    // Juan Pinzon
+    
     if (SC.browser.mozilla) {
-      this._hasFirefoxCursorFix = YES ;
-
-      var element = this.$input();
-      var layer = element[0];
-      var p = SC.$(layer).offset() ;
-      var top    = p.top,
-          left   = p.left,
-          width  = layer.offsetWidth,
-          height = layer.offsetHeight ;
-
-      var style = 'position: fixed; top: %@px; left: %@px; width: %@px; height: %@px;'.fmt(top, left, width, height) ;
-      element.attr('style', style) ;
+      var top, left, width, height, p, layer, element, textfield;
+      
+      // I'm caching in didCreateLayer this elements to improve perf
+      element = this._cacheInputElement;
+      textfield = this._cachePaddingElement;
+      if(textfield && textfield[0]){
+        layer = textfield[0];
+        p = SC.$(layer).offset() ;
+      
+        // this is to take into account an styling issue.
+        if(element[0].tagName.toLowerCase()==="input") {
+          top = p.top+this._topOffsetForFirefoxCursorFix; 
+        }
+        else top = p.top;
+        left = p.left;
+        width = layer.offsetWidth;
+        height = layer.offsetHeight ;
+      
+        var style = 'position: fixed; top: %@px; left: %@px; width: %@px; height: %@px;'.fmt(top, left, width, height) ;
+        // if the style is the same don't re-apply
+        if(!this._prevStyle || this._prevStyle!=style) element.attr('style', style) ;
+        this._prevStyle = style;
+      }
     }
     return this ;
   },
-
-  _removeFirefoxCursorFix: function() {
-    if (!this._hasFirefoxCursorFix) return this;
-    this._hasFirefoxCursorFix = NO ;
-    if (SC.browser.mozilla) this.$input().attr('style', '') ;
-    return this ;
-  },
-
+  
+  
   _textField_selectionDidChange: function() {
     this.notifyPropertyChange('selection');
   },
@@ -544,21 +583,20 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   // hide the hint text.
   /** @private */
   willBecomeKeyResponderFrom: function(keyView) {
-    // focus the text field.
-    if (!this._isFocused) {
-      this._isFocused = YES ;
-      this.becomeFirstResponder();
-      if (this.get('isVisibleInWindow')) {
-        this.$input()[0].focus();
-        this._applyFirefoxCursorFix();
-
-        if(!this._txtFieldMouseDown){
-          if(!SC.browser.safari) this.invokeOnce(this._selectRootElement) ;
-          else this.invokeLater(this._selectRootElement, 1) ;
-        }
+    if(this.get('isVisibleInWindow')) {
+      this.$input()[0].focus();
+      
+      if(!this._txtFieldMouseDown){
+        if(SC.browser.mozilla) this.invokeOnce(this._selectRootElement) ;
+        else if(SC.browser.safari) this.invokeLater(this._selectRootElement, 1) ; 
+        else this._selectRootElement();
       }
     }
   },
+  
+  willLoseKeyResponderTo: function(responder) {
+    //if (this._isFocused) this._isFocused = NO ;
+  },
 
   // In IE, you can't modify functions on DOM elements so we need to wrap the
   // call to select() like this.
@@ -570,44 +608,39 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   // the hint text if needed.
   /** @private */
   didLoseKeyResponderTo: function(keyView) {
-    if (this._isFocused) {
-      this._isFocused = NO ;
-      this.$input()[0].blur() ;
-    } else {
-      this.fieldValueDidChange() ;
-    }
-    if(this._hasFirefoxCursorFix) this._removeFirefoxCursorFix();
+    this.$input()[0].blur() ;
   },
 
   parentViewDidResize: function() {
-    if (SC.browser.mozilla && this.get('isFirstResponder')) {
-      this._removeFirefoxCursorFix();
-      if (this._applyTimer) this._applyTimer.invalidate();
-      this._applyTimer = this.invokeLater(this._applyFirefoxCursorFix, 250);
+    if (SC.browser.mozilla) {
+      this.invokeLast(this._applyFirefoxCursorFix);
     }
-
     sc_super();
   },
 
-  _isFocused: false,
 
   /** @private
     Simply allow keyDown & keyUp to pass through to the default web browser
     implementation.
   */
   keyDown: function(evt) {
-
     // handle return and escape.  this way they can be passed on to the
     // responder chain.
     if ((evt.which === 13) && !this.get('isTextArea')) return NO ;
     if (evt.which === 27) return NO ;
 
     // handle tab key
-    if (evt.which === 9 && !this.get('isMultiline')) {
+    if (evt.which === 9 && !this.get('isTextArea')) {
       var view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
       view.becomeFirstResponder();
       return YES ; // handled
     }
+    
+    // handle delete key, set dontForceDeleteKey to allow the default behavior
+    // of the delete key.
+    if (evt.which === 8){
+      evt.dontForceDeleteKey=YES;
+    }
 
     // validate keyDown...
     if (this.performValidateKeyDown(evt)) {
@@ -621,6 +654,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
   },
 
   keyUp: function(evt) {
+    
     // The caret/selection could have moved.  In some browsers, though, the
     // element's values won't be updated until after this event is finished
     // processing.
@@ -640,7 +674,13 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (!this.get('isEnabled')) {
       evt.stop();
       return YES;
-    } else return sc_super();
+    } else if((this.value && this.value.length===0) || !this.value) {
+      return YES;
+    } else {
+      // This fixes the double click issue in firefox
+      if(SC.browser.mozilla) this.$input()[0].focus();
+      return sc_super();
+    }
   },
 
   mouseUp: function(evt) {
@@ -653,6 +693,9 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (!this.get('isEnabled')) {
       evt.stop();
       return YES;
+    } else if((this.value && this.value.length===0) || !this.value) {
+      this.$input()[0].focus();
+      return YES;
     } else return sc_super();
   },
 

data/frameworks/sproutcore/frameworks/foundation/views/view.js

@@ -482,9 +482,37 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     this.set('layerLocationNeedsUpdate', YES) ;
     this.invokeOnce(this.updateLayerLocationIfNeeded) ;
     
+    // We also need to iterate down through the view hierarchy and invalidate
+    // all our child view's caches for 'pane', since it could have changed.
+    //
+    // Note:  In theory we could try to avoid this invalidation if we
+    //        do this only in cases where we "know" the 'pane' value might
+    //        have changed, but those cases are few and far between.
+    
+    this._invalidatePaneCacheForSelfAndAllChildViews();
+    
     return this ;
   }.observes('isVisible'),
   
+  /** @private
+    We want to cache the 'pane' property, but it's impossible for us to
+    declare a dependence on all properties that can affect the value.  (For
+    example, if our grandparent gets attached to a new pane, our pane will
+    have changed.)  So when there's the potential for the pane changing, we
+    need to invalidate the caches for all our child views, and their child
+    views, and so on.
+  */
+  _invalidatePaneCacheForSelfAndAllChildViews: function () {
+    this.notifyPropertyChange('pane');
+    
+    var childViews = this.get('childViews');
+    var len = childViews.length ;
+    for (var idx=0; idx<len; ++idx) {
+      var childView = childViews[idx];
+      if (childView._invalidatePaneCacheForSelfAndAllChildViews) childView._invalidatePaneCacheForSelfAndAllChildViews();
+    }
+  },
+  
   // ..........................................................
   // LAYER SUPPORT
   // 
@@ -599,7 +627,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       while(q.length!==0){
         node=q[0];
         q.shift();
-        if(node.id==layerId){
+        if(node.id===layerId){
           found=true;
           elem=node;
           break;
@@ -1142,7 +1170,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     @returns {Object} object that handled event, if any
   */
   interpretKeyEvents: function(event) {
-    var codes = event.commandCodes(), cmd = codes[0], chr = codes[1];
+    var codes = event.commandCodes(), cmd = codes[0], chr = codes[1], ret;
 
     if (!cmd && !chr) return null ;  //nothing to do.
 
@@ -1162,7 +1190,8 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       // if we haven't returned yet and there is plain text, then do an insert 
       // of the text.  Since this is not an action, do not send it up the 
       // responder chain.
-     return this.insertText(chr);
+      ret = this.insertText(chr, event);
+      return ret ? (ret===YES ? this : ret) : null ; // map YES|NO => this|nil
     }
 
     return null ; //nothing to do.
@@ -1175,7 +1204,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     @returns {Object} receiver or object that handled event
   */
   insertText: function(chr) {
-    return this ;
+    return NO ;
   },
     
   /**
@@ -1320,8 +1349,10 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       SC.View.views[this.get('layerId')] = this ;
     }
     
+    var childViews = this.get('childViews');
+    
     // setup child views.  be sure to clone the child views array first
-    this.childViews = this.childViews ? this.childViews.slice() : [] ;
+    this.childViews = childViews ? childViews.slice() : [] ;
     this.createChildViews() ; // setup child Views
     
     // register display property observers ..
@@ -1598,6 +1629,10 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
   convertFrameToView: function(frame, targetView) {
     var myX=0, myY=0, targetX=0, targetY=0, view = this, f ;
     
+    if (this.get('useStaticLayout')) {
+      throw "convertFrameToView is not available with static layout";
+    }
+    
     // walk up this side
     while (view) {
       f = view.get('frame'); myX += f.x; myY += f.y ;
@@ -1640,6 +1675,10 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
   convertFrameFromView: function(frame, targetView) {
     var myX=0, myY=0, targetX=0, targetY=0, view = this, next, f ;
     
+    if (this.get('useStaticLayout')) {
+      throw "convertFrameToView is not available with static layout";
+    }
+    
     // walk up this side
     while (view) {
       f = view.get('frame'); myX += f.x; myY += f.y ;
@@ -1661,6 +1700,26 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     return { x: myX, y: myY, width: frame.width, height: frame.height } ;
   },
   
+  /**
+    Attempt to scroll the view to visible.  This will walk up the parent
+    view hierarchy looking looking for a scrollable view.  It will then 
+    call scrollToVisible() on it.
+    
+    Returns YES if an actual scroll took place, no otherwise.
+    
+    @returns {Boolean} 
+  */
+  scrollToVisible: function() {
+    var pv = this.get('parentView');
+    while(pv && !pv.get('isScrollable')) pv = pv.get('parentView');
+    
+    // found view, first make it scroll itself visible then scroll this.
+    if (pv) {
+      pv.scrollToVisible();
+      return pv.scrollToVisible(this);
+    } else return NO ;
+  },
+  
   /**
     Frame describes the current bounding rect for your view.  This is always
     measured from the top-left corner of the parent view.
@@ -1670,7 +1729,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
   */
   frame: function() {
     return this.computeFrameWithParentFrame(null) ;
-  }.property('layout').cacheable(),
+  }.property('layout', 'useStaticLayout').cacheable(),
   
   /**
     Computes what the frame of this view would be if the parent were resized
@@ -1708,6 +1767,8 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       throw error ;
     }
     
+    if (stLayout) return null; // can't compute
+    
     // handle left aligned and left/right 
     if (!SC.none(layout.left)) {
       f.x = Math.floor(layout.left) ;

data/frameworks/sproutcore/frameworks/runtime/core.js

@@ -86,7 +86,6 @@ SC.mixin = function() {
     if (!(options = arguments[idx])) continue ;
     for(var key in options) {
       if (!options.hasOwnProperty(key)) continue ;
-      var src = target[key];
       var copy = options[key] ;
       if (target===copy) continue ; // prevent never-ending loop
       if (copy !== undefined) target[key] = copy ;
@@ -96,6 +95,45 @@ SC.mixin = function() {
   return target;
 } ;
 
+/**
+  Adds properties to a target object.  Unlike SC.mixin, however, if the target
+  already has a value for a property, it will not be overwritten.
+  
+  Takes the root object and adds the attributes for any additional 
+  arguments passed.
+
+  @param target {Object} the target object to extend
+  @param properties {Object} one or more objects with properties to copy.
+  @returns {Object} the target object.
+  @static
+*/
+SC.supplement = function() {
+  // copy reference to target object
+  var target = arguments[0] || {};
+  var idx = 1;
+  var length = arguments.length ;
+  var options ;
+
+  // Handle case where we have only one item...extend SC
+  if (length === 1) {
+    target = this || {};
+    idx=0;
+  }
+
+  for ( ; idx < length; idx++ ) {
+    if (!(options = arguments[idx])) continue ;
+    for(var key in options) {
+      if (!options.hasOwnProperty(key)) continue ;
+      var src = target[key] ;
+      var copy = options[key] ;
+      if (target===copy) continue ; // prevent never-ending loop
+      if (copy !== undefined  &&  src === undefined) target[key] = copy ;
+    }
+  }
+  
+  return target;
+} ;
+
 /** 
   Alternative to mixin.  Provided for compatibility with jQuery.
   @function 
@@ -178,13 +216,24 @@ SC.mixin(/** @scope SC */ {
     from JSLint complaining about use of ==, which can be technically 
     confusing.
     
-    @object {Object} obj value to test
+    @param {Object} obj value to test
     @returns {Boolean}
   */
   none: function(obj) {
     return obj===null || obj===undefined;  
   },
 
+  /**
+    Verifies that a value is either null or an empty string.  Return false if
+    the object is not a string.
+    
+    @param {Object} obj value to test
+    @returns {Boolean}
+  */
+  empty: function(obj) {
+    return obj===null || obj===undefined || obj==='';
+  },
+  
   /**
     Returns YES if the passed object is an array or array-like. Instances
     of the NodeList class return NO.

data/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -1122,7 +1122,10 @@ SC.Observable = {
       if (seenRevisions[key] != currentRevision) {
         // yes, check the value with the last seen value
         var value = this.get(key) ;
-        if (seenValues[key] !== value) ret = true ; // did change!
+        if (seenValues[key] !== value) {
+          ret = true ; // did change!
+          seenValues[key] = value;
+        }
       }
       seenRevisions[key] = currentRevision;
     }

data/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -928,7 +928,8 @@ SC.Binding = {
 
     var to = this._toRoot ? "<%@>:%@".fmt(this._toRoot,this._toPropertyPath) : this._toPropertyPath;
     
-    return "SC.Binding%@(%@ -> %@)".fmt(SC.guidFor(this), from, to) ;
+    var oneWay = this._oneWay ? '[oneWay]' : '';
+    return "SC.Binding%@(%@ -> %@)%@".fmt(SC.guidFor(this), from, to, oneWay);
   }  
 } ;
 

data/frameworks/sproutcore/frameworks/runtime/system/enumerator.js

@@ -58,8 +58,8 @@ SC.Enumerator.prototype = {
   reset: function() {
     var e = this.enumerable ;
     if (!e) throw SC.$error("Enumerator has been destroyed");
-    
-    var len = this._length = (e.get) ? e.get('length') : e.length ;
+    this._length = e.get ? e.get('length') : e.length ;
+    var len = this._length;
     this._index = 0;
     this._previousObject = null ;
     this._context = (len > 0) ? SC.Enumerator._popContext() : null;
@@ -94,12 +94,13 @@ SC.Enumerator.create = function(enumerableObject) {
 // objects.
 
 SC.Enumerator._popContext = function() {
-  var ret = (this._contextCache) ? this._contextCache.pop() : null ;
+  var ret = this._contextCache ? this._contextCache.pop() : null ;
   return ret || {} ;
 } ;
 
 SC.Enumerator._pushContext = function(context) {
-  var cache = this._contextCache = this._contextCache || [] ;
+  this._contextCache = this._contextCache || [] ;
+  var cache = this._contextCache;
   cache.push(context);
   return null ;
 }; 

data/frameworks/sproutcore/frameworks/runtime/system/index_set.js

@@ -439,6 +439,9 @@ SC.IndexSet = SC.mixin({},
       }
     } else if (length === null) length = 1 ;
 
+    // if no length - do nothing.
+    if (length <= 0) return this;
+    
     // special case - appending to end of set
     var max     = this.get('max'),
         oldmax  = max,
@@ -513,7 +516,7 @@ SC.IndexSet = SC.mixin({},
       } else {
         start = cur ;
         if (next > max) {
-          delta -= next - max ;
+          // delta -= next - max ;
           max = next ;
         }
       }
@@ -599,6 +602,8 @@ SC.IndexSet = SC.mixin({},
       }
     }
 
+    if (length <= 0) return this; // nothing to do
+    
     // special case - appending to end of set
     var max     = this.get('max'),
         oldmax  = max,