sproutcore 1.10.1 → 1.10.2

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module, test, clearHtmlbody, htmlbody, ok, equals, same, stop, start */
 
 
 function evaluatePicker(pane) {
@@ -24,74 +24,112 @@ function evaluatePicker(pane) {
 
 var anchor = SC.ControlTestPane.design()
   .add("anchor", SC.ButtonView, {
-     title: "Anchor Button"
+    title: "Anchor Button"
   });
 
 module("SC.PickerPane UI", {
-  setup: function(){
+  setup: function () {
     htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
     anchor.standardSetup().setup();
   },
-  teardown: function(){
+  teardown: function () {
     anchor.standardSetup().teardown();
     clearHtmlbody();
   }
 });
 
 
-var paneDefault ;
-var paneMenu ;
-var paneFixed ;
-var panePointer ;
+var paneDefault;
+var paneMenu;
+var paneFixed;
+var panePointer;
 
-test("verify default picker pane content container is visible at correct location with right size", function() {
+test("verify default picker pane content container is visible at correct location with right size", function () {
   paneDefault = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
-  paneDefault.popup(anchor.view('anchor'), SC.PICKER);
+  SC.run(function () {
+    paneDefault.popup(anchor.view('anchor'), SC.PICKER);
+  });
+  evaluatePicker(paneDefault);
+  paneDefault.remove();
+  paneDefault.destroy();
+});
+
+test("verify default picker pane content container is visible at correct location with right size (live resize)", function () {
+  var lowAnchor = SC.Pane.create({
+    layout: { bottom: 0, height: 10, centerX: 0, width: 10 }
+  });
+
+  paneDefault = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
+    contentView: SC.View.extend({
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
+    })
+  });
+  SC.run(function () {
+    lowAnchor.append();
+    paneDefault.popup(lowAnchor.get('layer'), SC.PICKER);
+  });
   evaluatePicker(paneDefault);
+
+  var firstLayout = paneDefault.get('layout');
+  SC.run(function () {
+    paneDefault.adjust('height', 300);
+  });
+  var newLayout = paneDefault.get('layout');
+  equals(newLayout.height, 300, "The new height should be");
+  equals(newLayout.top, firstLayout.top - 100, "The new top should be");
+
   paneDefault.remove();
   paneDefault.destroy();
-}) ;
+});
 
-test("verify menu picker pane content container is visible at correct location with right size", function() {
+test("verify menu picker pane content container is visible at correct location with right size", function () {
   paneMenu = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
-  paneMenu.popup(anchor.view('anchor'), SC.PICKER_MENU);
+  SC.run(function () {
+    paneMenu.popup(anchor.view('anchor'), SC.PICKER_MENU);
+  });
   evaluatePicker(paneMenu);
   paneMenu.remove();
   paneMenu.destroy();
-}) ;
+});
 
-test("verify fixed picker pane content container is visible at correct location with right size", function() {
+test("verify fixed picker pane content container is visible at correct location with right size", function () {
   paneFixed = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
-  paneFixed.popup(anchor.view('anchor'), SC.PICKER_FIXED);
+
+  SC.run(function () {
+    paneFixed.popup(anchor.view('anchor'), SC.PICKER_FIXED);
+  });
   evaluatePicker(paneFixed);
   paneFixed.remove();
   paneFixed.destroy();
-}) ;
+});
 
-test("verify pointer picker pane content container is visible at correct location with right size", function() {
+test("verify pointer picker pane content container is visible at correct location with right size", function () {
   panePointer = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
-  panePointer.popup(anchor.view('anchor'), SC.PICKER_POINTER, [3,0,1,2,2]);
+  SC.run(function () {
+    panePointer.popup(anchor.view('anchor'), SC.PICKER_POINTER, [3, 0, 1, 2, 2]);
+  });
   evaluatePicker(panePointer);
   panePointer.remove();
   panePointer.destroy();
-}) ;
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/methods.js

@@ -73,7 +73,7 @@ test("isEnabled=NO isEditable=NO should add disabled attribute", function() {
   view0.set('isEditable', NO);
   SC.RunLoop.end();
   ok(view0.$input().attr('disabled'), 'should have disabled attribute');
-  ok(!view0.$input().attr('readOnly'), 'should not have readOnly attribute');
+  ok(view0.$input().attr('readOnly'), 'should have readOnly attribute');
 });
 
 test("isEnabled=NO isEditable=YES should add disabled attribute", function() {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/methods.js

@@ -121,7 +121,11 @@ test("Check if setting a value actually changes the selection value", function()
 
 //test10
 test('Setting the view\'s items should not result in an error.', function() {
-  try { view1.set('items', null); }
+  try {
+    SC.RunLoop.begin() ;
+    view1.set('items', null);
+    SC.RunLoop.end() ;
+  }
   catch (e) {
     ok(false, 'Nulling out items should not throw an error.');
   }
@@ -142,3 +146,13 @@ test("The properties for select button should take the specified values", functi
   equals(prop1,'custom-menu-item','Custom view class name should be custom-menu-item');
   equals(prop2,46,'Custom view menu off set width should be 46');
 });
+
+test("The content of the popup should be recalculated correctly when the list of items changes", function() {
+  equals(view3.get("_itemList")[2].title, "World", "The list should have on the 3rd position the title World");
+  SC.RunLoop.begin() ;
+  view4.get('items').insertAt( 0, { title: "Moving", pos: 0 } ) ;
+  view3.set('items', ["It", "Works", "Again"] );
+  SC.RunLoop.end() ;
+  equals(view4.get("_itemList")[0].title, "Moving", "The list should start with new item Moving");
+  equals(view3.get("_itemList")[2].title, "Again", "The list should have on the 3rd position the title Again");
+});

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

@@ -854,7 +854,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
   /** @private */
   didAppendToDocument: function() {
     if(SC.browser.isIE &&
-        SC.browser.compare(SC.browser.engineVersion, '7') === 0 &&
+        SC.browser.compare(SC.browser.version, '7') === 0 &&
         this.get('useStaticLayout')){
       var layout = this.get('layout'),
           elem = this.$(), w=0;

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

@@ -294,6 +294,16 @@ SC.PopupButtonView = SC.ButtonView.extend(
     var menu = this.get('instantiatedMenu') ;
 
     return (!!menu && menu.performKeyEquivalent(charCode, evt, YES)) ;
+  },
+
+  /** @private */
+  touchStart: function(evt) {
+    return this.mouseDown(evt);
+  },
+
+  /** @private */
+  touchEnd: function(evt) {
+    return this.mouseUp(evt);
   }
 
 });

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

@@ -2007,7 +2007,7 @@ SC.ScrollView = SC.View.extend({
       }
 
       // Notify the child that its frame is changing.
-      content.notifyPropertyChange('frame');
+      if (content._viewFrameDidChange) { content._viewFrameDidChange(); }
     }
 
     if (container && !SC.platform.touch) {

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

@@ -226,10 +226,10 @@ SC.SelectView = SC.ButtonView.extend(
 
   /**
     @type SC.Array
-    @default ['icon', 'value','controlSize','items']
+    @default ['icon', 'value','controlSize']
     @see SC.View#displayProperties
   */
-  displayProperties: ['icon', 'value','controlSize','items', 'escapeHTML', 'emptyName'],
+  displayProperties: ['icon', 'value','controlSize', 'escapeHTML', 'emptyName'],
 
   /**
     Prefer matrix to position the select button menu such that the
@@ -333,6 +333,16 @@ SC.SelectView = SC.ButtonView.extend(
   */
   supportFocusRing: YES,
 
+  /**
+  * @private
+  * Overwritten to calculate the content corresponding to items configured at creation
+  */
+  init: function() {
+    sc_super();
+
+    this.itemsDidChange();
+  },
+
   /**
     Left Alignment based on the size of the button
 
@@ -376,12 +386,11 @@ SC.SelectView = SC.ButtonView.extend(
   },
 
   /**
-    render method
+    Observer called whenever the items collection or an element of this collection changes
 
     @private
   */
-  render: function (context,firstTime) {
-
+  itemsDidChange: function() {
     var escapeHTML, items, len, nameKey, iconKey, valueKey, separatorKey, showCheckbox,
         currentSelectedVal, shouldLocalize, isSeparator, itemList, isChecked,
         idx, name, icon, value, item, itemEnabled, isEnabledKey, emptyName, isSameRecord;
@@ -544,27 +553,19 @@ SC.SelectView = SC.ButtonView.extend(
       this.set('_itemList', itemList);
     }, this );
 
-    if (firstTime) {
-      this.invokeLast(function () {
-        var value = this.get('value');
-        if (SC.none(value)) {
-          if (SC.none(emptyName)) {
-            this.set('value', this._defaultVal);
-            this.set('title', this._defaultTitle);
-            this.set('icon', this._defaultIcon);
-          }
-          else this.set('title', emptyName);
-        }
-      });
+    var value = this.get('value');
+    if (SC.none(value)) {
+      if (SC.none(emptyName)) {
+        this.set('value', this._defaultVal);
+        this.set('title', this._defaultTitle);
+        this.set('icon', this._defaultIcon);
+      }
+      else this.set('title', emptyName);
     }
 
     //Set the preference matrix for the menu pane
-    this.changeSelectPreferMatrix(this.get("_itemIdx"));
-
-    // If we're going to do such a stupid render function where we set properties
-    // on ourself, then we should use those properties in this pass.
-    sc_super();
-  },
+    this.changeSelectPreferMatrix();
+  }.observes( '*items.[]' ),
 
   /**
     @private

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

@@ -33,6 +33,10 @@ SC.RESIZE_AUTOMATIC = 'sc-automatic-resize';
   SC.SplitView arranges multiple views side-by-side or on top of each
   other.
 
+  By default, SC.SplitView sets `size` and `position` properties on the
+  child views, leaving it up to the child view to adjust itself. For good
+  default behavior, mix SC.SplitChild into your child views.
+
   SplitView can resize its children to fit (the default behavior),
   or resize itself to fit its children--allowing you to build column-
   based file browsers and the like. As one child (a divider, most likely)

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/popup_button.js

@@ -259,6 +259,16 @@ SC.PopupButtonView = SC.ButtonView.extend({
     }
 
     return sc_super();
+  },
+
+  /** @private */
+  touchStart: function(evt) {
+    return this.mouseDown(evt);
+  },
+
+  /** @private */
+  touchEnd: function(evt) {
+    return this.mouseUp(evt);
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/foundation/delegates/inline_text_field.js

@@ -72,15 +72,15 @@ SC.InlineTextFieldDelegate = /** @scope SC.InlineTextFieldDelegate */{
   },
 
   /**
-    Cleans up the given editor by simply removing it from the view hierarchy. The
-    client view should null any references to the editor so it may be garbage
-    collected.
+    Cleans up the given editor by simply destroying it, which removes it from
+    the view hierarchy. The client view should null any references to the editor
+    so it may be garbage collected.
 
     @params {SC.InlineEditor} editor the editor that should be cleaned up
     @returns {Boolean} whether the cleanup succeeded
   */
   releaseEditor: function (editor) {
-    editor.removeFromParent();
+    editor.destroy();
 
     this.editor = null;
 

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js

@@ -6,36 +6,53 @@
 // ==========================================================================
 
 /**
-  @namespace 
+  @namespace
 
-  Use this mixin to automatically mix in a a collection of mixins into all
+  Use this mixin to automatically mix in a list of mixins into all
   child views created _by the view_ (that are created at view initialization).
-  
+
   @since SproutCore 1.0
 */
 SC.AutoMixin = {
 
   /**
-    The mixins to automatically mix in.
-    @property
+    An array of mixins to automatically mix in to each child view of this
+    view when the child view is created.
+
+    @type Array
+    @default []
   */
   autoMixins: [],
-  
+
   /**
     @private
     Override createChildViews to mix in the mixins defined in autoMixins.
   */
-  createChildView: function(v, attrs) {
-    if (!attrs) attrs = {};
+  createChildView: function (view, attrs) {
+    if (!view.isClass) {
+      attrs = view;
+    } else {
+      // attrs should always exist...
+      if (!attrs) { attrs = {}; }
+      // clone the hash that was given so we do not pollute it if it's being reused
+      else { attrs = SC.clone(attrs); }
+    }
+
     attrs.owner = attrs.parentView = this;
-    attrs.isVisibleInWindow = this.get('isVisibleInWindow');
     if (!attrs.page) attrs.page = this.page;
-    
-    var applyMixins = this.get("autoMixins");
-    applyMixins.push(attrs);
-    
-    v = v.create.apply(v, applyMixins);
-    return v;
+
+    if (view.isClass) {
+      // Track that we created this view.
+      attrs.createdByParent = true;
+
+      // Add the mixins to the child's attributes.
+      var applyMixins = SC.clone(this.get("autoMixins"));
+      applyMixins.push(attrs);
+
+      view = view.create.apply(view, applyMixins);
+    }
+
+    return view;
   }
 
-};
+};

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js

@@ -136,7 +136,15 @@ SC.ContentValueSupport = {
       var contentKey;
 
       for (contentKey in contentKeys) {
-        if (key === '*' || key === this.getDelegateProperty(contentKey, this, this.get('displayDelegate'), contentKeys)) return this.updatePropertyFromContent(contentKeys[contentKey], key, contentKey, target);
+        // if we found the specific contentKey, then just update that and we're done
+        if (key === this.getDelegateProperty(contentKey, this, this.get('displayDelegate'), contentKeys)) {
+          return this.updatePropertyFromContent(contentKeys[contentKey], key, contentKey, target);
+        }
+
+        // else if '*' is changed, then update for every contentKey
+        else if (key === '*') {
+          this.updatePropertyFromContent(contentKeys[contentKey], key, contentKey, target);
+        }
       }
     }
 
@@ -289,13 +297,13 @@ SC.ContentValueSupport = {
       }
     }
 
-    // update previous values
-    this._control_content = content;
-    this._old_contentValueKeys = oldKeys;
-
-    // notify that value did change.
+    // notify that values did change.
     key = (!key || key === 'content') ? '*' : this.get(key);
     if (key) this.contentPropertyDidChange(content, key);
+
+    // Cache values for clean up.
+    this._control_content = content;
+    this._old_contentValueKeys = oldKeys;
   }.observes('content'),
 
   /** @private

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/control.js

@@ -23,7 +23,7 @@ SC.AUTO_CONTROL_SIZE = '__AUTO__';
   @type String
   @constant
 */
-SC.JUMBO_CONTROL_SIZE = 'sc-jumbo-size' ;
+SC.JUMBO_CONTROL_SIZE = 'sc-jumbo-size';
 
 /**
   Option for HUGE control size.
@@ -31,7 +31,7 @@ SC.JUMBO_CONTROL_SIZE = 'sc-jumbo-size' ;
   @type String
   @constant
 */
-SC.HUGE_CONTROL_SIZE = 'sc-huge-size' ;
+SC.HUGE_CONTROL_SIZE = 'sc-huge-size';
 
 /**
   Option for large control size.
@@ -39,7 +39,7 @@ SC.HUGE_CONTROL_SIZE = 'sc-huge-size' ;
   @type String
   @constant
 */
-SC.LARGE_CONTROL_SIZE = 'sc-large-size' ;
+SC.LARGE_CONTROL_SIZE = 'sc-large-size';
 
 /**
   Option for standard control size.
@@ -47,7 +47,7 @@ SC.LARGE_CONTROL_SIZE = 'sc-large-size' ;
   @type String
   @constant
 */
-SC.REGULAR_CONTROL_SIZE = 'sc-regular-size' ;
+SC.REGULAR_CONTROL_SIZE = 'sc-regular-size';
 
 /**
   Option for small control size.
@@ -55,7 +55,7 @@ SC.REGULAR_CONTROL_SIZE = 'sc-regular-size' ;
   @type String
   @constant
 */
-SC.SMALL_CONTROL_SIZE = 'sc-small-size' ;
+SC.SMALL_CONTROL_SIZE = 'sc-small-size';
 
 /**
   Option for tiny control size
@@ -63,7 +63,7 @@ SC.SMALL_CONTROL_SIZE = 'sc-small-size' ;
   @type String
   @constant
 */
-SC.TINY_CONTROL_SIZE = 'sc-tiny-size' ;
+SC.TINY_CONTROL_SIZE = 'sc-tiny-size';
 
 /**
   @namespace
@@ -203,16 +203,18 @@ SC.Control = SC.mixin(SC.clone(SC.ContentValueSupport),
     @observes 'fieldLabel'
     @observes 'fieldKey'
   */
-  errorLabel: function() {
-    var ret, fk, def, locFK;
-    if (ret = this.get('fieldLabel')) return ret;
+  errorLabel: function () {
+    var ret = this.get('fieldLabel'), fk, def, locFK;
+
+    // Fast path!
+    if (ret) return ret;
 
     // if field label is not provided, compute something...
     fk = this.get('fieldKey') || this.constructor.toString();
     def = fk ? SC.String.capitalize(SC.String.humanize(fk)) : '';
     locFK = SC.String.locWithDefault("FieldKey." + fk, def);
     return SC.String.locWithDefault("ErrorLabel." + fk, locFK);
-  }.property('fieldLabel','fieldKey').cacheable(),
+  }.property('fieldLabel', 'fieldKey').cacheable(),
 
   /**
     The control size.  This will set a CSS style on the element that can be
@@ -239,14 +241,16 @@ SC.Control = SC.mixin(SC.clone(SC.ContentValueSupport),
     Invoke this method in your updateDisplay() method to update any basic
     control CSS classes.
   */
-  renderMixin: function(context, firstTime) {
-    var sel = this.get('isSelected'), disabled = !this.get('isEnabled'),
-    // update the CSS classes for the control.  note we reuse the same hash
-    // to avoid consuming more memory
-    names = this._CONTROL_TMP_CLASSNAMES ; // temporary object
+  renderMixin: function (context, firstTime) {
+    var sel = this.get('isSelected'),
+      disabled = !this.get('isEnabledInPane'),
+      // update the CSS classes for the control.  note we reuse the same hash
+      // to avoid consuming more memory
+      names = this._CONTROL_TMP_CLASSNAMES; // temporary object
+
     names.mixed = sel === SC.MIXED_STATE;
-    names.sel = sel && (sel !== SC.MIXED_STATE) ;
-    names.active = this.get('isActive') ;
+    names.sel = sel && (sel !== SC.MIXED_STATE);
+    names.active = this.get('isActive');
 
     var controlSize = this.get("controlSize");
     if (!controlSize) {
@@ -272,7 +276,8 @@ SC.Control = SC.mixin(SC.clone(SC.ContentValueSupport),
     // tags
     if (!firstTime && this.$input) {
       var inps = this.$input();
-      if(inps.attr('type')!=="radio"){
+
+      if (inps.attr('type') !== "radio") {
         this.$input().attr('disabled', disabled);
       }
     }

data/lib/frameworks/sproutcore/frameworks/foundation/system/user_defaults.js

@@ -82,7 +82,7 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
 
     // attempt to read from localStorage
     isIE7 = SC.browser.isIE &&
-        SC.browser.compare(SC.browser.engineVersion, '7') === 0;
+        SC.browser.compare(SC.browser.version, '7') === 0;
 
     if(isIE7) {
       localStorage=document.body;
@@ -149,7 +149,7 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
 
     // save to local storage
     isIE7 = SC.browser.isIE &&
-        SC.browser.compare(SC.browser.engineVersion, '7') === 0;
+        SC.browser.compare(SC.browser.version, '7') === 0;
 
     if(isIE7){
       localStorage=document.body;
@@ -218,7 +218,7 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
     if (written) delete written[userKeyName];
 
     isIE7 = SC.browser.isIE &&
-        SC.browser.compare(SC.browser.engineVersion, '7') === 0;
+        SC.browser.compare(SC.browser.version, '7') === 0;
 
     if(isIE7){
        localStorage=document.body;
@@ -329,7 +329,7 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
     this._scud_appDomain  = this.get('appDomain');
 
     isIE7 = SC.browser.isIE &&
-        SC.browser.compare(SC.browser.engineVersion, '7') === 0;
+        SC.browser.compare(SC.browser.version, '7') === 0;
 
     if(isIE7){
       //Add user behavior userData. This works in all versions of IE.

data/lib/frameworks/sproutcore/frameworks/foundation/tests/delegates/inline_text_field/inline_text_field.js

@@ -68,6 +68,7 @@ test("basic acquire and release", function() {
 
   SC.InlineTextFieldDelegate.releaseEditor(editor);
 
+  ok(editor.isDestroyed, "editor should be destroyed");
   same(editor.get('pane'), null, "editor removed from pane after release");
   same(editor.get('parentView'), null, "editor removed from parent view after release");
 });