sproutcore 1.4.2-java → 1.4.3-java

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 2
+:patch: 3
 :digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
 :dist: 
   frameworks/sproutcore: 7174adeb47aa0930c95ddae79e2c9cf042fded45

data/lib/frameworks/sproutcore/CHANGELOG

@@ -1,10 +1,40 @@
-*SproutCore 1.4.2 (October, 1 2010)*
+*SproutCore 1.4.3 (October 19, 2010)*
+
+* Send a warning to the console when using SC.RecordArray#indexOf or SC.RecordArray#lastIndexOf and providing an object that is
+* Applied fix to the findClassNames function so that class names can be detected when using SproutCore in IE 7 and 8.
+* SC.ObserverSet.add was being overloaded in debug mode by a version that mucked up passing along a context with addObserver. T
+* rendering of select field will now honor isEnabled, ensuring that the control is disabled in the markup if not enabled in cod
+* adding an observer that monitors the objects content (and not just the reference) so that any changes to the content will upd
+* NotEmpty validator would not validate 0 as a non-empty number
+* Spelling fixes in api doc
+* Fix spelling in license header
+* LabelView: allow inline editing of numbers like 0
+* Refactor duplicated code into a function
+* Made errors with not correctly initialized caches obvious to find.
+* Add same guard clause as in insertTab
+* Fix tabbing in the previous direction as well
+* Make tabbing between inline text fields work
+* Make SC.Animatable not crash when it lacks a parent view.
+* Changed SC.Button mixin to support content objects that do not have get
+* Fixed issue with SC.ScrollerView not properly updating its element's class names, e.g., if controlsHidden changed to false, t
+* SC.ScrollerView's thumbs now default to their position -- solves an issue where going back to a view that had already been sc
+* Explicitly check falsity of isReady in SC._object_className so searching for class names in tests work
+* SC.ListItemView checks rightIcon property when determining if click occurred within it
+* For radio buttons with horizontal layoutDirection, added itemWidthKey for custom widths -- fixes Github Issue #27
+* These tests fail because the store status for the child record is only updated when you 'get' the status of the child record.
+* return null instead of undefined from select field view getFieldValue when empty item selected.
+* Sanity check in CollectionView item removal
+* Fixed SC root responder's mousemove function so that last hovered views are exited first before other views are entered
+* Fixes passing contexts with addObserver.
+* Make sure a bad DateTime.parse() doesn't mess up future parses
+
+*SproutCore 1.4.2 (October 1, 2010)*
 
 * Fixes a DateTime .get('lastMonday') bug
 * default to using ISO 8601 format for time parsing if none is specified
 * Allow SelectFieldView to obtain focus if the user presses TAB key from previous field.
 * Fixed typo
 
-*SproutCore 1.4.1 (September, 21 2010)*
+*SproutCore 1.4.1 (September 21, 2010)*
 
 * Update the X-SproutCore-Version header to 1.4 [MO]

data/lib/frameworks/sproutcore/frameworks/animation/core.js

