sproutcore 1.5.0-java → 1.6.0.beta.2-java

data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js

@@ -113,6 +113,14 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   */
   allowsMultipleSelection: NO,
 
+  /**
+    If YES, it will set the segment value even if an action is defined.
+
+    @type Boolean
+    @default NO
+  */
+  selectSegmentWhenTriggeringAction: NO,
+
   /**
     @type Boolean
     @default YES
@@ -954,8 +962,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       if (resp) resp.sendAction(action, target, this, this.get('pane'));
     }
 
-    // Only set value if there is no action and a value is defined.
-    if(!action && val !== undefined) {
+    if(val !== undefined && (!action || this.get('selectSegmentWhenTriggeringAction'))) {
       this.set('value', value);
     }
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js

@@ -759,7 +759,7 @@ SC.SelectView = SC.ButtonView.extend(
       return YES;
     }
     else {
-      arguments.callee.base.apply(this,arguments);
+      return sc_super();
     }
   },
 
@@ -776,7 +776,7 @@ SC.SelectView = SC.ButtonView.extend(
         this.resignFirstResponder() ;
       }
     }
-    return arguments.callee.base.apply(this,arguments);
+    return sc_super();
   },
   
   /** @private

data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js

@@ -284,7 +284,12 @@ SC.SelectFieldView = SC.FieldView.extend(
   _valueKeyObserver: function() {
     this.set('cpDidChange', YES);
   }.observes('valueKey'),
-   
+
+  /** @private */
+  _isEnabledObserver: function() {
+    this.set('cpDidChange', YES);
+  }.observes('isEnabled'),
+
   // .......................................
   // PRIVATE
   //

data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js

@@ -19,7 +19,7 @@
 
   This class is most useful when placed inside a ScrollView.
 
-  To use it, simply set the @content@ property to a string of the HTML you
+  To use it, simply set the `content` property to a string of the HTML you
   would like to display.
 
   @extends SC.View

data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile

@@ -1,5 +1,7 @@
 config :designer, :required => [:runtime, :foundation, :desktop]
 
+config :forms, :required => :desktop
+
 config :greenhouse,
   :required => [:sproutcore, :designer, :statechart],
   :theme => :ace,

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/coders/object.js

@@ -8,21 +8,21 @@
 
 /**
 
-  Generic base class to encode a view hierarchy.  ViewCoders are used to 
+  Generic base class to encode a view hierarchy.  `ViewCoder`s are used to
   collect the properties that may be included in a view design and then to 
   serialize that design to a JavaScript string that can be evaled.  
   
-  To encode a view with a ViewCoder, simply call SC.ViewCoder.encode(view).
+  To encode a view with a `ViewCoder`, simply call `SC.ViewCoder.encode(view)`.
   Most of the time, however, you will not initiate coding directly but instead
-  work with the coder while designing an SC.DesignerView subclass.
+  work with the coder while designing an `SC.DesignerView` subclass.
 
-  h2. Using a Coder
+  ## Using a Coder
 
   When you are passed an instance of a coder, you can simply write attributes
   into the coder using one of the many encoding methods defined on the view.
   Encoding methods are defined for most primitive view types.
   
-    coder.string("firstName" , "Charles").string('lastName', 'Jolley');
+      coder.string("firstName" , "Charles").string('lastName', 'Jolley');
   
   @extends SC.Object
 */
