sproutcore 1.6.0.beta.3-java → 1.6.0-java

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

@@ -5,83 +5,22 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-
 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.
-
-    @property {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.
-
-    @property
-    @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.
-
-    @property
-    @type {Array}
-    @default '_SC.DateTime.monthNames'.loc().w()
-  */
-  monthNames: null,
+/** @scope SC.DateTime */ {
 
   /**
-    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.
+    @private
 
-    @property
-    @type {Array}
-    @default '_SC.DateTime.abbreviatedMonthNames'.loc().w()
-  */
-  abbreviatedMonthNames: null,
-
-  /** @private
     Called on `document.ready`.
 
     Because localizations may have been modified by an application developer,
     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/collection_row_delegate.js

@@ -33,7 +33,7 @@ SC.CollectionRowDelegate = {
     @type Number
     @default 18
   */
-  itemHeight: 18,
+  itemHeight: 24,
   
   /**
     This inserts empty space between rows that you can use for borders.

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

@@ -333,7 +333,6 @@ SC.AlertPane = SC.PanelPane.extend(
           localize: YES,
           titleMinWidth: 64,
           layout: { right: 5, height: 'auto', width: 'auto', bottom: 0 },
-          theme: 'capsule',
           isCancel: YES,
           action: "dismiss",
           isVisible: NO
@@ -345,7 +344,6 @@ SC.AlertPane = SC.PanelPane.extend(
           localize: YES,
           titleMinWidth: 64,
           layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-          theme: 'capsule',
           isDefault: YES,
           action: "dismiss",
           isVisible: NO
@@ -361,7 +359,6 @@ SC.AlertPane = SC.PanelPane.extend(
             localize: YES,
             titleMinWidth: 64,
             layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-            theme: 'capsule',
             action: "dismiss",
             isVisible: NO
           })]
@@ -389,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);
         }
       }
     }
@@ -444,24 +439,26 @@ SC.AlertPane.mixin(
     var pane = this.create(args), 
         idx = 0, 
         buttons = args.buttons,
-        buttonView, title, action, target;
+        buttonView, title, action, target, themeName;
     
     if(buttons) {
       buttons.forEach(function(button) {
         idx++;
+        if(!button) return;
         buttonView = pane.get('button%@'.fmt(idx));
         
         title = button.title;
         action = button.action;
         target = button.target;
+        themeName = args.themeName || 'capsule';
         
         buttonView.set('title'.fmt(idx), title);
         if(action) buttonView.set('customAction'.fmt(idx), action);
         if(target) buttonView.set('target'.fmt(idx), target);
         buttonView.set('isVisible', !!title);
+        buttonView.set('themeName', themeName);
       });
-    }
-    else {
+    } else {
       // if there are no buttons defined, just add the standard OK button
       buttonView = pane.get('button1');
       buttonView.set('title', "OK");
@@ -556,7 +553,8 @@ SC.AlertPane.mixin(
         description: normalizedArgs[1],
         caption: normalizedArgs[2],
         delegate: normalizedArgs[7],
-        icon: (normalizedArgs[6] || 'sc-icon-alert-48')
+        icon: (normalizedArgs[6] || 'sc-icon-alert-48'),
+        themeName: 'capsule'
       };
       
       // set buttons if there are any (and check if it's a string, since last

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

@@ -235,7 +235,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @default YES
   */
   localize: YES,
-  
+
   /**
     Whether or not this menu pane should accept the “current menu pane”
     designation when visible, which is the highest-priority pane when routing
@@ -246,7 +246,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @default YES
   */
   acceptsMenuPane: YES,
-  
+
   /**
     Disable context menu.
     
@@ -383,7 +383,7 @@ SC.MenuPane = SC.PickerPane.extend(
   itemSeparatorKey: 'separator',
 
   /**
-    The name of the property that contains the target for the action that is 
+    The name of the property that contains the target for the action that is
     triggered when the user clicks the menu item.
 
     Note that this property is ignored if the menu item has a submenu.
@@ -457,14 +457,23 @@ SC.MenuPane = SC.PickerPane.extend(
   itemDisableMenuFlashKey: 'disableMenuFlash',
 
   /**
-    The array of keys used by `SC.MenuItemView` when inspecting your menu items
+    The name of the property that determines whether layerID should be applied to the item .
+
+    @type String
+    @default "layerId"
+    @commonTask Menu Item Properties
+  */
+  itemLayerIdKey: 'layerId',
+
+  /**
+    The array of keys used by SC.MenuItemView when inspecting your menu items
     for display properties.
 
     @private
     @isReadOnly
     @property Array
   */
-  menuItemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemSeparatorKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey', 'itemHeightKey', 'itemSubMenuKey', 'itemKeyEquivalentKey', 'itemTargetKey'],
+  menuItemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemSeparatorKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey', 'itemHeightKey', 'itemSubMenuKey', 'itemKeyEquivalentKey', 'itemTargetKey', 'itemLayerIdKey'],
 
   // ..........................................................
   // INTERNAL PROPERTIES
@@ -595,16 +604,33 @@ 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,
         menuHeight, menuHeightPadding, keyEquivalentKey, keyEquivalent,
-        keyArray, idx,
+        keyArray, idx, layerIdKey, propertiesHash,
         len;
 
     if (!items) return views; // return an empty array
@@ -613,7 +639,7 @@ SC.MenuPane = SC.PickerPane.extend(
     defaultHeight = this.get('itemHeight');
     keyEquivalentKey = this.get('itemKeyEquivalentKey');
     separatorHeight = this.get('itemSeparatorHeight');
-
+    layerIdKey = this.get('itemLayerIdKey');
     menuHeightPadding = Math.floor(this.get('menuHeightPadding')/2);
     menuHeight = menuHeightPadding;
 
@@ -626,15 +652,18 @@ SC.MenuPane = SC.PickerPane.extend(
       if (!height) {
         height = item.get(separatorKey) ? separatorHeight : defaultHeight;
       }
-      view = this._menuView.createChildView(exampleView, {
+      propertiesHash = {
         layout: { height: height, top: menuHeight },
         contentDisplayProperties: keyArray,
         content: item,
         parentMenu: this
-      });
+      };
+      if(item.get(layerIdKey)) {
+        propertiesHash.layerId = item.get(layerIdKey);
+      }
+      view = this._menuView.createChildView(exampleView, propertiesHash);
       views[idx] = view;
       menuHeight += height;
-
       keyEquivalent = item.get(keyEquivalentKey);
       if (keyEquivalent) {
         // if array, apply each one for this view
@@ -651,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.
@@ -997,7 +1026,7 @@ SC.MenuPane = SC.PickerPane.extend(
   performKeyEquivalent: function(keyEquivalent, evt, fromVisibleControl) {
     //If menu is not visible
     if (!fromVisibleControl && !this.get('isVisibleInWindow')) return NO;
-    
+
     // Look for menu item that has this key equivalent
     var menuItem = this._keyEquivalents[keyEquivalent];
 

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/panes/picker.js

@@ -803,14 +803,17 @@ SC.PickerPane = SC.PalettePane.extend(
         target = this.get('removeTarget') || null,
         action = this.get('removeAction'),
         rootResponder = this.get('rootResponder');
-        
+
     if (!this.clickInside(f, evt)) {
+      // We're not in the Pane so we must be in the modal
       if (action) {
         rootResponder.sendAction(action, target, this, this, null, this);
       } else this.remove();
+
+      return YES;
     }
-    
-    return YES ; 
+
+    return NO;
   },
 
   /** @private */

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);