sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -81,7 +81,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
      Key used to extract icons from the objects array
-     
+
      @type String
      @default null
   */
@@ -89,7 +89,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
     Key used to indicate if the item is to be enabled
-    
+
     @type String
     @default "isEnabled"
   */
@@ -121,7 +121,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
     Menu attached to the `selectButton`
-    
+
     @type SC.View
     @default SC.MenuView
   */
@@ -240,7 +240,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
     customView used to draw the menu
-    
+
     @type SC.View
     @default null
   */
@@ -248,7 +248,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
     CSS classes applied to customView
-    
+
     @type String
     @default null
   */
@@ -256,7 +256,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
 
   /**
     customView menu offset width
-    
+
     @type Number
     @default 0
   */
@@ -280,18 +280,18 @@ SC.SelectButtonView = SC.ButtonView.extend(
   /**
     This is a property to enable/disable focus rings in buttons.
     For `select_button` we are making it a default.
-    
+
     @type Boolean
     @default YES
   */
   supportFocusRing: YES,
-  
+
   /**
     @type Boolean
     @default NO
   */
   isContextMenuEnabled: NO,
-  
+
 
   /**@private
     Left Alignment based on the size of the button
@@ -420,7 +420,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
       //Check if item is enabled
       itemEnabled = (isEnabledKey) ? (object.get ?
       object.get(isEnabledKey) : object[isEnabledKey]) : object ;
-      
+
       if(NO !== itemEnabled) itemEnabled = YES ;
 
       //Set the first item from the list as default selected item
@@ -458,7 +458,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
     }, this ) ;
 
     if(firstTime) {
-      context.attr('aria-haspopup', 'true') ;
+      context.setAttr('aria-haspopup', 'true') ;
       this.invokeLast(function() {
         var value = this.get('value') ;
         if(SC.none(value)) {
@@ -473,16 +473,16 @@ SC.SelectButtonView = SC.ButtonView.extend(
     this.changeSelectButtonPreferMatrix(this.itemIdx) ;
 
   },
-  
+
   /** @private
     Compares the the two values.
-    
-    This function can be overridden if the value of the Select Button field 
+
+    This function can be overridden if the value of the Select Button field
     is an object.
   */
   _equals: function(value1, value2) {
     var ret = YES;
-    if (value1 && SC.typeOf(value1) === SC.T_HASH && 
+    if (value1 && SC.typeOf(value1) === SC.T_HASH &&
         value2 && SC.typeOf(value2) === SC.T_HASH) {
       for(var key in value1) {
         if(value1[key] !== value2[key]) ret = NO;
@@ -490,18 +490,18 @@ SC.SelectButtonView = SC.ButtonView.extend(
     }
     else ret = (value1 === value2);
     return ret;
-  }, 
+  },
 
   /** @private
     Button action handler
-    
+
     @param {DOMMouseEvent} evt mouseup event that triggered the action
   */
   _action: function(evt) {
     var buttonLabel, menuWidth, scrollWidth, lastMenuWidth, offsetWidth,
       items, elementOffsetWidth, largestMenuWidth, item, element, idx,
       value, itemList, menuControlSize, menuHeightPadding, customView,
-      customMenuView, menu, itemsLength, dummyMenuItemView, 
+      customMenuView, menu, itemsLength, dummyMenuItemView,
       menuItemViewEscapeHTML, menuWidthOffset, body;
 
     buttonLabel = this.$('.sc-button-label')[0] ;
@@ -548,7 +548,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
         className = 'sc-view sc-pane sc-panel sc-palette sc-picker sc-menu select-button menu sc-scroll-view sc-menu-scroll-view sc-container-view sc-menu-item menu-item value sc-regular-size' ;
     className = customViewClassName ? (className + ' ' + customViewClassName) : className ;
 
-    dummyMenuItemView = (this.get('customView') || SC.MenuItemView).create(); 
+    dummyMenuItemView = (this.get('customView') || SC.MenuItemView).create();
     menuItemViewEscapeHTML = dummyMenuItemView.get('escapeHTML') ;
     body = document.body;
     for (idx = 0, itemsLength = items.length; idx < itemsLength; ++idx) {
@@ -731,14 +731,14 @@ SC.SelectButtonView = 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() {
@@ -888,7 +888,7 @@ SC.SelectButtonView = SC.ButtonView.extend(
   _button_isSelectedDidChange: function() {
 
   }.observes('isSelected'),
-  
+
   /** @private */
   didAppendToDocument: function() {}
 

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

@@ -12,7 +12,7 @@
   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 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.
 
@@ -27,21 +27,21 @@ SC.SelectFieldView = SC.FieldView.extend(
 
   /**
     @type Array
-    @default ['objects','nameKey','valueKey','isEnabled']
+    @default ['objects','nameKey','valueKey']
     @see SC.View#displayProperties
   */
-  displayProperties: ['objects','nameKey','valueKey','isEnabled'],
+  displayProperties: ['objects','nameKey','valueKey'],
 
   /**
-    Reflects the value of `isEnabled`.
-    
+    Reflects the value of `isEnabledInPane`.
+
     @field
     @type Boolean
     @default YES
   */
   acceptsFirstResponder: function() {
-    return this.get('isEnabled');
-  }.property('isEnabled'),
+    return this.get('isEnabledInPane');
+  }.property('isEnabledInPane'),
 
   /**
     @type String
@@ -49,32 +49,32 @@ SC.SelectFieldView = SC.FieldView.extend(
     @see SC.View#tagName
   */
   tagName: 'select',
-  
+
   /**
     @type Array
     @default ['sc-select-field-view']
     @see SC.View#classNames
   */
   classNames: ['sc-select-field-view'],
- 
+
   /**
     An array of items that will form the menu you want to show.
-    
+
     @type Array
     @default []
-  */ 
+  */
   objects: [],
-  
+
   /** @private
     Binding default for an array of objects
-  */ 
+  */
   objectsBindingDefault: SC.Binding.multiple(),
 
   /**
-    If you set this to a non-null value, then the name shown for each 
+    If you set this to a non-null value, then the name shown for each
     menu item will be pulled from the object using the named property.
     if this is null, the collection objects themselves will be used.
-    
+
     @type String
     @default null
   */
@@ -87,7 +87,7 @@ SC.SelectFieldView = SC.FieldView.extend(
 
     @type String
     @default null
-  */ 
+  */
   sortKey: null,
 
   /**
@@ -97,12 +97,12 @@ SC.SelectFieldView = SC.FieldView.extend(
 
      @type String
      @default null
-  */ 
+  */
   valueKey: null,
 
   /**
-    set this to non-null to place an empty option at the top of the menu.   
-    
+    set this to non-null to place an empty option at the top of the menu.
+
     @type String
     @default null
   */
@@ -110,34 +110,34 @@ SC.SelectFieldView = SC.FieldView.extend(
 
   /**
     if true, the empty name will be localized.
-    
+
     @type Boolean
     @default NO
   */
   localize: NO,
-  
+
   /** @private
     if true, it means that the nameKey, valueKey or objects changed
   */
   cpDidChange: YES,
-  
+
   /**
-    if true, it means that no sorting will occur, objects will appear 
+    if true, it means that no sorting will occur, objects will appear
     in the same order as in the array
-    
+
     @type Boolean
     @default NO
   */
   disableSort: NO,
-  
+
   /**
     override this to change the enabled/disabled state of menu items as they
     are built.  Return false if you want the menu item to be disabled.
-    
+
     @param itemValue the value for the item to validate
     @param itemName the name of the menu item to validate
     @returns YES if the item should be enabled, NO otherwise
-  */  
+  */
   validateMenuItem: function(itemValue, itemName) {
     return YES;
   },
@@ -145,7 +145,7 @@ SC.SelectFieldView = SC.FieldView.extend(
   /**
     override this method to implement your own sorting of the menu. By
     default, menu items are sorted using the value shown or the sortKey
-    
+
     @param objects the unsorted array of objects to display.
     @returns sorted array of objects
   */
@@ -178,24 +178,24 @@ SC.SelectFieldView = SC.FieldView.extend(
       var fieldValue = this.get('value') ;
       var el, selectElement;
 
-      if ( !this.get('isEnabled') ) context.attr('disabled','disabled');
-        
+      if ( !this.get('isEnabled') ) context.setAttr('disabled','disabled');
+
       // get the localization flag.
-      var shouldLocalize = this.get('localize'); 
-   
+      var shouldLocalize = this.get('localize');
+
       // convert fieldValue to guid, if it is an object.
       if (!valueKey && fieldValue) fieldValue = SC.guidFor(fieldValue) ;
       if ((fieldValue === null) || (fieldValue === '')) fieldValue = '***' ;
-    
+
       if (objects) {
         objects = this.sortObjects(objects) ; // sort'em.
-        // var html = [] ;       
+        // var html = [] ;
         if(!firstTime){
           selectElement=this.$input()[0];
           if (!selectElement) return;
           selectElement.innerHTML='';
-        } 
-      
+        }
+
         var emptyName = this.get('emptyName') ;
         if (emptyName) {
           if (shouldLocalize) emptyName = SC.String.loc(emptyName);
@@ -212,29 +212,29 @@ SC.SelectFieldView = SC.FieldView.extend(
             selectElement.appendChild(el);
           }
         }
-   
+
           // generate option elements.
         objects.forEach(function(object, index) {
         if (object) {
           // either get the name from the object or convert object to string.
           var name = nameKey ? (object.get ? object.get(nameKey) : object[nameKey]) : object.toString() ;
-   
+
           // localize name if specified.
           if(shouldLocalize)
           {
             name = SC.String.loc(name);
           }
-   
+
           // get the value using the valueKey or the object if no valueKey.
           // then convert to a string or use _guid if one of available.
           var value = (valueKey) ? (object.get ? object.get(valueKey) : object[valueKey]) : object ;
-          // if there is no emptyName and no preselected value 
+          // if there is no emptyName and no preselected value
           // then the value should be the value of the first element in the list
           if (!emptyName && index === 0 && fieldValue === '***') {
             this.set('value', value);
           }
           if (value !== null && value !== undefined) value = (SC.guidFor(value)) ? SC.guidFor(value) : value.toString() ;
-   
+
           // render HTML
           var disable = (this.validateMenuItem && this.validateMenuItem(value, name)) ? '' : 'disabled="disabled" ' ;
           if(firstTime){
@@ -257,9 +257,9 @@ SC.SelectFieldView = SC.FieldView.extend(
           }
         }
       }, this );
-   
+
       this.setFieldValue(fieldValue);
-   
+
       } else {
         this.set('value',null);
       }
@@ -278,12 +278,12 @@ SC.SelectFieldView = SC.FieldView.extend(
     this.set('cpDidChange', YES);
     this.propertyDidChange('objects');
   }.observes('*objects.[]'),
-    
+
   /** @private */
   _nameKeyObserver: function() {
     this.set('cpDidChange', YES);
   }.observes('nameKey'),
-   
+
   /** @private */
   _valueKeyObserver: function() {
     this.set('cpDidChange', YES);
@@ -297,23 +297,23 @@ SC.SelectFieldView = SC.FieldView.extend(
   // .......................................
   // PRIVATE
   //
-   
+
   /** @private */
   $input: function() { return this.$(); },
-   
+
   /** @private */
   mouseDown: function(evt) {
-    if (!this.get('isEnabled')) {
+    if (!this.get('isEnabledInPane')) {
       evt.stop();
       return YES;
     } else return sc_super();
   },
-   
+
   /** @private */
   touchStart: function(evt) {
     return this.mouseDown(evt);
   },
-  
+
   /** @private */
   touchEnd: function(evt) {
     return this.mouseUp(evt);
@@ -322,51 +322,51 @@ SC.SelectFieldView = SC.FieldView.extend(
   // when fetching the raw value, convert back to an object if needed...
   /** @private */
   getFieldValue: function() {
-    var value = sc_super(); // get raw value... 
+    var value = sc_super(); // get raw value...
     var valueKey = this.get('valueKey') ;
     var objects = this.get('objects') ;
     var found = null; // matching object goes here.
     var object;
-    
+
     // Handle empty selection.
     if (value == '***') {
       value = null ;
-    
+
     // If no value key was set and there are objects then match back to an
     // object.
     } else if (value && objects) {
       // objects = Array.from(objects) ;
-      
+
       var loc = (SC.typeOf(objects.length) === SC.T_FUNCTION) ? objects.length() : objects.length;
-      
+
       while(!found && (--loc >= 0)) {
         object = objects.objectAt? objects.objectAt(loc) : objects[loc] ;
         if (object === null || object === undefined) continue; // null means placeholder; just skip
-      
+
         // get value using valueKey if there is one or use object
         // map to _guid or toString.
         if (valueKey) object = (object.get) ? object.get(valueKey) : object[valueKey] ;
         var ov = (object !== null && object !== undefined) ? (SC.guidFor(object) ? SC.guidFor(object) : object.toString()) : null ;
-      
+
         // use this object value if it matches.
         if (value == ov) found = object ;
       }
     }
-    
+
     return (valueKey || found) ? found : value;
   },
-  
+
   /** @private */
   setFieldValue: function(newValue) {
-    if (SC.none(newValue)) { 
-      newValue = '***' ; 
+    if (SC.none(newValue)) {
+      newValue = '***' ;
     } else {
       newValue = ((newValue !== null && newValue !== undefined) ? (SC.guidFor(newValue) ? SC.guidFor(newValue) : newValue.toString()) : null );
     }
     this.$input().val(newValue);
     return this ;
   },
-  
+
   /** @private */
   fieldDidFocus: function() {
     var isFocused = this.get('isFocused');
@@ -378,7 +378,7 @@ SC.SelectFieldView = SC.FieldView.extend(
     var isFocused = this.get('isFocused');
     if (isFocused) this.set('isFocused', false);
   },
-  
+
   /** @private */
   _isFocusedObserver: function() {
     this.$().setClass('focus', this.get('isFocused'));
@@ -392,7 +392,7 @@ SC.SelectFieldView = SC.FieldView.extend(
     SC.Event.add(input, 'focus',this, this.fieldDidFocus);
     SC.Event.add(input, 'change',this, this._field_fieldValueDidChange);
   },
-  
+
   /** @private */
   willDestroyLayer: function() {
     var input = this.$input();