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

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

@@ -826,7 +826,7 @@ SC.ListItemView = SC.View.extend(SC.InlineEditable, SC.Control,
       .addClass('sc-disclosure-view')
       .addClass('sc-regular-size')
       .addClass(this.get('theme').classNames)
-      .addClass(renderer.get('name'));
+      .addClass(renderer.get('className'));
 
     var source = this._disclosureRenderSource;
     if (!source) {
@@ -863,7 +863,7 @@ SC.ListItemView = SC.View.extend(SC.InlineEditable, SC.Control,
       .addClass('sc-checkbox-view')
       .addClass('sc-regular-size')
       .addClass(this.get('theme').classNames)
-      .addClass(renderer.get('name'));
+      .addClass(renderer.get('className'));
 
     var source = this._checkboxRenderSource;
     if (!source) {

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

@@ -103,10 +103,20 @@ SC.MasterDetailView = SC.View.extend(
   }.property().cacheable(),
   
   /**
+    The width of the 'master' side of the master/detail view.
+
     @type Number
     @default 250
   */
   masterWidth: 250,
+
+  /**
+    The width of the divider between the master and detail views.
+
+    @type Number
+    @default From theme, or 1.
+  */
+  dividerWidth: SC.propertyFromRenderDelegate('dividerWidth', 1),
   
   /**
     A property (computed) that says whether the master view is hidden.
@@ -296,7 +306,7 @@ SC.MasterDetailView = SC.View.extend(
       });
       
       // and child, naturally
-      var extra = this.getThemedProperty('dividerWidth', 'MASTER_DETAIL_DIVIDER_WIDTH');
+      var extra = this.get('dividerWidth');
       detail.set("layout", { left: masterWidth + extra, right: 0, top: 0, bottom: 0 });
     } else {
       // remove master if needed

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

@@ -28,10 +28,10 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
 
   /**
     @type Array
-    @default ['title', 'isEnabled', 'isSeparator']
+    @default ['title', 'isEnabled', 'isSeparator', 'isChecked']
     @see SC.View#displayProperties
   */
-  displayProperties: ['title', 'isEnabled', 'isSeparator'],
+  displayProperties: ['title', 'isEnabled', 'isSeparator', 'isChecked'],
 
 
   /**
@@ -103,6 +103,16 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
            this.getContentProperty('itemSeparatorKey') !== YES;
   }.property('content.isEnabled').cacheable(),
 
+  /**
+    YES if the menu item should include a check next to it.
+
+    @type Boolean
+    @property
+  */
+  isChecked: function() {
+    return this.getContentProperty('itemCheckboxKey');
+  }.property(),
+
   /**
     This menu item's submenu, if it exists.
 
@@ -172,10 +182,10 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     this.set('itemHeight',itemHeight);
 
     //addressing accessibility
-    if(content.get(menu.itemSeparatorKey)){
+    if (this.get('isSeparator')) {
       //assign the role of separator
       context.attr('role', 'separator');
-    } else if (this.getContentProperty('itemCheckboxKey')) {
+    } else if (this.get('isChecked')) {
       //assign the role of menuitemcheckbox
       context.attr('role', 'menuitemcheckbox');
       context.attr('aria-checked', true);
@@ -183,7 +193,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
 
     context = context.begin('a').addClass('menu-item');
 
-    if (content.get(menu.itemSeparatorKey)) {
+    if (this.get('isSeparator')) {
       context.push('<span class="separator"></span>');
       context.addClass('disabled');
     } else {
@@ -197,7 +207,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
       if (SC.typeOf(val) !== SC.T_STRING) val = val.toString();
       this.renderLabel(context, val);
 
-      if (this.getContentProperty('itemCheckboxKey')) {
+      if (this.get('isChecked')) {
         context.push('<div class="checkbox"></div>');
       }
 

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

@@ -159,14 +159,13 @@ SC.PopupButtonView = SC.ButtonView.extend(
 
     @param {SC.Event} evt
   */
-  action: function(evt)
-  {
+  action: function(evt) {
     var menu = this.get('instantiatedMenu') ;
 
     if (!menu) {
-      //@ if (debug)
+      // @if (debug)
       SC.Logger.warn("SC.PopupButton - Unable to show menu because the menu property is set to %@.".fmt(menu));
-      //@ endif
+      // @endif
       return NO ;
     }
 
@@ -280,8 +279,7 @@ SC.PopupButtonView = SC.ButtonView.extend(
     alt_shift_z)
     @param {SC.Event} evt
   */
-  performKeyEquivalent: function( charCode, evt )
-  {
+  performKeyEquivalent: function(charCode, evt) {
     if (!this.get('isEnabled')) return NO ;
     var menu = this.get('instantiatedMenu') ;
 
@@ -300,4 +298,3 @@ SC.PopupButtonMenuLoader = SC.Task.extend({
     if (this.popupButton) this.popupButton._instantiateMenu();
   }
 });
-

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

@@ -152,7 +152,6 @@ SC.ProgressView = SC.View.extend(SC.Control,
     
     @deprecated This should now be changed in themes.
     @type Integer
-    @deprecated
   */
   offsetRange: undefined,
 

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

@@ -349,14 +349,15 @@ SC.RadioView = SC.View.extend(SC.Control,
   mouseDown: function(evt) {
     if (!this.get('isEnabled')) return YES;
     
-    var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy');
-    var index = delegate.indexForEvent(proxy, this.$(), evt);
+    var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy'),
+        elem = this.$(),
+        index = delegate.indexForEvent(proxy, elem, evt);
     
     this._activeRadioButton = index;
     
     if (index !== undefined) {
       this.get('displayItems')[index].set('isActive', YES);
-      delegate.updateRadioAtIndex(proxy, this.$(), index);
+      delegate.updateRadioAtIndex(proxy, elem, index);
     }
     
     // even if radiobuttons are not set to get firstResponder, allow default 
@@ -374,22 +375,63 @@ SC.RadioView = SC.View.extend(SC.Control,
     if (!this.get('isEnabled')) return YES;
 
     var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy'),
-        displayItems = this.get('displayItems');
-    var index = delegate.indexForEvent(proxy, this.$(), evt);
+        elem = this.$(),
+        displayItems = this.get('displayItems'),
+        index = delegate.indexForEvent(proxy, elem, evt);
     
     if (this._activeRadioButton !== undefined && index !== this._activeRadioButton) {
       displayItems[this._activeRadioButton].set('isActive', NO);
-      delegate.updateRadioAtIndex(proxy, this.$(), this._activeRadioButton);
+      delegate.updateRadioAtIndex(proxy, elem, this._activeRadioButton);
     }
     
     this._activeRadioButton = undefined;
     
     if (index !== undefined) {
       displayItems[index].set('isActive', NO);
-      delegate.updateRadioAtIndex(proxy, this.$(), index);
+      delegate.updateRadioAtIndex(proxy, elem, index);
       this.set('value', displayItems[index].value);
     }
+    
+    evt.allowDefault();
+    return YES;
   },
+  
+  keyDown: function(evt) {
+    if(!this.get('isEnabled')) return YES;
+    // handle tab key
+    if (evt.which === 9 || evt.keyCode === 9) {
+      var view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
+      if(view) view.becomeFirstResponder();
+      else evt.allowDefault();
+      return YES ; // handled
+    }
+    if (evt.which >= 37 && evt.which <= 40){
+      
+      var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy'),
+          elem = this.$(),
+          displayItems = this.get('displayItems'),
+          val = this.get('value');
+      for(var i= 0, iLen = displayItems.length; i<iLen; i++){
+        if(val === displayItems[i].value) break;
+      }
+      
+     
+      if (evt.which === 37 || evt.which === 38 ){
+        if(i<=0) i = displayItems.length-1;
+        else i--;
+      }
+      if (evt.which === 39 || evt.which === 40 ){
+        if(i>=displayItems.length-1) i = 0;
+        else i++;
+      }
+      delegate.updateRadioAtIndex(proxy, elem, i);
+      this.set('value', displayItems[i].value);
+    }
+    evt.allowDefault();
+
+    return NO;
+  },
+  
 
   /** @private */
   touchStart: function(evt) {

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

@@ -36,6 +36,7 @@ sc_require('views/segment');
     - *itemIconKey*  - an icon
     - *itemActionKey* - an optional action to fire when pressed
     - *itemTargetKey* - an optional target for the action
+    - *itemLayerIdKey* - an optional target for the action 
     - *segmentViewClass* - class to be used for creating segments
 
   @extends SC.View
@@ -235,6 +236,12 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   */
   itemTargetKey: null,
 
+  /**
+    The key that contains the layerId for each item.
+    @property {String}
+  */
+  itemLayerIdKey: null,
+
   /**
     The key that contains the key equivalent for each item.  If defined then
     pressing that key equivalent will be like selecting the tab.  Also,
@@ -287,10 +294,10 @@ SC.SegmentedView = SC.View.extend(SC.Control,
 
     @type Array
   */
-  itemKeys: 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey itemToolTipKey itemKeyEquivalentKey'.w(),
+  itemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey', 'itemKeyEquivalentKey', 'itemLayerIdKey'],
   
   /** @private */
-  viewKeys: ['title', 'value', 'isEnabled', 'icon', 'width', 'toolTip', 'keyEquivalent'],
+  viewKeys: ['title', 'value', 'isEnabled', 'icon', 'width', 'toolTip', 'keyEquivalent', 'layerId'],
 
   /** @private
     Call itemsDidChange once to initialize segment child views for the items that exist at

data/lib/frameworks/sproutcore/frameworks/desktop/{panes → views}/select_button.js

@@ -16,6 +16,8 @@ sc_require('views/button');
   list of items. The selected item will be displayed on the button.
   User has the option of enabling checkbox for the selected menu item.
 
+  @deprecated Please use SC.SelectView instead
+
   @extends SC.ButtonView
   @version 1.0
   @author Mohammed Ashik
@@ -23,6 +25,13 @@ sc_require('views/button');
 SC.SelectButtonView = SC.ButtonView.extend(
 /** @scope SC.SelectButtonView.prototype */ {
 
+  init: function(){
+    // @if (debug)
+    SC.Logger.warn("SC.SelectButtonView is deprecated. Please use SC.SelectView instead.");
+    // @endif
+    sc_super();
+  },
+
   /**
     @type Boolean
     @default YES
@@ -835,6 +844,21 @@ SC.SelectButtonView = SC.ButtonView.extend(
     return this.get('isEnabled');
   }.property('isEnabled'),
 
+  insertTab: function(evt) {
+    var view = this.get('nextValidKeyView');
+    if (view) view.becomeFirstResponder();
+    else evt.allowDefault();
+    return YES ; // handled
+  },
+
+  insertBacktab: function(evt) {
+    var view = this.get('previousValidKeyView');
+    if (view) view.becomeFirstResponder();
+    else evt.allowDefault();
+    return YES ; // handled
+  },
+
+
   /** @private
     Override the button isSelectedDidChange function in order to not perform any action
     on selecting the select_button
@@ -948,3 +972,31 @@ SC.SelectButtonView.HUGE_POPUP_MENU_WIDTH_OFFSET = 0;
   @default -2
 */
 SC.SelectButtonView.MENU_WIDTH_OFFSET = -2;
+
+/**
+  Default metrics for the different control sizes.
+*/
+SC.MenuPane.TINY_MENU_ITEM_HEIGHT = 10;
+SC.MenuPane.TINY_MENU_ITEM_SEPARATOR_HEIGHT = 2;
+SC.MenuPane.TINY_MENU_HEIGHT_PADDING = 2;
+SC.MenuPane.TINY_SUBMENU_OFFSET_X = 0;
+
+SC.MenuPane.SMALL_MENU_ITEM_HEIGHT = 16;
+SC.MenuPane.SMALL_MENU_ITEM_SEPARATOR_HEIGHT = 7;
+SC.MenuPane.SMALL_MENU_HEIGHT_PADDING = 4;
+SC.MenuPane.SMALL_SUBMENU_OFFSET_X = 2;
+
+SC.MenuPane.REGULAR_MENU_ITEM_HEIGHT = 20;
+SC.MenuPane.REGULAR_MENU_ITEM_SEPARATOR_HEIGHT = 9;
+SC.MenuPane.REGULAR_MENU_HEIGHT_PADDING = 6;
+SC.MenuPane.REGULAR_SUBMENU_OFFSET_X = 2;
+
+SC.MenuPane.LARGE_MENU_ITEM_HEIGHT = 60;
+SC.MenuPane.LARGE_MENU_ITEM_SEPARATOR_HEIGHT = 20;
+SC.MenuPane.LARGE_MENU_HEIGHT_PADDING = 0;
+SC.MenuPane.LARGE_SUBMENU_OFFSET_X = 4;
+
+SC.MenuPane.HUGE_MENU_ITEM_HEIGHT = 20;
+SC.MenuPane.HUGE_MENU_ITEM_SEPARATOR_HEIGHT = 9;
+SC.MenuPane.HUGE_MENU_HEIGHT_PADDING = 0;
+SC.MenuPane.HUGE_SUBMENU_OFFSET_X = 0;

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

@@ -9,11 +9,14 @@
 /**
   @class
 
+  DEPRECATED. Use SelectView instead.
+
   SelectFieldView displays browser-native popup menu.  To use this view,
   you should either bake into the HTML the preset list of options, or 
   you can set the -objects property to an array of items to show.  The
   value is current value of the select.
-  
+
+  @deprecated
   @extends SC.FieldView
   @author Charles Jolley
   @author Mike Ball
@@ -165,7 +168,8 @@ SC.SelectFieldView = SC.FieldView.extend(
 
   /** @private */
   render: function(context, firstTime) {
-    if (this.get('cpDidChange')) {
+    // Only re-render if it's the firstTime or if a change is required
+    if (firstTime || this.get('cpDidChange')) {
       this.set('cpDidChange', NO);
       // get list of objects.
       var nameKey = this.get('nameKey') ;
@@ -260,7 +264,7 @@ SC.SelectFieldView = SC.FieldView.extend(
         this.set('value',null);
       }
     } else {
-      this.$().attr('disabled', this.get('isEnabled') ? null : 'disabled');
+      this.$().prop('disabled', !this.get('isEnabled'));
     }
   },
 

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

@@ -215,21 +215,6 @@ SC.SliderView = SC.View.extend(SC.Control,
     return NO;
   }.property('isEnabled'),
   
-  willBecomeKeyResponderFrom: function(keyView) {
-    // focus the text field.
-    if (!this._isFocused) {
-      this._isFocused = YES ;
-      this.becomeFirstResponder();
-      if (this.get('isVisibleInWindow')) {
-        this.$().focus();
-      }
-    }
-  },
-  
-  willLoseKeyResponderTo: function(responder) {
-    if (this._isFocused) this._isFocused = NO ;
-  },
-  
   keyDown: function(evt) {
 
      // handle tab key
@@ -240,7 +225,7 @@ SC.SliderView = SC.View.extend(SC.Control,
        return YES ; // handled
      }
      
-     if (evt.which === 37 || evt.which === 38 || evt.which === 39 || evt.which === 40){
+     if (evt.which >= 37 && evt.which <= 40){
        var min = this.get('minimum'),max=this.get('maximum'),
           step = this.get('step'),
           size = max-min, val=0, calculateStep;
@@ -272,17 +257,10 @@ SC.SliderView = SC.View.extend(SC.Control,
             }       
        }
        if(val>=min && val<=max) this.set('value', val);
+     }else{
+       evt.allowDefault();
+       return NO;
      }
-     //handle arrows
-
-     // validate keyDown...
-     // if (this.performValidateKeyDown(evt)) {
-     //    this._isKeyDown = YES ;
-     //    evt.allowDefault(); 
-     //  } else {
-     //    evt.stop();
-     //  }
-     SC.RunLoop.begin().end();
      return YES; 
    },
 

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

@@ -28,13 +28,13 @@ SC.TOP_TOOLBAR_LOCATION = 'top-toolbar';
 */
 SC.BOTTOM_LOCATION = 'bottom';
 
-/** 
+/**
   @class
 
   Incorporates a segmented view and a container view to display the selected
   tab.  Provide an array of items, which will be passed onto the segmented
   view.
-  
+
   @extends SC.View
   @since SproutCore 1.0
 */
@@ -47,7 +47,7 @@ SC.TabView = SC.View.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-tab-view'],
-  
+
   /**
     @type Array
     @default ['nowShowing']
@@ -57,97 +57,97 @@ SC.TabView = SC.View.extend(
 
   // ..........................................................
   // PROPERTIES
-  // 
+  //
 
- /** 
+ /**
     Set nowShowing with the page you want to display.
-    
+
     @type String
     @default null
   */
   nowShowing: null,
-  
+
   /**
     @type Array
     @default []
   */
   items: [],
-  
+
   /**
     @type Boolean
     @default YES
   */
   isEnabled: YES,
-  
+
   /**
     @type String
     @default null
   */
   itemTitleKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemValueKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemIsEnabledKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemIconKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemWidthKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemToolTipKey: null,
-  
+
   /**
     @type Number
     @default SC.REGULAR_BUTTON_HEIGHT
   */
   tabHeight: SC.REGULAR_BUTTON_HEIGHT,
-  
+
   /**
     Possible values:
-    
+
       - SC.TOP_LOCATION
       - SC.TOP_TOOLBAR_LOCATION
       - SC.BOTTOM_LOCATION
-    
+
     @type String
     @default SC.TOP_LOCATION
   */
   tabLocation: SC.TOP_LOCATION,
-  
-  /** 
+
+  /**
     If set, then the tab location will be automatically saved in the user
     defaults.  Browsers that support localStorage will automatically store
     this information locally.
-    
+
     @type String
     @default null
   */
   userDefaultKey: null,
-  
-  
+
+
   // ..........................................................
   // FORWARDING PROPERTIES
-  // 
-  
+  //
+
   // forward important changes on to child views
   /** @private */
   _tab_nowShowingDidChange: function() {
@@ -166,11 +166,11 @@ SC.TabView = SC.View.extend(
       SC.userDefaults.set([defaultKey,'nowShowing'].join(':'), v);
     }
   }.observes('nowShowing'),
-  
+
   /** @private */
   _tab_itemsDidChange: function() {
     this.get('segmentedView').set('items', this.get('items'));
-    return this ;    
+    return this ;
   }.observes('items'),
 
   /** @private
@@ -183,7 +183,7 @@ SC.TabView = SC.View.extend(
 
   /** @private */
   awake: function() {
-    sc_super();  
+    sc_super();
     var defaultKey = this.get('userDefaultKey');
     if (defaultKey) {
       defaultKey = [defaultKey,'nowShowing'].join(':');
@@ -192,12 +192,13 @@ SC.TabView = SC.View.extend(
     }
 
   },
-  
+
   /** @private */
   createChildViews: function() {
     var childViews  = [], view, containerView, layout,
         tabLocation = this.get('tabLocation'),
-        tabHeight   = this.get('tabHeight');
+        tabHeight   = this.get('tabHeight'),
+        controlSize = this.get('controlSize');
 
     if (tabLocation === SC.TOP_LOCATION) {
       layout = { top: tabHeight/2+1, left: 0, right: 0, bottom: 0, border: 1 };
@@ -215,11 +216,11 @@ SC.TabView = SC.View.extend(
 
     view = this.containerView = this.createChildView(containerView) ;
     childViews.push(view);
-    
+
     //  The segmentedView managed by this tab view.  Note that this TabView uses
     //  a custom segmented view.  You can access this view but you cannot change
     // it.
-    layout = (tabLocation === SC.TOP_LOCATION || 
+    layout = (tabLocation === SC.TOP_LOCATION ||
               tabLocation === SC.TOP_TOOLBAR_LOCATION) ?
              { height: tabHeight, left: 0, right: 0, top: 0 } :
              { height: tabHeight, left: 0, right: 0, bottom: 0 } ;
@@ -227,23 +228,19 @@ SC.TabView = SC.View.extend(
     this.segmentedView = this.get('segmentedView').extend({
       layout: layout,
 
+      controlSize: controlSize,
+
       /** @private
         When the value changes, update the parentView's value as well.
       */
       _sc_tab_segmented_valueDidChange: function() {
         var pv = this.get('parentView');
         if (pv) pv.set('nowShowing', this.get('value'));
-
-        // FIXME: why is this necessary? 'value' is a displayProperty and should
-        // automatically cause displayDidChange() to fire, which should cause 
-        // the two lines below to execute in the normal course of things...
-        this.set('layerNeedsUpdate', YES) ;
-        this.invokeOnce(this.updateLayerIfNeeded) ;
       }.observes('value'),
 
       /** @private */
       init: function() {
-        // before we setup the rest of the view, copy key config properties 
+        // before we setup the rest of the view, copy key config properties
         // from the owner view...
         var pv = this.get('parentView');
         if (pv) {
@@ -252,35 +249,35 @@ SC.TabView = SC.View.extend(
         return sc_super();
       }
     });
-    
+
     view = this.segmentedView = this.createChildView(this.segmentedView) ;
     childViews.push(view);
-    
+
     this.set('childViews', childViews);
-    return this; 
+    return this;
   },
-  
+
   // ..........................................................
   // COMPONENT VIEWS
-  // 
+  //
 
   /**
-    The containerView managed by this tab view.  Note that TabView uses a 
-    custom container view.  You can access this view but you cannot change 
+    The containerView managed by this tab view.  Note that TabView uses a
+    custom container view.  You can access this view but you cannot change
     it.
-    
+
     @type SC.View
     @default SC.ContainerView
     @readOnly
   */
   containerView: SC.ContainerView.extend({ renderDelegateName: 'wellRenderDelegate' }),
-  
+
   /**
     @type SC.View
     @default SC.SegmentedView
   */
   segmentedView: SC.SegmentedView
-  
+
 }) ;
 
 SC._TAB_ITEM_KEYS = ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey', 'itemActionKey', 'itemTargetKey'];