sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/foundation/delegates/inline_text_field.js

@@ -6,7 +6,7 @@
 
 /**
   @namespace
-  
+
   This is the default InlineEditorDelegate for SC.LabelView. The default editor
   is an SC.InlineTextFieldView.
 
@@ -16,7 +16,7 @@
   acquire if the active editor could not be discarded.
 
   Each time an editor is required, it instantiates it and appends it to the same
-  pane as the view being edited. The editor is responsible for positioning
+  parentView as the view being edited. The editor is responsible for positioning
   itself correctly in its beginEditing method.
 
   @since SproutCore 1.0
@@ -35,8 +35,8 @@ SC.InlineTextFieldDelegate = /** @scope SC.InlineTextFieldDelegate */{
     and if that fails attempting to dismiss. If that fails, the acquire fails
     and returns null.
 
-    Otherwise, it creates the editor as a child of the client view's pane and
-    returns it.
+    Otherwise, it creates the editor as a child of the client view's parentView
+    and returns it.
 
     The default editor is an SC.InlineTextFieldView. The client view may
     customize this by setting a different inlineEditor as its exampleEditor
@@ -45,13 +45,13 @@ SC.InlineTextFieldDelegate = /** @scope SC.InlineTextFieldDelegate */{
     @param {SC.InlineEditable} label the label that is requesting an editor
     @returns {SC.InlineEditor} the editor the label should use to edit
   */
-  acquireEditor: function(label) {
+  acquireEditor: function (label) {
     var editor = this.editor;
 
-    if(editor) {
+    if (editor) {
       // attempt to end editing on the previous editor and return null if unable
       // to end editing successfully
-      if(editor.get('isEditing') && !editor.commitEditing() && !editor.discardEditing()) return null;
+      if (editor.get('isEditing') && !editor.commitEditing() && !editor.discardEditing()) return null;
 
       // now release it
       this.releaseEditor(editor);
@@ -59,14 +59,14 @@ SC.InlineTextFieldDelegate = /** @scope SC.InlineTextFieldDelegate */{
 
     // default to SC.InlineTextFieldView
     var exampleEditor = label.exampleEditor ? label.exampleEditor : SC.InlineTextFieldView,
-    pane = label.get('pane');
+    parentView = label.get('parentView');
 
     // set ourself as the delegate for the editor
-    editor = this.editor = pane.createChildView(exampleEditor, {
+    editor = this.editor = parentView.createChildView(exampleEditor, {
       inlineEditorDelegate: this
     });
 
-    pane.appendChild(editor);
+    parentView.appendChild(editor);
 
     return editor;
   },
@@ -79,7 +79,7 @@ SC.InlineTextFieldDelegate = /** @scope SC.InlineTextFieldDelegate */{
     @params {SC.InlineEditor} editor the editor that should be cleaned up
     @returns {Boolean} whether the cleanup succeeded
   */
-  releaseEditor: function(editor) {
+  releaseEditor: function (editor) {
     editor.removeFromParent();
 
     this.editor = null;

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js

@@ -81,37 +81,37 @@ SC.AutoResize = {
     Determines if the view's height should be resized
     on calculation. Default is NO to retain backwards
     compatibility.
-    
+
     @type Boolean
     @default NO
   */
   shouldResizeHeight: NO,
-  
+
   /**
-    The measured size of the view's content (the value of the autoResizeField). 
+    The measured size of the view's content (the value of the autoResizeField).
     This property is observable, and, if used in conjunction with setting
     shouldAutoResize to NO, allows you to customize the 'sizing' part, using
     SC.AutoResize purely for its measuring code.
-    
+
     @type Rect
   */
   measuredSize: { width: 0, height: 0 },
-  
+
   /**
     If provided, will limit the maximum width to this value.
   */
   maxWidth: null,
-  
+
   /**
     If provided, will limit the maximum height to this value.
   */
   maxHeight: null,
-  
+
   /**
     If YES, the view's text will be resized to fit the view. This is applied _after_ any
     resizing, so will only take affect if shouldAutoResize is off, or a maximum width/height
     is set.
-    
+
     You also must set a minimum and maximum font size. Any auto resizing will happen at the
     maximum size, and then the text will be resized as necessary.
   */
@@ -125,28 +125,28 @@ SC.AutoResize = {
     @default NO
   */
   autoFitDiscreteFontSizes: NO,
-  
+
   /**
     The minimum font size to use when automatically fitting text. If shouldAutoFitText is set,
     this _must_ be supplied.
-    
+
     Font size is in pixels.
   */
   minFontSize: 12,
-  
+
   /**
     The maximum font size to use when automatically fitting text. If shouldAutoFitText is set,
     this _must_ be supplied.
-    
+
     Font size is in pixels.
   */
   maxFontSize: 20,
-  
+
   /**
     If shouldAutoFitText is YES, this is the calculated font size.
   */
   calculatedFontSize: 20,
-  
+
   fontPropertyDidChange: function() {
     if(this.get('shouldAutoFitText')) this.invokeLast(this.fitTextToFrame);
   }.observes('shouldAutoFitText', 'minFontSize', 'maxFontSize', 'measuredSize'),
@@ -178,6 +178,7 @@ SC.AutoResize = {
           calculatedWidth = maxWidth;
         }
         this.set('calculatedWidth', calculatedWidth);
+
         this.adjust('width', calculatedWidth);
       }
 
@@ -190,7 +191,7 @@ SC.AutoResize = {
       }
     }
 
-  }.observes('shouldAutoResize', 'measuredSize', 'autoResizePadding', 'maxWidth', 'minWidth', 'shouldResizeWidth', 'shouldResizeHeight'),
+  }.observes('shouldAutoResize', 'measuredSize', 'autoResizePadding', 'maxWidth', 'maxHeight', 'shouldResizeWidth', 'shouldResizeHeight'),
 
   /**
     @private
@@ -199,7 +200,7 @@ SC.AutoResize = {
   initMixin: function() {
     // @if (debug)
     if (!this.get('supportsAutoResize')) {
-      throw "View `%@` does not support automatic resize. See documentation for SC.AutoResize".fmt(this);
+      throw new Error("View `%@` does not support automatic resize. See documentation for SC.AutoResize".fmt(this));
     }
     // @endif
   },
@@ -294,12 +295,12 @@ SC.AutoResize = {
 
     return metrics;
   },
-  
-  
+
+
   //
   // FITTING TEXT
   //
-  
+
   /**
     If we are fitting text, the layer must be measured with its font size set to our
     maximum font size.
@@ -311,7 +312,7 @@ SC.AutoResize = {
       layer.style.fontSize = maxFontSize + "px";
     }
   },
-  
+
   /**
     Whenever the view resizes, the text fitting must be reevaluated.
   */
@@ -320,11 +321,11 @@ SC.AutoResize = {
 
     this.fontPropertyDidChange();
   }.enhance(),
-  
+
   /**
     Fits the text into the frame's size, minus autoResizePadding.
   */
-  fitTextToFrame: function() {      
+  fitTextToFrame: function() {
     // we can only fit text when we have a layer.
     var layer = this.get('autoResizeLayer');
     if (!layer) return;
@@ -334,11 +335,11 @@ SC.AutoResize = {
 
     // if the font size has been adjusted, reset it to the max
     this.prepareLayerForStringMeasurement(layer);
-    
+
     var frame = this.get('frame'),
-    
+
         padding = this.get('autoResizePadding') || 0,
-        
+
         // these need to be shrunk by 1 pixel or text that is exactly as wide as
         // the frame will be truncated
         width = frame.width - 1, height = frame.height - 1,
@@ -353,7 +354,7 @@ SC.AutoResize = {
       width -= padding.width;
       height -= padding.height;
     }
-        
+
     // measured size is at maximum. If there is no resizing to be done, short-circuit.
     if (mWidth <= width && mHeight <= height) return;
 
@@ -370,16 +371,16 @@ SC.AutoResize = {
       // pick the smaller. We'll multiply that by the maximum font size to figure out
       // a rough guestimate of the proper font size.
       var xProportion = width / mWidth, yProportion = height / mHeight,
-      
+
           guestimate = Math.floor(maxFontSize * Math.min(xProportion, yProportion)),
           actual,
-          
+
           classNames = this.get('classNames'),
           ignoreEscape = !this.get('escapeHTML'),
           value = this.get('autoResizeText'),
-          
+
           metrics;
-      
+
 
       guestimate = actual = Math.min(maxFontSize, Math.max(minFontSize, guestimate));
 
@@ -389,22 +390,22 @@ SC.AutoResize = {
       metrics = SC.metricsForString(value, layer, classNames, ignoreEscape);
 
       if (metrics.width > width || metrics.height > height) {
-        
+
         // if we're larger, we must go down until we are smaller, at which point we are done.
         for (guestimate = guestimate - 1; guestimate >= minFontSize; guestimate--) {
           layer.style.fontSize = guestimate + "px";
           metrics = SC.metricsForString(value, layer, classNames, ignoreEscape);
-          
+
           // always have an actual in this case; even if we can't get it small enough, we want
           // to keep this as close as possible.
           actual = guestimate;
-          
+
           // if the new size is small enough, stop shrinking and set it for real
           if (metrics.width <= width && metrics.height <= height) {
             break;
           }
         }
-        
+
       } else if (metrics.width < width || metrics.height < height) {
         // if we're smaller, we must go up until we hit maxFontSize or get larger. If we get
         // larger, we want to use the previous guestimate (which we know was valid)
@@ -413,13 +414,13 @@ SC.AutoResize = {
         for (guestimate = guestimate + 1; guestimate <= maxFontSize; guestimate++) {
           layer.style.fontSize = guestimate + "px";
           metrics = SC.metricsForString(value, layer, classNames, ignoreEscape);
-          
+
           // we update actual only if it is still valid. Then below, whether valid
           // or not, if we are at or past the width/height we leave
           if (metrics.width <= width && metrics.height <= height) {
             actual = guestimate;
           }
-          
+
           // we put this in a separate if statement JUST IN CASE it is ===.
           // Unlikely, but possible, and why ruin a good thing?
           if (metrics.width >= width || metrics.height >= height){
@@ -428,19 +429,19 @@ SC.AutoResize = {
         }
       }
     }
-    
+
     layer.style.fontSize = actual + "px";
     this.set('calculatedFontSize', actual);
   },
-  
+
   /**
     Extends renderSettingsToContext to add font size if shouldAutoFitText is YES.
   */
   applyAttributesToContext: function(orig, context) {
     orig(context);
-    
+
     if (this.get('shouldAutoFitText')) {
-      context.css('font-size', this.get('calculatedFontSize') + "px");
+      context.setStyle('font-size', this.get('calculatedFontSize') + "px");
     }
   }.enhance(),
 
@@ -452,7 +453,28 @@ SC.AutoResize = {
     orig();
 
     this.scheduleMeasurement();
+  }.enhance(),
+
+  /** @private
+    If the view has a transitionIn property, we have to delay the transition
+    setup and execution until after we measure.  In order to prevent a brief
+    flash of the view, we ensure it is hidden while it is being measured and
+    adjusted.
+
+    TODO: consider making the measurement state a formal SC.View state
+  */
+  _transitionIn: function (original) {
+    // In order to allow views to measure and adjust themselves on append, we
+    // can't transition until after the measurement is done.
+    var preTransitionOpacity = this.get('layout').opacity || 1;
+
+    this.adjust('opacity', 0);
+    this.invokeNext(function () {
+      this.adjust('opacity', preTransitionOpacity);
+      original();
+    });
   }.enhance()
+
 };
 
 /**
@@ -534,7 +556,7 @@ SC.AutoResizeManager = {
             //
             // It is expected that all views in a batch will have the same font settings.
             view.prepareLayerForStringMeasurement(layer);
-            
+
             // now we can tell SC to prepare the layer with the settings from the view's layer
             SC.prepareStringMeasurement(layer, view.get('classNames'));
             prepared = YES;

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js

@@ -7,7 +7,7 @@
 
 if(SC.Button) {
   SC.Button.initMixin = function(){
-    throw "SC.Button is deprecated as a mixin and is now a subclass of SC.TemplateView. Subclass SC.ButtonView instead.";
+    throw new Error("SC.Button is deprecated as a mixin and is now a subclass of SC.TemplateView. Subclass SC.ButtonView instead.");
   };
 }
 

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/collection_content.js

@@ -7,7 +7,7 @@
 
 /**
   Used for contentIndexDisclosureState().  Indicates open branch node.
-  
+
   @type Number
   @constant
 */
@@ -15,7 +15,7 @@ SC.BRANCH_OPEN = 0x0011;
 
 /**
   Used for contentIndexDisclosureState().  Indicates closed branch node.
-  
+
   @type Number
   @constant
 */
@@ -23,7 +23,7 @@ SC.BRANCH_CLOSED = 0x0012;
 
 /**
   Used for contentIndexDisclosureState().  Indicates leaf node.
-  
+
   @type Number
   @constant
 */
@@ -35,10 +35,10 @@ SC.LEAF_NODE = 0x0020;
   This mixin provides standard methods used by a CollectionView to provide
   additional meta-data about content in a collection view such as selection
   or enabled state.
-  
+
   You can apply this mixin to a class that you set as a delegate or to the
   object you set as content.
-  
+
   @since SproutCore 1.0
 */
 SC.CollectionContent = {
@@ -49,132 +49,131 @@ SC.CollectionContent = {
     @type Boolean
   */
   isCollectionContent: YES,
-  
+
   /**
-    Return YES if the content index should be selected.  Default behavior 
+    Return YES if the content index should be selected.  Default behavior
     looks at the selection property on the view.
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {Boolean} YES, NO, or SC.MIXED_STATE
   */
-  contentIndexIsSelected: function(view, content, idx) {
-    var sel = view.get('selection');
+  contentIndexIsSelected: function(collection, content, idx) {
+    var sel = collection.get('selection');
     return sel ? sel.contains(content, idx) : NO ;
   },
-  
+
   /**
     Returns YES if the content index should be enabled.  Default looks at the
     isEnabled state of the collection view.
-    looks at the selection property on the view.
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {Boolean} YES, NO, or SC.MIXED_STATE
   */
-  contentIndexIsEnabled: function(view, content, idx) {
-    return view.get('isEnabled');
+  contentIndexIsEnabled: function(collection, content, idx) {
+    return collection.get('isEnabled');
   },
-  
+
   // ..........................................................
   // GROUPING
-  // 
-  
+  //
+
   /**
     Optionally return an index set containing the indexes that may be group
-    views.  For each group view, the delegate will actually be asked to 
+    views.  For each group view, the delegate will actually be asked to
     confirm the view is a group using the contentIndexIsGroup() method.
-    
+
     If grouping is not enabled, return null.
-    
-    @param {SC.CollectionView} view the calling view
+
+    @param {SC.CollectionView} collection the calling view
     @param {SC.Array} content the content object
-    @return {SC.IndexSet} 
+    @return {SC.IndexSet}
   */
-  contentGroupIndexes: function(view, content) {
+  contentGroupIndexes: function(collection, content) {
     return null;
   },
-  
+
   /**
     Returns YES if the item at the specified content index should be rendered
     using the groupExampleView instead of the regular exampleView.  Note that
-    a group view is different from a branch/leaf view.  Group views often 
+    a group view is different from a branch/leaf view.  Group views often
     appear with different layout and a different look and feel.
 
     Default always returns NO.
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {Boolean} YES, NO, or SC.MIXED_STATE
   */
-  contentIndexIsGroup: function(view, content, idx) {
+  contentIndexIsGroup: function(collection, content, idx) {
     return NO ;
   },
-  
+
   // ..........................................................
   // OUTLINE VIEWS
-  // 
-  
+  //
+
   /**
-    Returns the outline level for the item at the specified index.  Can be 
+    Returns the outline level for the item at the specified index.  Can be
     used to display hierarchical lists.
-    
+
     Default always returns -1 (no outline).
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {Boolean} YES, NO, or SC.MIXED_STATE
   */
-  contentIndexOutlineLevel: function(view, content, idx) {
+  contentIndexOutlineLevel: function(collection, content, idx) {
     return -1;
   },
-  
+
   /**
     Returns a constant indicating the disclosure state of the item.  Must be
     one of SC.BRANCH_OPEN, SC.BRANCH_CLOSED, SC.LEAF_NODE.  If you return one
-    of the BRANCH options then the item may be rendered with a disclosure 
-    triangle open or closed.  If you return SC.LEAF_NODe then the item will 
-    be rendered as a leaf node.  
+    of the BRANCH options then the item may be rendered with a disclosure
+    triangle open or closed.  If you return SC.LEAF_NODe then the item will
+    be rendered as a leaf node.
 
     Default returns SC.LEAF_NODE.
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {Boolean} YES, NO, or SC.MIXED_STATE
   */
-  contentIndexDisclosureState: function(view, content, idx) {
-    return SC.LEAF_NODE;    
+  contentIndexDisclosureState: function(collection, content, idx) {
+    return SC.LEAF_NODE;
   },
-  
+
   /**
-    Called to expand a content index item if it is currently in a closed 
+    Called to expand a content index item if it is currently in a closed
     disclosure state.  The default implementation does nothing.
-    
-    @param {SC.CollectionView} view the collection view
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {void}
   */
-  contentIndexExpand: function(view, content, idx) {
-    SC.Logger.log('contentIndexExpand(%@, %@, %@)'.fmt(view,content,idx));
+  contentIndexExpand: function(collection, content, idx) {
+    SC.Logger.log('contentIndexExpand(%@, %@, %@)'.fmt(collection, content, idx));
   },
-  
+
   /**
-    Called to collapse a content index item if it is currently in an open 
-    disclosure state.  The default implementation does nothing.  
-    
-    @param {SC.CollectionView} view the collection view
+    Called to collapse a content index item if it is currently in an open
+    disclosure state.  The default implementation does nothing.
+
+    @param {SC.CollectionView} collection the collection view
     @param {SC.Array} content the content object
     @param {Number} idx the content index
     @returns {void}
   */
-  contentIndexCollapse: function(view, content, idx) {
-    SC.Logger.log('contentIndexCollapse(%@, %@, %@)'.fmt(view,content,idx));
+  contentIndexCollapse: function(collection, content, idx) {
+    SC.Logger.log('contentIndexCollapse(%@, %@, %@)'.fmt(collection, content, idx));
   }
-    
+
 };