sproutcore 1.6.0.rc.2-java → 1.6.0.1-java

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js

@@ -8,54 +8,6 @@
 SC.DateTime.mixin(
 /** @scope SC.DateTime */ {
 
-  /**
-    The localized day names. Add the key `_SC.DateTime.dayNames` and its
-    value to your `strings.js` file to add support for another language than
-    English.
-
-    Default is evaluated on the `document.ready` event.
-
-    @type Array
-    @default '_SC.DateTime.dayNames'.loc().w()
-  */
-  dayNames: null,
-
-  /**
-    The localized abbreviated day names. Add the key
-    `_SC.DateTime.abbreviatedDayNames` and its value to your `strings.js`
-    file to add support for another language than English.
-
-    Default is evaluated on the `document.ready` event.
-
-    @type Array
-    @default '_SC.DateTime.abbreviatedDayNames'.loc().w()
-  */
-  abbreviatedDayNames: null,
-
-  /**
-    The localized month names. Add the key `_SC.DateTime.monthNames` and its
-    value to your `strings.js` file to add support for another language than
-    English.
-
-    Default is evaluated on the `document.ready` event.
-
-    @type Array
-    @default '_SC.DateTime.monthNames'.loc().w()
-  */
-  monthNames: null,
-
-  /**
-    The localized abbreviated month names. Add the key
-    `_SC.DateTime.abbreviatedMonthNames` and its value to your `strings.js`
-    file to add support for another language than English.
-
-    Default is evaluated on the `document.ready` event.
-
-    @type Array
-    @default '_SC.DateTime.abbreviatedMonthNames'.loc().w()
-  */
-  abbreviatedMonthNames: null,
-
   /**
     @private
 
@@ -65,21 +17,10 @@ SC.DateTime.mixin(
     we need to wait for the ready event to actually evaluate the localizations.
   */
   _setup: function() {
-    if (!SC.DateTime.dayNames) {
-      SC.DateTime.dayNames = SC.String.w(SC.String.loc('_SC.DateTime.dayNames'));
-    }
-
-    if (!SC.DateTime.abbreviatedDayNames) {
-      SC.DateTime.abbreviatedDayNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedDayNames'));
-    }
-
-    if (!SC.DateTime.monthNames) {
-      SC.DateTime.monthNames = SC.String.w(SC.String.loc('_SC.DateTime.monthNames'));
-    }
-
-    if (!SC.DateTime.abbreviatedMonthNames) {
-      SC.DateTime.abbreviatedMonthNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedMonthNames'));
-    }
+    SC.DateTime.dayNames = SC.String.w(SC.String.loc('_SC.DateTime.dayNames'));
+    SC.DateTime.abbreviatedDayNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedDayNames'));
+    SC.DateTime.monthNames = SC.String.w(SC.String.loc('_SC.DateTime.monthNames'));
+    SC.DateTime.abbreviatedMonthNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedMonthNames'));
   }
 
 });

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/border.js