@@ -279,7 +279,7 @@ SC.Animatable = {
     this.layout = start;
 
     // get our frame and parent's frame
-    var p = this.computeParentDimensions();
+    var p = this.computeParentDimensions(this.get("frame"));
     var f = this.computeFrameWithParentFrame(p);
 
     // set back to target

data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js

@@ -223,7 +223,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     @returns {Number} index
   */
   indexOf: function(record, startAt) {
-    if (!SC.kindOf(record, SC.Record)) return NO ; // only takes records
+    if (!SC.kindOf(record, SC.Record)) {
+      SC.Logger.warn("Using indexOf on %@ with an object that is not an SC.Record".fmt(record));
+      return -1; // only takes records
+    }
     
     this.flush();
     
@@ -241,7 +244,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     @returns {Number} index
   */
   lastIndexOf: function(record, startAt) {
-    if (!SC.kindOf(record, SC.Record)) return NO ; // only takes records
+    if (!SC.kindOf(record, SC.Record)) {
+      SC.Logger.warn("Using lastIndexOf on %@ with an object that is not an SC.Record".fmt(record));
+      return -1; // only takes records
+    }
 
     this.flush();
     

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js

@@ -222,9 +222,9 @@ test("Child Status Changed", function() {
   equals(cr.get('status'), testParent.get('status'), 'after initializing the parent to READY_NEW, check that the child record matches');
   
   SC.RunLoop.begin();
-  store.writeStatus(testParent.storeKey, SC.Record.DIRTY_NEW);
+  store.writeStatus(testParent.storeKey, SC.Record.READY_DIRTY);
   store.dataHashDidChange(testParent.storeKey);
-  equals(cr.get('status'), testParent.get('status'), 'after setting the parent to DIRTY_NEW, check that the child record matches');
+  equals(cr.get('status'), testParent.get('status'), 'after setting the parent to READY_DIRTY, check that the child record matches');
   SC.RunLoop.end();
   
   SC.RunLoop.begin();
@@ -233,3 +233,43 @@ test("Child Status Changed", function() {
   equals(cr.get('status'), testParent.get('status'), 'after setting the parent to BUSY_REFRESH, check that the child record matches');
   SC.RunLoop.end();
 });
+
+test("Child Status Matches Store Status", function() {
+  var cr;
+  var storeStatus;
+  cr = testParent.get('info');
+  
+  storeStatus = store.readStatus(cr.storeKey);
+  equals(storeStatus, cr.get('status'), 'after initializing the parent to READY_NEW, check that the store status matches for the child');
+  equals(cr.get('status'), testParent.get('status'), 'after initializing the parent to READY_NEW, check that the child record matches');
+  
+  SC.RunLoop.begin();
+  store.writeStatus(testParent.storeKey, SC.Record.READY_CLEAN);
+  store.dataHashDidChange(testParent.storeKey);
+  SC.RunLoop.end();
+  
+  storeStatus = store.readStatus(cr.storeKey);
+  equals(testParent.get('status'), SC.Record.READY_CLEAN, 'parent status should be READY_CLEAN');
+  equals(storeStatus, cr.get('status'), 'after setting the parent to READY_CLEAN, the child\'s status and store status should be READY_CLEAN before calling get(\'status\') on the child');
+  equals(cr.get('status'), testParent.get('status'), 'after setting the parent to READY_CLEAN, check that the child record matches');
+  
+  SC.RunLoop.begin();
+  store.writeStatus(testParent.storeKey, SC.Record.READY_DIRTY);
+  store.dataHashDidChange(testParent.storeKey);
+  SC.RunLoop.end();
+  
+  storeStatus = store.readStatus(cr.storeKey);
+  equals(testParent.get('status'), SC.Record.READY_DIRTY, 'parent status should be READY_DIRTY');
+  equals(storeStatus, cr.get('status'), 'after setting the parent to READY_DIRTY, the child\'s status and store status should be READY_DIRTY before calling get(\'status\') on the child');
+  equals(cr.get('status'), testParent.get('status'), 'after setting the parent to READY_DIRTY, check that the child record matches');
+  
+  SC.RunLoop.begin();
+  store.writeStatus(testParent.storeKey, SC.Record.BUSY_REFRESH);
+  store.dataHashDidChange(testParent.storeKey);
+  storeStatus = store.readStatus(cr.storeKey);
+  SC.RunLoop.end();
+  
+  equals(testParent.get('status'), SC.Record.BUSY_REFRESH, 'parent status should be BUSY_REFRESH');
+  equals(storeStatus, cr.get('status'), 'after setting the parent to BUSY_REFRESH, the child\'s status and store status should be BUSY_REFRESH before calling get(\'status\') on the child');
+  equals(cr.get('status'), testParent.get('status'), 'after setting the parent to BUSY_REFRESH, check that the child record matches');
+});

data/lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js

@@ -21,7 +21,7 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
   
   SC.ObserverSet.add = function(target, method, context, originatingTarget, originatingMethod, originatingStack) {
     var targetGuid = (target) ? SC.guidFor(target) : "__this__";
-    
+
     // get the set of methods
     var methods = this[targetGuid] ;
     if (!methods) {
@@ -31,16 +31,16 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
       this.targets++ ;
     }
     methods.add(method) ;
-    
+
     // context is really useful sometimes but not used that often so this
     // implementation is intentionally lazy.
     if (context !== undefined) {
-      var contexts = methods.contexts ;
-      if (!contexts) contexts = {};
-      contexts[SC.guidFor(method)] = context ;
+      if (!methods.contexts) methods.contexts = {} ;
+      methods.contexts[SC.guidFor(method)] = context ;
     }
-    
-    
+
+    this._membersCacheIsValid = NO ;
+
     // THIS IS THE PORTION THAT DIFFERS FROM THE STANDARD IMPLEMENTATION
     
     // Recording the calling object/function can be a useful debugging tool.
@@ -76,11 +76,6 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
         originatingStacks[key]  = originatingStack;
       }
     }
-    
-    // THIS IS THE PORTION THAT DIFFERS FROM THE STANDARD IMPLEMENTATION
-    
-    
-    this._membersCacheIsValid = NO ;
   };
   
   

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

@@ -10,7 +10,8 @@
 htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
 var itemList = [{ title: "Red", value: "red", enabled: YES }, { title: "Green", value: "green" }, { title: "Blue", value: "blue" }],
-itemList2 = [{ title: "Cyan", value: "cyan", enabled: YES }, { title: "Magenta", value: "magenta" }, { title: "Yellow", value: "yellow" },{ title: "blacK", value: "black"}];
+itemList2 = [{ title: "Cyan", value: "cyan", enabled: YES }, { title: "Magenta", value: "magenta" }, { title: "Yellow", value: "yellow" },{ title: "blacK", value: "black"}],
+itemList3 = [{ title: "Red", value: "red", enabled: YES, width: 30 }, { title: "Green", value: "green", width: 50 }, { title: "Blue", value: "blue", width: 40 }];
 
 var pane = SC.ControlTestPane.design()
   .add("basic", SC.RadioView, {
@@ -56,6 +57,16 @@ var pane = SC.ControlTestPane.design()
     items: 'Yes No'.w(),
     // LAYOUT_VERTICAL is default
     layoutDirection: SC.LAYOUT_HORIZONTAL
+  })
+  
+  .add("horizontal widths", SC.RadioView, {
+    value: "",
+    isEnabled: YES,
+    items: itemList3,
+    layoutDirection: SC.LAYOUT_HORIZONTAL,
+    itemTitleKey: 'title',
+    itemValueKey: 'value',
+    itemWidthKey: 'width'
   });
 
 pane.show(); // add a test to show the test pane
@@ -230,3 +241,13 @@ test("enabled first", function() {
   });
 });
 
+test("item widths", function() {
+  var radioButtons = pane.view('horizontal widths').$('.sc-radio-button'),
+      widths = [30, 50, 40],
+      idx = 0, radio;
+  
+  radioButtons.forEach(function(elem) {
+    equals(SC.$(elem).width(), widths[idx], 'radio button %@ should width specified by itemWidthKey'.fmt(idx, widths[idx]));
+    idx++;
+  });
+});

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

@@ -905,7 +905,7 @@ SC.CollectionView = SC.View.extend(
         // to reuse it.
         // (Charles Jolley personally guarantees this code)
         layer = existing.get('layer');
-        layer.parentNode.removeChild(layer);
+        if (layer && layer.parentNode) layer.parentNode.removeChild(layer);
         
         containerView.removeChild(existing);
       }

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

@@ -217,7 +217,7 @@ SC.ListView = SC.CollectionView.extend(
       // prefill the cache with custom rows.
       cache = this._sclv_offsetCache;
       if (!cache) {
-        cache = this._sclv_offsetCache = [];
+        cache = [];
         delta = max = 0 ;
         custom.forEach(function(idx) {
           delta += this.rowHeightForContentIndex(idx)-rowHeight;
@@ -225,6 +225,8 @@ SC.ListView = SC.CollectionView.extend(
           max = idx ;
         }, this);
         this._sclv_max = max+1;
+        // moved down so that the cache is not marked as initialized until it actually is
+        this._sclv_offsetCache = cache;
       }
       
       // now just get the delta for the last custom row before the current 
@@ -259,11 +261,13 @@ SC.ListView = SC.CollectionView.extend(
     if (del.customRowHeightIndexes && (indexes=del.get('customRowHeightIndexes'))) {
       cache = this._sclv_heightCache ;
       if (!cache) {
-        cache = this._sclv_heightCache = [];
+        cache = [];
         content = this.get('content');
         indexes.forEach(function(idx) {
           cache[idx] = del.contentIndexRowHeight(this, content, idx);
         }, this);
+        // moved down so that the cache is not marked as initialized until it actually is
+        this._sclv_heightCache = cache;
       }
       
       ret = cache[idx];

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

@@ -500,7 +500,7 @@ SC.ListItemView = SC.View.extend(
   */
   _isInsideRightIcon: function(evt) {
     var del = this.displayDelegate ;
-    var rightIconKey = this.getDelegateProperty('hasContentRightIcon', del) ;
+    var rightIconKey = this.getDelegateProperty('hasContentRightIcon', del) || !SC.none(this.rightIcon);
     return rightIconKey && this._isInsideElementWithClassName('right-icon', evt);
   },
   

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

@@ -89,6 +89,17 @@ SC.RadioView = SC.View.extend(SC.Control,
     the title with this itemTitleKey property.
   */
   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_HORIONZTAL and can be used to override
+    the default value provided by the framework or theme CSS.
+    
+    @property {String}
+    @default null
+  */
+  itemWidthKey: null,
 
   /** 
     If items property is a hash, specify which property will function as
@@ -142,9 +153,12 @@ SC.RadioView = SC.View.extend(SC.Control,
   displayProperties: ['value', '_displayItems'],
 
   render: function(context, firstTime) {
-    var item, idx, icon, name, itemsLength, url, className, disabled, sel, labelText, selectionState, selectionStateClassNames, items = this.get('_displayItems'),
-    value = this.get('value'),
-    isArray = SC.isArray(value);
+    var items = this.get('_displayItems'),
+        value = this.get('value'),
+        isArray = SC.isArray(value),
+        item, idx, icon, name, width, itemsLength, url,
+        className, disabled, sel, labelText,
+        selectionState, selectionStateClassNames;
 
     context.addClass(this.get('layoutDirection'));
 
@@ -186,8 +200,11 @@ SC.RadioView = SC.View.extend(SC.Control,
 
         labelText = this.escapeHTML ? SC.RenderContext.escapeHTML(item[0]) : item[0];
         
-        context.push('<div class="sc-radio-button ', 
-                    selectionStateClassNames, '" ', 
+        width = item[4];
+        
+        context.push('<div class="sc-radio-button ',
+                    selectionStateClassNames, '" ',
+                    width ? 'style="width: ' + width + 'px;" ' : '',
                     'aria-checked="', sel ? 'true':'false','" ',
                     'role="radio"' , ' index="', idx,'">',
                     '<span class="button"></span>',
@@ -209,6 +226,10 @@ SC.RadioView = SC.View.extend(SC.Control,
         } else {
           sel = NO;
         }
+        
+        width = item[4];
+        if (width) button.width(width);
+        
         selectionState = this._getSelectionStateClassNames(item, sel, value, isArray, true);
         button.attr('aria-checked', sel ? 'true': 'false');
         // set class of label
@@ -232,11 +253,14 @@ SC.RadioView = SC.View.extend(SC.Control,
   _displayItems: function() {
     var items = this.get('items'), 
         loc = this.get('localize'),
-        titleKey = this.get('itemTitleKey'), valueKey = this.get('itemValueKey'),
+        titleKey = this.get('itemTitleKey'),
+        valueKey = this.get('itemValueKey'),
+        widthKey = this.get('itemWidthKey'),
+        isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL,
         isEnabledKey = this.get('itemIsEnabledKey'), 
         iconKey = this.get('itemIconKey'),
         ret = [], max = (items)? items.get('length') : 0,
-        item, title, value, idx, isArray, isEnabled, icon;
+        item, title, width, value, idx, isArray, isEnabled, icon;
     
     for(idx=0;idx<max;idx++) {
       item = items.objectAt(idx); 
@@ -253,7 +277,11 @@ SC.RadioView = SC.View.extend(SC.Control,
         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;
@@ -274,11 +302,11 @@ SC.RadioView = SC.View.extend(SC.Control,
 
       // localize title if needed
       if (loc) title = title.loc();
-      ret.push([title, value, isEnabled, icon]);
+      ret.push([title, value, isEnabled, icon, width]);
     }
 
     return ret; // done!
-  }.property('items', 'itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'localize', 'itemIconKey').cacheable(),
+  }.property('items', 'itemTitleKey', 'itemWidthKey', 'itemValueKey', 'itemIsEnabledKey', 'localize', 'itemIconKey').cacheable(),
 
   /** @private - 
     Will figure out what class names to assign each radio button.

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

@@ -198,7 +198,7 @@ SC.ScrollerView = SC.View.extend(
     @private
   */
   render: function(context, firstTime) {
-    var classNames = [],
+    var classNames = {},
         buttons = '',
         thumbPosition, thumbLength, thumbCenterLength, thumbElement,
         value, max, scrollerLength, length, pct;
@@ -207,21 +207,21 @@ SC.ScrollerView = SC.View.extend(
     // style them differently using CSS.
     switch (this.get('layoutDirection')) {
       case SC.LAYOUT_VERTICAL:
-        classNames.push('sc-vertical');
+        classNames['sc-vertical'] = YES;
         break;
       case SC.LAYOUT_HORIZONTAL:
-        classNames.push('sc-horizontal');
+        classNames['sc-horizontal'] = YES;
         break;
     }
 
     // The appearance of the scroller changes if disabled
-    if (!this.get('isEnabled')) classNames.push('disabled');
+    classNames['disabled'] = !this.get('isEnabled');
     // Whether to hide the thumb and buttons
-    if (this.get('controlsHidden')) classNames.push('controls-hidden');
+    classNames['controls-hidden'] = this.get('controlsHidden');
 
     // Change the class names of the DOM element all at once to improve
     // performance
-    context.addClass(classNames);
+    context.setClass(classNames);
 
     // Calculate the position and size of the thumb
     thumbLength = this.get('thumbLength');
@@ -240,7 +240,7 @@ SC.ScrollerView = SC.View.extend(
         context.push('<div class="track"></div>',
                       '<div class="cap"></div>',
                       buttons,
-                      '<div class="thumb" style="height: '+thumbLength+'px;">',
+                      '<div class="thumb" style="height: '+thumbLength+'px; top: ' + thumbPosition + 'px;">',
                       '<div class="thumb-center"></div>',
                       '<div class="thumb-top"></div>',
                       '<div class="thumb-bottom"></div></div>');
@@ -249,7 +249,7 @@ SC.ScrollerView = SC.View.extend(
         context.push('<div class="track"></div>',
                       '<div class="cap"></div>',
                       buttons,
-                      '<div class="thumb" style="width: '+thumbLength+'px;">',
+                      '<div class="thumb" style="width: '+thumbLength+'px; left: ' + thumbPosition + 'px;">',
                       '<div class="thumb-center"></div>',
                       '<div class="thumb-top"></div>',
                       '<div class="thumb-bottom"></div></div>');

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

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /**

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

@@ -122,7 +122,9 @@ SC.SelectFieldView = SC.FieldView.extend(
       var objects = this.get('objects') ;
       var fieldValue = this.get('value') ;
       var el, selectElement;
-    
+
+      if ( !this.get('isEnabled') ) context.attr('disabled','disabled');
+        
       // get the localization flag.
       var shouldLocalize = this.get('localize'); 
    
@@ -208,12 +210,17 @@ SC.SelectFieldView = SC.FieldView.extend(
     }
   },
   
-  displayProperties: ['objects','nameKey','valueKey'],
+  displayProperties: ['objects','nameKey','valueKey','isEnabled'],
 
   _objectsObserver: function() {
     this.set('cpDidChange', YES);
   }.observes('objects'),
-   
+
+  _objectArrayObserver: function() {
+    this.set('cpDidChange', YES);
+    this.propertyDidChange('objects');
+  }.observes('*objects.[]'),
+    
   _nameKeyObserver: function() {
     this.set('cpDidChange', YES);
   }.observes('nameKey'),
@@ -247,7 +254,8 @@ SC.SelectFieldView = SC.FieldView.extend(
     var value = sc_super(); // get raw value... 
     var valueKey = this.get('valueKey') ;
     var objects = this.get('objects') ;
-    var found, object;
+    var found = null; // matching object goes here.
+    var object;
     
     // Handle empty selection.
     if (value == '***') {
@@ -260,7 +268,6 @@ SC.SelectFieldView = SC.FieldView.extend(
       
       var loc = (SC.typeOf(objects.length) === SC.T_FUNCTION) ? objects.length() : objects.length;
       
-      found = null ; // matching object goes here.
       while(!found && (--loc >= 0)) {
         object = objects.objectAt? objects.objectAt(loc) : objects[loc] ;
         if (!object) continue; // null means placeholder; just skip