sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -64,11 +64,11 @@ SC.PopupButtonView = SC.ButtonView.extend(
     @default null
   */
   menu: null,
-  
+
   /**
     If YES and the menu is a class, this will cause a task that will instantiate the menu
     to be added to SC.backgroundTaskQueue.
-    
+
     @type Boolean
     @default NO
   */
@@ -77,7 +77,7 @@ SC.PopupButtonView = SC.ButtonView.extend(
   // ..........................................................
   // INTERNAL SUPPORT
   //
-  
+
   /** @private
     If necessary, adds the loading of the menu to the background task queue.
   */
@@ -88,23 +88,23 @@ SC.PopupButtonView = SC.ButtonView.extend(
       SC.backgroundTaskQueue.push(SC.PopupButtonMenuLoader.create({ popupButton: this }));
     }
   },
-  
+
   /** @private
     Sets up binding on the menu, removing any old ones if necessary.
   */
   _setupMenu: function() {
     var menu = this.get('instantiatedMenu');
-    
+
     // clear existing bindings
     if (this.isActiveBinding) this.isActiveBinding.disconnect();
     this.isActiveBinding = null;
-    
+
     // if there is a menu
     if (menu && !menu.isClass) {
       this.isActiveBinding = this.bind('isActive', menu, 'isVisibleInWindow');
     }
   },
-  
+
   /** @private
     Setup the bindings for menu...
   */
@@ -116,40 +116,40 @@ SC.PopupButtonView = SC.ButtonView.extend(
     isActive is NO, but when the menu is instantiated, it is bound to the menu's isVisibleInWindow property.
   */
   isActive: NO,
-  
+
   /** @private
     Instantiates the menu if it is not already instantiated.
   */
   _instantiateMenu: function() {
     // get menu
     var menu = this.get('menu');
-    
+
     // if it is already instantiated or does not exist, we cannot do anything
     if (!menu || !menu.isClass) return;
-    
+
     // create
     this.menu = menu.create();
-    
+
     // setup
     this._setupMenu();
   },
-  
+
   /** @private
     The guaranteed-instantiated menu.
   */
   instantiatedMenu: function() {
     // get the menu
     var menu = this.get('menu');
-    
+
     // if it is a class, we need to instantiate it
     if (menu && menu.isClass) {
       // do so
       this._instantiateMenu();
-      
+
       // get the new version of the local
       menu = this.get('menu');
     }
-    
+
     // return
     return menu;
   }.property('menu').cacheable(),
@@ -182,7 +182,7 @@ SC.PopupButtonView = SC.ButtonView.extend(
   */
   mouseDown: function(evt) {
     // If disabled, handle mouse down but ignore it.
-    if (!this.get('isEnabled')) return YES ;
+    if (!this.get('isEnabledInPane')) return YES ;
 
     this._isMouseDown = YES;
 
@@ -194,14 +194,14 @@ SC.PopupButtonView = SC.ButtonView.extend(
 
     // One mouseUp, we'll use this value to determine how long the mouse was
     // pressed.
-    
+
     // we need to keep track that we opened it just now in case we get the
     // mouseUp before render finishes. If it is 0, then we know we have not
     // waited long enough.
     this._menuRenderedTimestamp = 0;
-    
+
     var self = this;
-    
+
     // setTimeout guarantees that all rendering is done. The browser will even
     // have rendered by this point.
     setTimeout(function() {
@@ -238,7 +238,7 @@ SC.PopupButtonView = SC.ButtonView.extend(
         menu = this.get('instantiatedMenu'),
         touch = SC.platform.touch,
         targetMenuItem;
-    
+
     // normalize the previousTimestamp: if it is 0, it might as well be now.
     // 0 means that we have not even triggered the nearly-immediate saving of timestamp.
     if (previousTimestamp === 0) previousTimestamp = Date.now();
@@ -290,7 +290,7 @@ SC.PopupButtonView = SC.ButtonView.extend(
     @param {SC.Event} evt
   */
   performKeyEquivalent: function(charCode, evt) {
-    if (!this.get('isEnabled')) return NO ;
+    if (!this.get('isEnabledInPane')) return NO ;
     var menu = this.get('instantiatedMenu') ;
 
     return (!!menu && menu.performKeyEquivalent(charCode, evt, YES)) ;

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

@@ -44,10 +44,10 @@ SC.ProgressView = SC.View.extend(SC.Control,
 
   /**
     @type Array
-    @default ['displayValue', 'ariaValue', 'minimum', 'maximum', 'isEnabled', 'isIndeterminate', 'isRunning', 'isVisibleInWindow']
+    @default ['displayValue', 'ariaValue', 'minimum', 'maximum', 'isIndeterminate', 'isRunning', 'isVisibleInWindow']
     @see SC.View#displayProperties
   */
-  displayProperties: ['displayValue', 'ariaValue', 'minimum', 'maximum', 'isEnabled', 'isIndeterminate', 'isRunning', 'isVisibleInWindow'],
+  displayProperties: ['displayValue', 'ariaValue', 'minimum', 'maximum', 'isIndeterminate', 'isRunning', 'isVisibleInWindow'],
 
   /**
     @type String

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

@@ -10,24 +10,24 @@
 
   A RadioView is used to create a group of radio buttons.  The user can use
   these buttons to pick from a choice of options.
-  
-  This view renders simulated radio buttons that can display a mixed state and 
+
+  This view renders simulated radio buttons that can display a mixed state and
   has other features not found in platform-native controls.
-  
+
   The radio buttons themselves are designed to be styled using CSS classes with
   the following structure:
-  
+
       <label class="sc-radio-button">
         <img class="button" src="some_image.gif"/>
         <input type="radio" name="<sc-guid>" value=""/>
         <span class="sc-button-label">Label for button1</span>
       </label>
-  
+
   Setting up a RadioView accepts a number of properties, for example:
-  
+
       radio: SC.RadioView.design({
         items: [
-          { 
+          {
             title: "Red",
             value: "red",
             enabled: YES,
@@ -47,13 +47,13 @@
         isEnabled: YES,
         layoutDirection: SC.LAYOUT_HORIZONTAL
       })
-  
-  The items array can contain either strings, or as in the example above a 
+
+  The items array can contain either strings, or as in the example above a
   hash. When using a hash, make sure to also specify the itemTitleKey
-  and itemValueKey you are using. Similarly, you will have to provide 
-  itemIconKey if you are using icons radio buttons. The individual items 
+  and itemValueKey you are using. Similarly, you will have to provide
+  itemIconKey if you are using icons radio buttons. The individual items
   enabled property is YES by default, and the icon is optional.
-  
+
   @extends SC.View
   @extends SC.Control
   @since SproutCore 1.0
@@ -68,9 +68,9 @@ SC.RadioView = SC.View.extend(SC.Control,
     @observes isEnabled
   */
   acceptsFirstResponder: function() {
-    if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
+    if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabledInPane'); }
     return NO;
-  }.property('isEnabled'),
+  }.property('isEnabledInPane'),
 
   /**
     @type Array
@@ -88,13 +88,13 @@ SC.RadioView = SC.View.extend(SC.Control,
   */
   ariaRole: 'radiogroup',
 
-  /** 
+  /**
     @type Array
-    @default ['displayItems', 'isEnabled', 'layoutDirection']
+    @default ['displayItems', 'layoutDirection']
     @see SC.View#displayProperties
   */
-  displayProperties: ['displayItems', 'isEnabled', 'layoutDirection'],
-  
+  displayProperties: ['displayItems', 'layoutDirection'],
+
   /**
     @type String
     @default 'radioGroupRenderDelegate'
@@ -103,8 +103,8 @@ SC.RadioView = SC.View.extend(SC.Control,
 
   // ..........................................................
   // Properties
-  // 
-  
+  //
+
   /**
     If items property is a hash, specify which property will function as
     the ariaLabeledBy with this itemAriaLabeledByKey property.ariaLabeledBy is used
@@ -132,10 +132,10 @@ SC.RadioView = SC.View.extend(SC.Control,
   itemAriaLabelKey: null,
 
   /**
-    The value of the currently selected item, and which will be checked in the 
-    UI. This can be either a string or an array with strings for checking 
+    The value of the currently selected item, and which will be checked in the
+    UI. This can be either a string or an array with strings for checking
     multiple values.
-    
+
     @type Object|String
     @default null
   */
@@ -143,10 +143,10 @@ SC.RadioView = SC.View.extend(SC.Control,
 
   /**
     This property indicates how the radio buttons are arranged. Possible values:
-    
+
       - SC.LAYOUT_VERTICAL
       - SC.LAYOUT_HORIZONTAL
-    
+
     @type String
     @default SC.LAYOUT_VERTICAL
   */
@@ -158,65 +158,65 @@ SC.RadioView = SC.View.extend(SC.Control,
   */
   escapeHTML: YES,
 
-  /** 
+  /**
     The items property can be either an array with strings, or a
     hash. When using a hash, make sure to also specify the appropriate
     itemTitleKey, itemValueKey, itemIsEnabledKey and itemIconKey.
-    
+
     @type Array
     @default []
   */
   items: [],
 
-  /** 
+  /**
     If items property is a hash, specify which property will function as
     the title with this itemTitleKey property.
-    
+
     @type String
     @default null
   */
   itemTitleKey: null,
-  
+
   /**
     If items property is a hash, specify which property will function as
     the item width with this itemWidthKey property. This is only used when
     layoutDirection is set to SC.LAYOUT_HORIZONTAL and can be used to override
     the default value provided by the framework or theme CSS.
-    
+
     @type String
     @default null
   */
   itemWidthKey: null,
 
-  /** 
+  /**
     If items property is a hash, specify which property will function as
     the value with this itemValueKey property.
-    
+
     @type String
     @default null
   */
   itemValueKey: null,
 
-  /** 
+  /**
     If items property is a hash, specify which property will function as
     the value with this itemIsEnabledKey property.
-    
+
     @type String
     @default null
   */
   itemIsEnabledKey: null,
 
-  /** 
+  /**
     If items property is a hash, specify which property will function as
     the value with this itemIconKey property.
-    
+
     @type String
     @default null
   */
   itemIconKey: null,
 
   /**  @private
-    If the items array itself changes, add/remove observer on item... 
+    If the items array itself changes, add/remove observer on item...
   */
   itemsDidChange: function() {
     if (this._items) {
@@ -236,13 +236,13 @@ SC.RadioView = SC.View.extend(SC.Control,
   itemContentDidChange: function() {
     // Force regeneration of buttons
     this._renderAsFirstTime = YES;
-  
+
     this.notifyPropertyChange('displayItems');
   },
 
   // ..........................................................
   // PRIVATE SUPPORT
-  // 
+  //
 
   /** @private
     Data Sources for radioRenderDelegates, as required by radioGroupRenderDelegate.
@@ -256,17 +256,17 @@ SC.RadioView = SC.View.extend(SC.Control,
         valueKey = this.get('itemValueKey'),
         widthKey = this.get('itemWidthKey'),
         isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL,
-        isEnabledKey = this.get('itemIsEnabledKey'), 
+        isEnabledKey = this.get('itemIsEnabledKey'),
         iconKey = this.get('itemIconKey'),
         ariaLabeledByKey = this.get('itemAriaLabeledByKey'),
         ariaLabelKey = this.get('itemAriaLabelKey'),
         ret = this._displayItems || [], max = (items)? items.get('length') : 0,
         item, title, width, value, idx, isEnabled, icon, sel, active,
         ariaLabeledBy, ariaLabel;
-    
+
     for(idx=0;idx<max;idx++) {
-      item = items.objectAt(idx); 
-      
+      item = items.objectAt(idx);
+
       // if item is an array, just use the items...
       if (SC.typeOf(item) === SC.T_ARRAY) {
         title = item[0];
@@ -274,16 +274,16 @@ SC.RadioView = SC.View.extend(SC.Control,
 
         // otherwise, possibly use titleKey,etc.
       } else if (item) {
-        // get title.  either use titleKey or try to convert the value to a 
+        // get title.  either use titleKey or try to convert the value to a
         // string.
         if (titleKey) {
           title = item.get ? item.get(titleKey) : item[titleKey];
         } else title = (item.toString) ? item.toString() : null;
-        
+
         if (widthKey && isHorizontal) {
           width = item.get ? item.get(widthKey) : item[widthKey];
         }
-        
+
         if (valueKey) {
           value = item.get ? item.get(valueKey) : item[valueKey];
         } else value = item;
@@ -312,7 +312,7 @@ SC.RadioView = SC.View.extend(SC.Control,
 
       // it can only be enabled if the radio view itself is enabled
       isEnabled = isEnabled && this.get('isEnabled');
-      
+
       if (item) {
         sel = (isArray) ? (viewValue.indexOf(value) >= 0) : (viewValue === value);
       } else {
@@ -347,14 +347,14 @@ SC.RadioView = SC.View.extend(SC.Control,
     mouseUp.
   */
   mouseDown: function(evt) {
-    if (!this.get('isEnabled')) return YES;
-    
+    if (!this.get('isEnabledInPane')) return YES;
+
     var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy'),
         elem = this.$(),
         index = delegate.indexForEvent(proxy, elem, evt);
-    
+
     this._activeRadioButton = index;
-    
+
     if (index !== undefined) {
       var item = this.get('displayItems')[index];
       if (item.get('isEnabled')) {
@@ -362,8 +362,8 @@ SC.RadioView = SC.View.extend(SC.Control,
         delegate.updateRadioAtIndex(proxy, elem, index);
       }
     }
-    
-    // even if radiobuttons are not set to get firstResponder, allow default 
+
+    // even if radiobuttons are not set to get firstResponder, allow default
     // action, that way textfields loose focus as expected.
     evt.allowDefault();
     return YES;
@@ -371,24 +371,24 @@ SC.RadioView = SC.View.extend(SC.Control,
 
   /** @private
     If we have a radio element that was clicked on previously, make sure we
-    remove the active state. Then update the value if the item clicked is 
+    remove the active state. Then update the value if the item clicked is
     enabled.
   */
   mouseUp: function(evt) {
-    if (!this.get('isEnabled')) return YES;
+    if (!this.get('isEnabledInPane')) return YES;
 
     var delegate = this.get('renderDelegate'), proxy = this.get('renderDelegateProxy'),
         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, elem, this._activeRadioButton);
     }
-    
+
     this._activeRadioButton = undefined;
-    
+
     if (index !== undefined) {
       var item = this.get('displayItems')[index];
       if (item.get('isEnabled')) {
@@ -397,13 +397,13 @@ SC.RadioView = SC.View.extend(SC.Control,
         this.set('value', item.value);
       }
     }
-    
+
     evt.allowDefault();
     return YES;
   },
-  
+
   keyDown: function(evt) {
-    if(!this.get('isEnabled')) return YES;
+    if(!this.get('isEnabledInPane')) return YES;
     // handle tab key
     if (evt.which === 9 || evt.keyCode === 9) {
       var view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
@@ -412,7 +412,7 @@ SC.RadioView = SC.View.extend(SC.Control,
       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'),
@@ -420,8 +420,8 @@ SC.RadioView = SC.View.extend(SC.Control,
       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--;
@@ -437,7 +437,7 @@ SC.RadioView = SC.View.extend(SC.Control,
 
     return NO;
   },
-  
+
 
   /** @private */
   touchStart: function(evt) {