@@ -15,7 +15,7 @@ SC.BORDER_NONE   = null ;
 
 /**
   @namespace
-  @deprecated
+  @deprecated Border functionality is now included in SC.View.
 
   The `SC.Border` mixin has be deprecated in favour of applying border properties
   to an `SC.View`'s layout object. See {@link SC.View#layout}.

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/scrollable.js

@@ -8,7 +8,7 @@
 
 /**
   @namespace
-  @deprecated
+  @deprecated Use SC.ScrollView instead.
 
   Any views you implement that are scrollable should include this mixin to
   provide basic support for scrolling actions.  You can also override any 

data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js

@@ -386,17 +386,15 @@ SC.AlertPane = SC.PanelPane.extend(
     if (del && del.alertPaneDidDismiss) {
       del.alertPaneDidDismiss(this, sender.get('actionKey'));
     }
-    else if(action = (sender && sender.get('customAction'))) {
-      if(SC.typeOf(action)===SC.T_FUNCTION) {
+
+    if (action = (sender && sender.get('customAction'))) {
+      if (SC.typeOf(action) === SC.T_FUNCTION) {
         action.call(action);
-      }
-      else if(target = sender.get('target')) {
-        target.tryToPerform(action);
-      }
-      else {
+      } else {
         rootResponder = this.getPath('pane.rootResponder');
         if(rootResponder) {
-          rootResponder.sendAction(action, del, this);
+          target = sender.get('target');
+          rootResponder.sendAction(action, target || del, this, this, null, this);
         }
       }
     }
@@ -446,6 +444,7 @@ SC.AlertPane.mixin(
     if(buttons) {
       buttons.forEach(function(button) {
         idx++;
+        if(!button) return;
         buttonView = pane.get('button%@'.fmt(idx));
         
         title = button.title;

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -604,11 +604,28 @@ SC.MenuPane = SC.PickerPane.extend(
     This computed property parses `displayItems` and constructs an
     `SC.MenuItemView` (or whatever class you have set as the `exampleView`) for every item.
 
+    This calls createMenuItemViews. If you want to override this property, override
+    that method.
+
+    This calls createMenuItemViews. If you want to override this property, override
+    that method.
+
     @property
     @type Array
     @readOnly
   */
   menuItemViews: function() {
+    return this.createMenuItemViews();
+  }.property('displayItems').cacheable(),
+
+  /**
+    Processes the displayItems and creates menu item views for each item.
+
+    Override this method to change how menuItemViews is calculated.
+
+    @return Array
+  */
+  createMenuItemViews: function() {
     var views = [], items = this.get('displayItems'),
         exampleView = this.get('exampleView'), item, view,
         height, heightKey, separatorKey, defaultHeight, separatorHeight,
@@ -663,7 +680,7 @@ SC.MenuPane = SC.PickerPane.extend(
 
     this.set('menuHeight', menuHeight+menuHeightPadding);
     return views;
-  }.property('displayItems').cacheable(),
+  },
 
   /**
     Returns the menu item view for the content object at the specified index.

data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js

@@ -164,6 +164,15 @@ SC.PanelPane = SC.Pane.extend(
     }
     return ret ;
   },
+
+  destroy: function() {
+    var modal = this.get('modalPane');
+    if (modal && !modal.isClass) {
+      modal.destroy();
+    }
+
+    sc_super();
+  },
   
   /** @private - if isModal state changes, update pane state if needed. */
   _isModalDidChange: function() {

data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_data_source.js

@@ -10,9 +10,9 @@ sc_require('system/drag') ;
 /**
   @namespace
 
-  This mixin can be used to implement a dynamic data source for a drag 
-  operation.  You can return a set of allowed data types and then the 
-  method will be used to actually get data in that format when requested.
+  This procol implements a dynamic data source for a drag operation. You can
+  return a set of allowed data types and then the method will be used to 
+  actually get data in that format when requested.
 */
 SC.DragDataSource = {
 

data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drop_target.js

@@ -8,10 +8,10 @@
 sc_require('system/drag');
 
 /**
-  @mixin
+  @namespace
   
-  Add the DropTarget mixin to your view to be able to accept drop events. You 
-  should also override the methods below as needed to handle accepting of events.
+  Implement the DropTarget protocol in your view to be able to accept drop events. You 
+  should define the methods below as needed to handle accepting of events.
   
   See the method descriptions for more information on what you need to implement.
   

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/button.js

@@ -10,7 +10,7 @@
   Renders and updates the HTML representation of a button.
 */
 SC.BaseTheme.buttonRenderDelegate = SC.RenderDelegate.create({
-  name: 'button',
+  className: 'button',
 
   //
   // SIZE DEFINITIONS

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/checkbox.js

@@ -27,7 +27,7 @@
   
 */
 SC.BaseTheme.checkboxRenderDelegate = SC.RenderDelegate.create({
-  name: 'checkbox',
+  className: 'checkbox',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/collection.js

@@ -9,7 +9,7 @@
 // collections don't need their own rendering; however, in future, constants
 // like the row height will likely be specified on the render delegate.
 SC.BaseTheme.collectionRenderDelegate = SC.RenderDelegate.create({
-  name: 'collection',
+  className: 'collection',
   
   render: function(dataSource, context) {
     context.setClass('focus', dataSource.get('isFirstResponder'));

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/disclosure.js

@@ -7,7 +7,7 @@
 
 
 SC.BaseTheme.disclosureRenderDelegate = SC.RenderDelegate.create({
-  name: 'disclosure',
+  className: 'disclosure',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/image_button.js

@@ -7,7 +7,7 @@
 
 
 SC.BaseTheme.imageButtonRenderDelegate = SC.RenderDelegate.create({
-  name: 'image-button',
+  className: 'image-button',
 
   render: function(dataSource, context) {
     var image = dataSource.get('image'),

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/master_detail.js

@@ -16,7 +16,8 @@
 SC.BaseTheme.MASTER_DETAIL_DIVIDER_WIDTH = 1;
 
 SC.BaseTheme.masterDetailRenderDelegate = SC.RenderDelegate.create({
-  name: 'master-detail',
+  className: 'master-detail',
+  dividerWidth: 1,
   
   render: function(dataSource, context) {
     context.setClass('round-toolbars', SC.platform.touch);
@@ -26,4 +27,4 @@ SC.BaseTheme.masterDetailRenderDelegate = SC.RenderDelegate.create({
     jquery.setClass('round-toolbars', SC.platform.touch);    
   }
   
-});
+});

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/menu.js

@@ -9,7 +9,7 @@ sc_require('render_delegates/picker');
 
 // This is the same as a pickerRenderDelegate, but is named 'menu' instead.
 SC.BaseTheme.menuRenderDelegate = SC.BaseTheme.pickerRenderDelegate.create({
-  name: 'menu',
+  className: 'menu',
 
   render: function(orig, dataSource, context) {
     this.addSizeClassName(dataSource, context);
@@ -21,11 +21,21 @@ SC.BaseTheme.menuRenderDelegate = SC.BaseTheme.pickerRenderDelegate.create({
     orig(dataSource, jquery);
   }.enhance(),
 
+  // height for items in this menu size
   itemHeight: 20,
+
+  // height of separator items
   itemSeparatorHeight: 9,
+
+  // amount to add to the calculated menu height
   menuHeightPadding: 6,
-  submenuOffsetX: 2,
 
+  // amount to add to any calculated menu width to determine the actual width
+  menuWidthPadding: 50,
+
+  minimumMenuWidth: 50,
+
+  submenuOffsetX: 2,
   verticalOffset: 23,
 
   'sc-tiny-size': {

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/panel.js

@@ -7,7 +7,7 @@
 
 
 SC.BaseTheme.panelRenderDelegate = SC.RenderDelegate.create({
-  name: 'panel',
+  className: 'panel',
   
   render: function(dataSource, context) {
     context = context.begin('div').addClass('panel-background');

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/picker.js

@@ -8,7 +8,7 @@
 sc_require('render_delegates/panel');
 
 SC.BaseTheme.pickerRenderDelegate = SC.RenderDelegate.create({
-  name: 'picker',
+  className: 'picker',
   
   render: function(dataSource, context) {
     var panelRenderDelegate = dataSource.get('theme').panelRenderDelegate;

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/progress.js

@@ -23,7 +23,7 @@
   any theme constants.
 */
 SC.BaseTheme.progressRenderDelegate = SC.RenderDelegate.create({
-  name: 'progress',
+  className: 'progress',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/radio.js

@@ -26,7 +26,7 @@
   
 */
 SC.BaseTheme.radioRenderDelegate = SC.RenderDelegate.create({
-  name: 'radio',
+  className: 'radio',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/radio_group.js

@@ -27,7 +27,7 @@
   button, there is a method to update a specific index.
 */
 SC.BaseTheme.radioGroupRenderDelegate = SC.RenderDelegate.create({
-  name: 'radio-group',
+  className: 'radio-group',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);
@@ -47,7 +47,7 @@ SC.BaseTheme.radioGroupRenderDelegate = SC.RenderDelegate.create({
         .addClass('radio-' + idx)
         .attr('index', idx)
         .addClass(theme.classNames)
-        .addClass(theme.radioRenderDelegate.name)
+        .addClass(theme.radioRenderDelegate.className)
         
         // so we can identify it in event handling
         .addClass('sc-radio-button');

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/segment.js

@@ -11,7 +11,7 @@
   SC.SegmentedView.
 */
 SC.BaseTheme.segmentRenderDelegate = SC.RenderDelegate.create({
-  name: 'segment',
+  className: 'segment',
 
   render: function(dataSource, context) {
     var theme = dataSource.get('theme'),

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

@@ -9,7 +9,7 @@
   Renders and updates the HTML representation of SC.SegmentedView.
 */
 SC.BaseTheme.segmentedRenderDelegate = SC.RenderDelegate.create({
-  name: 'segmented',
+  className: 'segmented',
 
   /*
     We render everything external to the segments and let each segment use it's own render

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/slider.js

@@ -18,7 +18,7 @@
 
 SC.BaseTheme.sliderRenderDelegate = SC.RenderDelegate.create({
   
-  name: 'slider',
+  className: 'slider',
   
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/toolbar.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 SC.BaseTheme.toolbarRenderDelegate = SC.RenderDelegate.create({
-  name: 'toolbar',
+  className: 'toolbar',
 
   render: function(dataSource, context) {
     // toolbar has nothing in it

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/well.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 SC.BaseTheme.wellRenderDelegate = SC.RenderDelegate.create({
-  name: 'well',
+  className: 'well',
   render: function(dataSource, context) {
     this.includeSlices(dataSource, context, SC.NINE_SLICE);
   },

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/workspace.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 SC.BaseTheme.workspaceRenderDelegate = SC.RenderDelegate.create({
-  name: 'workspace',
+  className: 'workspace',
   
   render: function() {
     // No DOM to generate -- uses CSS3 to style.

data/lib/frameworks/sproutcore/frameworks/desktop/resources/segmented.css

@@ -1,6 +1,7 @@
 .sc-segmented-view {
   display: block;
   white-space: nowrap;
+  z-index: 1;
   img.icon {
     position: relative;
     vertical-align: middle;