@@ -32,7 +32,7 @@ SC.ObjectCoder = SC.Object.extend({
   // PROPERTIES
   // 
   
-  /** The className used to emit the design. */
+  /** The `className` used to emit the design. */
   className: 'SC.Object',
   
   /** 
@@ -130,7 +130,7 @@ SC.ObjectCoder = SC.Object.extend({
   },
   
   /**
-    Encodes a bool, mapped as YES or NO
+    Encodes a bool, mapped as `YES` or `NO`
     
     @param key {String} the key to set
     @param val {Boolean} the value
@@ -146,8 +146,8 @@ SC.ObjectCoder = SC.Object.extend({
     on object members before processing to allow you to normalize.  The 
     method signature must be:
     
-      function convert(value, rootObject, key);
-      
+        function convert(value, rootObject, key);
+
     The rootObject and key will be set to give you the context in the 
     hierarchy.
     
@@ -202,7 +202,7 @@ SC.ObjectCoder = SC.Object.extend({
     Encodes a hash of objects.  The object values must be simple objects for
     this method to work.  You can also optionally pass a processing function
     that will be invoked for each value, giving you a chance to convert the
-    value first.  The signature must be (key, value, rootObject).
+    value first.  The signature must be `(key, value, rootObject)`.
     
     @param key {String} the key to set
     @param val {Object} the value
@@ -230,7 +230,7 @@ SC.ObjectCoder = SC.Object.extend({
     Encodes a array of objects.  The object values must be simple objects for
     this method to work.  You can also optionally pass a processing function
     that will be invoked for each value, giving you a chance to convert the
-    value first.  The signature must be (index, value, rootObject).
+    value first.  The signature must be `(index, value, rootObject)`.
     
     @param key {String} the key to set
     @param val {Object} the value
@@ -304,7 +304,7 @@ SC.ObjectCoder = SC.Object.extend({
   
   /**
     Begins encoding with a particular object, setting the className to the 
-    object's className.  This is used internally by the encode() method.
+    object's `className`.  This is used internally by the `encode()` method.
   */
   begin: function(object) {
     var methodName = this.get('encodeMethodName');

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/controllers/designs.js

@@ -68,10 +68,10 @@ SC.designsController = SC.ArrayController.create(SC.CollectionViewDelegate,
     general which operations you might support and specifically the operations
     you would support if the user dropped an item over a specific location.
     
-    If the proposedDropOperation parameter is SC.DROP_ON or SC.DROP_BEFORE, 
-    then the proposedInsertionPoint will be a non-negative value and you 
-    should determine the specific operations you will support if the user 
-    dropped the drag item at that point.
+    If the `proposedDropOperation` parameter is `SC.DROP_ON` or
+    `SC.DROP_BEFORE`, then the `proposedInsertionPoint` will be a
+    non-negative value and you should determine the specific operations you
+    will support if the user dropped the drag item at that point.
     
     If you do not like the proposed drop operation or insertion point, you 
     can override these properties as well by setting the proposedDropOperation
@@ -99,12 +99,12 @@ SC.designsController = SC.ArrayController.create(SC.CollectionViewDelegate,
   
   /**
     Called by the collection view to actually accept a drop.  This method will
-    only be invoked AFTER your validateDrop method has been called to
+    only be invoked *AFTER* your `validateDrop` method has been called to
     determine if you want to even allow the drag operation to go through.
     
     You should actually make changes to the data model if needed here and
     then return the actual drag operation that was performed.  If you return
-    SC.DRAG_NONE and the dragOperation was SC.DRAG_REORDER, then the default
+    SC.DRAG_NONE and the dragOperation was `SC.DRAG_REORDER`, then the default
     reorder behavior will be provided by the collection view.
     
     @param view {SC.CollectionView}

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/controllers/page_files.js

@@ -11,7 +11,7 @@
 
 /** @class
 
-  in suppressMain mode all page files register with this array controller
+  in `suppressMain` mode all page files register with this array controller
 
   @extends SC.Object
 */

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/css/css_style_sheet.js

@@ -10,8 +10,8 @@ sc_require('css/css_rule') ;
 /**
   @class SC.CSSStyleSheet
 
-  A style sheet object wraps a document style sheet object. SC.CSSStyleSheet will
-  re-use stylesheet objects as needed.
+  A style sheet object wraps a document style sheet object. `C.CSSStyleSheet`
+  will re-use stylesheet objects as needed.
   
   @extends SC.Object
 */
@@ -57,7 +57,7 @@ SC.CSSStyleSheet = SC.Object.extend(
   isEnabledBindingDefault: SC.Binding.bool(),
   
   /**
-    DO NOT MODIFY THIS OBJECT DIRECTLY!!!! Use the methods defined on this
+    **DO NOT MODIFY THIS OBJECT DIRECTLY!!!!** Use the methods defined on this
     object to update properties of the style sheet; otherwise, your changes 
     will not be reflected.
     
@@ -137,14 +137,12 @@ SC.mixin(SC.CSSStyleSheet,
 /** SC.CSSStyleSheet */{
   
   /**
-    Find a stylesheet object by name or href. If by name, .css will be 
+    Find a stylesheet object by name or href. If by name, `.css` will be
     appended automatically.
     
-    {{{
-      var ss = SC.CSSStyleSheet.find('style.css') ;
-      var ss2 = SC.CSSStyleSheet.find('style') ; // same thing
-      sc_assert(ss === ss2) ; // SC.CSSStyleSheet objects are stable
-    }}}
+        var ss = SC.CSSStyleSheet.find('style.css') ;
+        var ss2 = SC.CSSStyleSheet.find('style') ; // same thing
+        sc_assert(ss === ss2) ; // SC.CSSStyleSheet objects are stable
     
     @param {String} nameOrUrl a stylsheet name or href to find
     @returns {SC.CSSStyleSheet} null if not found

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/designers/object_designer.js

@@ -8,10 +8,10 @@
 /*global SC */
 
 /** @class
-  This is a basic designer used for all SC.Objects that are created in design
-  mode.
+  This is a basic designer used for all `SC.Object`s that are created in
+  design mode.
   
-  FIXME: have SC.ViewDesigner subclass this designer.....
+  FIXME: have `SC.ViewDesigner` subclass this designer.....
 
   @extends SC.Object
   @since SproutCore 1.0
@@ -25,10 +25,10 @@ SC.ObjectDesigner = SC.Object.extend(
   /** The class for the design.  Set when the object is created. */
   objectClass: null,
   
-  /** Set to YES if the object is currently selected for editing. */
+  /** Set to `YES` if the object is currently selected for editing. */
   designIsSelected: NO,
 
-  /** Set to YES if this particular designer should not be enabled. */
+  /** Set to `YES` if this particular designer should not be enabled. */
   designIsEnabled: YES,
   
   /**
@@ -84,7 +84,7 @@ SC.ObjectDesigner = SC.Object.extend(
     Array of properties that can be encoded directly.  This is an easy way to
     add support for simple properties that need to be written to the design
     without added code.  These properties will be encoded by 
-    encodeDesignProperties().
+    `encodeDesignProperties()`.
     
     You can add to this array in your subclasses.
   */
@@ -126,8 +126,8 @@ SC.ObjectDesigner = SC.Object.extend(
   
   /** 
     Invoked by a design coder to encode design properties.  The default 
-    implementation invoked encodeDesignProperties() and 
-    encodeChildViewsDesign().  You can override this method with your own 
+    implementation invoked `encodeDesignProperties()` and
+    `encodeChildViewsDesign()`.  You can override this method with your own
     additional encoding if you like.
   */
   encodeDesign: function(coder) {
@@ -150,7 +150,7 @@ SC.ObjectDesigner = SC.Object.extend(
     Array of localized that can be encoded directly.  This is an easy way to
     add support for simple properties that need to be written to the 
     localization without added code.  These properties will be encoded by 
-    encodeLocalizedProperties().
+    `encodeLocalizedProperties()`.
     
     You can add to this array in your subclasses.
   */
@@ -158,8 +158,8 @@ SC.ObjectDesigner = SC.Object.extend(
   
   /** 
     Invoked by a localization coder to encode design properties.  The default 
-    implementation invoked encodeLocalizedProperties() and 
-    encodeChildViewsLoc().  You can override this method with your own 
+    implementation invoked `encodeLocalizedProperties()` and
+    `encodeChildViewsLoc()`.  You can override this method with your own
     additional encoding if you like.
   */
   encodeLoc: function(coder) {
@@ -187,7 +187,7 @@ SC.ObjectDesigner = SC.Object.extend(
   awakeDesign: function() {},
   
   /**
-    The unknownProperty handler will pass through to the object by default. 
+    The `unknownProperty` handler will pass through to the object by default.
     This will often provide you the support you need without needing to 
     customize the Designer.  Just make sure you don't define a conflicting
     property name on the designer itself!
@@ -295,4 +295,4 @@ SC.ObjectDesigner.mixin({
     }
   }
   
-});
+});

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/designers/view_designer.js

@@ -11,9 +11,9 @@ sc_require('views/high_light');
 /** @class
 
   A Designer class provides the core editing functionality you need to edit
-  a view in the UI.  When your app loads in design.mode, a peer Designer 
+  a view in the UI.  When your app loads in `design.mode`, a peer Designer
   instance is created for every view using the class method Designer or
-  SC.ViewDesigner if the view class does not define a Designer class.
+  `SC.ViewDesigner` if the view class does not define a Designer class.
   
   Whenever you put your app into design mode, all events will be routed first
   to the peer designer for an object, which will have an opportunity to 
@@ -22,12 +22,12 @@ sc_require('views/high_light');
   Likewise, the designer palettes provided by the view builder will focus on 
   the designer instead of the view itself.
   
-  h2. Designer UI
+  ## Designer UI
   
   The basic ViewDesigner class automatically handles the UI interaction for
   layout.  You can also double click on the view to perform a default action.
   
-  For views with isContainerView set to YES, double clicking on the view will
+  For views with `isContainerView` set to `YES`, double clicking on the view will
   automatically "focus" the view.  This allows you to select the view's 
   children instead of the view itself.
 
@@ -73,8 +73,8 @@ SC.ViewDesigner = SC.Object.extend(
     If set to NO, the default childView encoding will not run.  You can use
     this option, for example, if your view creates its own childViews.
     
-    Alternatively, you can override the encodeChildViewsDesign() and 
-    encodeChildViewsLoc() methods.
+    Alternatively, you can override the `encodeChildViewsDesign()` and
+    `encodeChildViewsLoc()` methods.
     
     @property {Boolean}
   */
@@ -88,12 +88,12 @@ SC.ViewDesigner = SC.Object.extend(
   // 
   
   /**
-    Set to NO to hide horizontal resize handles
+    Set to `NO` to hide horizontal resize handles
   */
   canResizeHorizontal: YES,
   
   /**
-    Set to NO to resize vertical handles
+    Set to `NO` to resize vertical handles
   */
   canResizeVertical: YES,
   
@@ -113,12 +113,12 @@ SC.ViewDesigner = SC.Object.extend(
   minHeight: 10,
   
   /**
-    Determines maximum allowed width.  null means no limit
+    Determines maximum allowed width.  `null` means no limit
   */
   maxWidth: 100000000,
   
   /**
-    Determines maximum allowed height.  null means no limit
+    Determines maximum allowed height.  `null` means no limit
   */
   maxHeight: 100000000,
   
@@ -142,11 +142,11 @@ SC.ViewDesigner = SC.Object.extend(
     The current anchor location.  This determines which of the other dimension 
     metrics are actually used to compute the layout.  The value may be one of:
     
-     TOP_LEFT, TOP_CENTER, TOP_RIGHT, TOP_HEIGHT,
-     CENTER_LEFT, CENTER_CENTER, CENTER_RIGHT, CENTER_HEIGHT
-     BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT, BOTTOM_HEIGHT,
-     WIDTH_LEFT, WIDTH_CENTER, WIDTH_RIGHT, WIDTH_HEIGHT,
-     null
+       TOP_LEFT, TOP_CENTER, TOP_RIGHT, TOP_HEIGHT,
+       CENTER_LEFT, CENTER_CENTER, CENTER_RIGHT, CENTER_HEIGHT
+       BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT, BOTTOM_HEIGHT,
+       WIDTH_LEFT, WIDTH_CENTER, WIDTH_RIGHT, WIDTH_HEIGHT,
+       null
   
     @property
     @type {Number}
@@ -237,21 +237,21 @@ SC.ViewDesigner = SC.Object.extend(
   },
   
   /**
-    Returns the top offset of the current layout or null if not defined
+    Returns the top offset of the current layout or `null` if not defined
   */
   layoutTop: function(key, value) {
     return this._layoutProperty('top', value);
   }.property('layout').cacheable(),
 
   /**
-    Returns the bottom offset of the current layout or null if not defined
+    Returns the bottom offset of the current layout or `null` if not defined
   */
   layoutBottom: function(key, value) {
     return this._layoutProperty('bottom', value);
   }.property('layout').cacheable(),
 
   /**
-    Returns the centerY offset of the current layout or null if not defined
+    Returns the centerY offset of the current layout or `null` if not defined
   */
   layoutCenterY: function(key, value) {
     return this._layoutProperty('centerY', value);
@@ -265,35 +265,35 @@ SC.ViewDesigner = SC.Object.extend(
   }.property('layout').cacheable(),
 
   /**
-    Returns the top offset of the current layout or null if not defined
+    Returns the top offset of the current layout or `null` if not defined
   */
   layoutTop: function(key, value) {
     return this._layoutProperty('top', value);
   }.property('layout').cacheable(),
 
   /**
-    Returns the left offset of the current layout or null if not defined
+    Returns the left offset of the current layout or `null` if not defined
   */
   layoutLeft: function(key, value) {
     return this._layoutProperty('left', value);
   }.property('layout').cacheable(),
   
   /**
-    Returns the right offset of the current layout or null if not defined
+    Returns the right offset of the current layout or `null` if not defined
   */
   layoutRight: function(key, value) {
     return this._layoutProperty('right', value);
   }.property('layout').cacheable(),
   
   /**
-    Returns the centerX offset of the current layout or null if not defined
+    Returns the centerX offset of the current layout or `null` if not defined
   */
   layoutCenterX: function(key, value) {
     return this._layoutProperty('centerX', value);
   }.property('layout').cacheable(),
   
   /**
-    Returns the width offset of the current layout or null if not defined
+    Returns the width offset of the current layout or `null` if not defined
   */
   layoutWidth: function(key, value) {
     return this._layoutProperty('width', value);
@@ -311,8 +311,8 @@ SC.ViewDesigner = SC.Object.extend(
 
   /**
     Encodes any simple properties that can just be copied from the view onto
-    the coder.  This is used by encodeDesignProperties() and 
-    encodeLocalizedProperties().
+    the coder.  This is used by `encodeDesignProperties()` and
+    `encodeLocalizedProperties()`.
   */
   encodeSimpleProperties: function(props, coder) {    
     var view = this.get('view'), proto = this.get('viewClass').prototype ;
@@ -336,7 +336,7 @@ SC.ViewDesigner = SC.Object.extend(
     Array of properties that can be encoded directly.  This is an easy way to
     add support for simple properties that need to be written to the design
     without added code.  These properties will be encoded by 
-    encodeDesignProperties().
+    `encodeDesignProperties()`.
     
     You can add to this array in your subclasses.
   */
@@ -380,8 +380,8 @@ SC.ViewDesigner = SC.Object.extend(
   
   /** 
     Invoked by a design coder to encode design properties.  The default 
-    implementation invoked encodeDesignProperties() and 
-    encodeChildViewsDesign().  You can override this method with your own 
+    implementation invoked `encodeDesignProperties()` and
+    `encodeChildViewsDesign()`.  You can override this method with your own
     additional encoding if you like.
   */
   encodeDesign: function(coder) {
@@ -434,7 +434,7 @@ SC.ViewDesigner = SC.Object.extend(
     Array of localized that can be encoded directly.  This is an easy way to
     add support for simple properties that need to be written to the 
     localization without added code.  These properties will be encoded by 
-    encodeLocalizedProperties().
+    `encodeLocalizedProperties()`.
     
     You can add to this array in your subclasses.
   */
@@ -442,8 +442,8 @@ SC.ViewDesigner = SC.Object.extend(
   
   /** 
     Invoked by a localization coder to encode design properties.  The default 
-    implementation invoked encodeLocalizedProperties() and 
-    encodeChildViewsLoc().  You can override this method with your own 
+    implementation invoked `encodeLocalizedProperties()` and
+    `encodeChildViewsLoc()`.  You can override this method with your own
     additional encoding if you like.
   */
   encodeLoc: function(coder) {
@@ -535,7 +535,7 @@ SC.ViewDesigner = SC.Object.extend(
   },
   
   /**
-    The unknownProperty handler will pass through to the view by default. 
+    The `unknownProperty` handler will pass through to the view by default. 
     This will often provide you the support you need without needing to 
     customize the Designer.  Just make sure you don't define a conflicting
     property name on the designer itself!
@@ -638,7 +638,7 @@ SC.ViewDesigner = SC.Object.extend(
   }.property(),
   
   /**
-    set this property to YES if you want your designer to become Root
+    set this property to `YES` if you want your designer to become Root
   */
   acceptRootDesigner: NO,
   
@@ -691,7 +691,7 @@ SC.ViewDesigner = SC.Object.extend(
   HANDLE_MARGIN: 10,
   
   /**
-    Select on mouseDown.  If metaKey or shiftKey is pressed, add to
+    Select on `mouseDown`.  If `metaKey` or `shiftKey` is pressed, add to
     selection.  Otherwise just save starting info for dragging
   */
   mouseDown: function(evt) {
@@ -859,7 +859,7 @@ SC.ViewDesigner = SC.Object.extend(
   },
   
   /**
-    On mouseUp potentially change selection and cleanup.
+    On `mouseUp` potentially change selection and cleanup.
   */
   mouseUp: function(evt) {
     if (!this.get('designIsEnabled') || !this.get('parentDesignerIsRoot')) return NO ;
@@ -900,7 +900,7 @@ SC.ViewDesigner = SC.Object.extend(
   },
   
   /**
-    Called by designerController to reposition the view
+    Called by `designerController` to reposition the view
   */
   mouseReposition: function(evt, info) {
     var layout = SC.copy(this.get('layout'));
@@ -1074,7 +1074,7 @@ SC.ViewDesigner = SC.Object.extend(
   
   /**
     This method is called whenever the drag image is moved.  This is
-    similar to the dragUpdated() method called on drop targets.
+    similar to the `dragUpdated()` method called on drop targets.
 
     @param {SC.Drag} drag The Drag instance managing this drag.