sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js

@@ -59,3 +59,19 @@ test("Issue a pushError and check if there is conflicts", function() {
   ok(!res, "There is a conflict, because of the state, this is expected.");
 });
 
+test("A pushRetrieve updating the id of an existing record should update the primary Key cache", function(){
+  var tmpid, recFirst, recSecond, sK;
+  
+  tmpid = "@2345235asddsgfd";
+  recFirst = { firstname: 'me', lastname: 'too', guid: tmpid };
+  recSecond = { firstname: 'me', lastname: 'too', guid: 1 };
+  SC.RunLoop.begin();
+  var sK = store.loadRecord(SC.Record, recFirst, tmpid);
+  SC.RunLoop.end();
+  equals(store.idFor(sK),tmpid); //check whether the id is indeed tmpid
+  SC.RunLoop.begin();
+  store.pushRetrieve(SC.Record,1,recSecond,sK);
+  SC.RunLoop.end();
+  equals(store.idFor(sK),1); // id should now have been updated
+});
+

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushRelationships.js

@@ -252,7 +252,7 @@ test("A slave does NOT update a relationship [one(slave) to *]", function () {
   ok(SC.none(s1.get('relative')), 'precond2 - s1 has no relative');
   equals(r1.get('slave'), s1, 'test1- r1 is related to s1');
 
-  // case - create slave WITH releationship
+  // case - create slave WITH relationship
   SC.RunLoop.begin();
   MyApp.store.loadRecords(MyApp.Relative, [
     { guid: 'r2'}
@@ -814,7 +814,7 @@ test("pushDestroy record doesn't create a slave when it's been destroyed [*(mast
 
 /**
   Standard Sproutcore Behaviors
- 
+
   This is data showing up from the server- after pushing in changes,
   all records should have status READY_CLEAN.
  */
@@ -926,6 +926,43 @@ test("Record Attribute can reference renamed attribute key", function () {
   equals(s1.get('master'), m1, 's1 should have master of m1');
 });
 
+test("Record Attribute can reference renamed attribute key (1 to many)", function () {
+  MyApp.Master = SC.Record.extend({
+    slave: SC.Record.toOne('MyApp.Slave', {
+      inverse: 'masters',
+      isMaster: YES
+    })
+  });
+
+  MyApp.Slave = SC.Record.extend({
+    masters: SC.Record.toMany('MyApp.Master', {
+      inverse: 'slave',
+      isMaster: NO,
+      key: 'master_ids'
+    })
+  });
+
+  SC.RunLoop.begin();
+  MyApp.store.loadRecords(MyApp.Slave, [
+    { guid: 's1' }
+  ]);
+  SC.RunLoop.end();
+
+  var s1 = MyApp.store.find(MyApp.Slave, 's1');
+  ok(s1.get('status') & SC.Record.READY_CLEAN, 'precond - s1 should be ready clean');
+
+  SC.RunLoop.begin();
+  MyApp.store.loadRecords(MyApp.Master, [
+    { guid: 'm1', slave: 's1' }
+  ]);
+  SC.RunLoop.end();
+
+  var m1 = MyApp.store.find(MyApp.Master, 'm1');
+
+  equals(m1.get('slave'), s1, 'm1 should be master of s1');
+  same(s1.get('masters').toArray(), [m1], 's1 should have m1 in masters');
+  same(s1.get('attributes').master_ids, [m1.get('id')], 's1.attributes should have master_ids key');
+});
 
 test("Record Attribute can reference renamed attribute key (on remote side)", function () {
   MyApp.Master = SC.Record.extend({
@@ -1050,7 +1087,7 @@ test("RecordAttribute flag 'lazilyInstantiate' tests", function () {
   equals(m1.get('slave'), s1, 'm1 should be master of s1');
 
   // test lazy creation fails on isMaster => NO
-  ok(SC.none(m2), 'm2 should NOT have been creaetd');
+  ok(SC.none(m2), 'm2 should NOT have been created');
   ok(!s2.get('master') ||
       s2.get('master').get('status') & SC.Record.ERROR, 's2 should have no master record');
 });
@@ -1096,7 +1133,7 @@ test("RecordAttribute flag 'lazilyInstantiate' can be a function", function () {
   ok(!s1, 's1 should NOT be created lazily');
 
   // test lazy creation fails on isMaster => NO
-  ok(SC.none(m2), 'm2 should NOT have been creaetd');
+  ok(SC.none(m2), 'm2 should NOT have been created');
   ok(!s2.get('master') ||
       s2.get('master').get('status') & SC.Record.ERROR, 's2 should have no master record');
 });
@@ -1175,3 +1212,4 @@ test("RecordAttribute flag 'lazilyInstantiate' will create chains of records pro
   ok(ss, 'ss should be created lazily');
   equals(ss.get('slave'), s, 's should be master of ss');
 });
+

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js

@@ -68,7 +68,7 @@ test("data state=EDITABLE", function() {
 });
 
 test("should return null when accessing an unknown storeKey", function() {
-  equals(store.readDataHash(20000000), null, 'shuld return null for non-existant store key');
+  equals(store.readDataHash(20000000), null, 'should return null for non-existent store key');
   equals(store.storeKeyEditState(storeKey), SC.Store.LOCKED, 'should put into locked edit state');
 });
 

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js

@@ -259,7 +259,7 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
 
   /**
     Returns a new `SC.DateTime` object advanced according the the given parameters.
-    Don't use floating point values, it might give unpredicatble results.
+    Don't use floating point values, it might give unpredictable results.
 
     @see SC.DateTime#create for the list of options you can pass
     @param {Hash} options the amount of date/time to advance the receiver
@@ -384,7 +384,7 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
     @returns {Boolean}
   */
   isEqual: function(aDateTime) {
-    return SC.DateTime.compare(this, aDateTime) === 0;
+    return this.constructor.compare(this, aDateTime) === 0;
   },
 
   /**
@@ -469,6 +469,12 @@ SC.DateTime.mixin(SC.Comparable,
   */
   abbreviatedMonthNames: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
   
+  /**
+    @type Array
+    @default ['AM', 'PM']
+  */
+  AMPMNames:['AM', 'PM'],
+  
   /**
     @private
 
@@ -522,7 +528,7 @@ SC.DateTime.mixin(SC.Comparable,
   /**
     @private
 
-    The index of the lastest cached value. Used with `_DT_CACHE_MAX_LENGTH` to
+    The index of the latest cached value. Used with `_DT_CACHE_MAX_LENGTH` to
     limit the size of the cache.
 
     @type Integer
@@ -851,7 +857,7 @@ SC.DateTime.mixin(SC.Comparable,
     local timezone. If you want to create a UTC+2 (CEST) date, for example,
     then you should pass a timezone of -120.
 
-    @param options one of the three kind of parameters descibed above
+    @param options one of the three kind of parameters described above
     @returns {SC.DateTime} the SC.DateTime instance that corresponds to the
       passed parameters, possibly fetched from cache
   */
@@ -944,7 +950,7 @@ SC.DateTime.mixin(SC.Comparable,
           case 'j': throw "%j is not implemented";
           case 'm': opts.month = scanner.scanInt(1, 2); break;
           case 'M': opts.minute = scanner.scanInt(1, 2); break;
-          case 'p': opts.meridian = scanner.scanArray(['AM', 'PM']); break;
+          case 'p': opts.meridian = scanner.scanArray(this.AMPMNames); break;
           case 'S': opts.second = scanner.scanInt(1, 2); break;
           case 's': opts.millisecond = scanner.scanInt(1, 3); break;
           case 'U': throw "%U is not implemented";
@@ -982,7 +988,7 @@ SC.DateTime.mixin(SC.Comparable,
       delete opts.meridian;
     }
 
-    d = SC.DateTime.create(opts);
+    d = this.create(opts);
 
     if (!SC.none(check.dayOfWeek) && d.get('dayOfWeek') !== check.dayOfWeek) {
       return null;
@@ -1042,7 +1048,7 @@ SC.DateTime.mixin(SC.Comparable,
       case 'j': return this._pad(this._get('dayOfYear'), 3);
       case 'm': return this._pad(this._get('month'));
       case 'M': return this._pad(this._get('minute'));
-      case 'p': return this._get('hour') > 11 ? 'PM' : 'AM';
+      case 'p': return this._get('hour') > 11 ? this.AMPMNames[1] : this.AMPMNames[0];
       case 'S': return this._pad(this._get('second'));
       case 's': return this._pad(this._get('millisecond'), 3);
       case 'u': return this._pad(this._get('utc')); //utc

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js

@@ -394,3 +394,11 @@ test('timezones', function() {
   timeShouldBeEqualToHash(dt.toTimezone(-120), {year: o.year, month: o.month, day: o.day, hour: 6, minute: o.minute, second: o.second, millisecond: o.millisecond, timezone: -120 });
   timeShouldBeEqualToHash(dt.toTimezone(-330), {year: o.year, month: o.month, day: o.day, hour: 9, minute: 30, second: o.second, millisecond: o.millisecond, timezone: -330 });
 });
+
+test('extend', function() {
+  var dateTimeExt = SC.DateTime.extend();
+  
+  // Should parse and produce a date object that is an instance of 'dateTimeExt'
+  var parsedDateTimeExt = dateTimeExt.parse('2011-10-15T21:30:00Z');
+  ok(SC.instanceOf(parsedDateTimeExt, dateTimeExt), 'Correctly produced an instance of the extended type.');
+});

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/resources/strings.js

@@ -9,6 +9,7 @@ SC.stringsFor('English', {
   '_SC.DateTime.dayNames': 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday',
   '_SC.DateTime.abbreviatedDayNames': 'Sun Mon Tue Wed Thu Fri Sat',
   '_SC.DateTime.monthNames': 'January February March April May June July August September October November December',
-  '_SC.DateTime.abbreviatedMonthNames': 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'
+  '_SC.DateTime.abbreviatedMonthNames': 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec',
+  '_SC.DateTime.AMPMNames':'AM PM'
 }) ;
 

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js

@@ -21,6 +21,7 @@ SC.DateTime.mixin(
     SC.DateTime.abbreviatedDayNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedDayNames'));
     SC.DateTime.monthNames = SC.String.w(SC.String.loc('_SC.DateTime.monthNames'));
     SC.DateTime.abbreviatedMonthNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedMonthNames'));
+    SC.DateTime.AMPMNames = SC.String.w(SC.String.loc('_SC.DateTime.AMPMNames'));
   }
 
 });

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

@@ -14,7 +14,7 @@ SC._mapDisplayNamesUseHashForSeenTypes = ['object', 'number', 'boolean', 'array'
 
 
 SC.mapDisplayNames = function(obj, level, path, seenHash, seenArray) {
-  if (!SC.browser.webkit) return ;
+  if (SC.browser.engine !== SC.ENGINE.webkit) return ;
 
   // Lazily instantiate the hash of types we'll use a hash for the "have we
   // seen this before?" structure.  (Some types are not safe to put in a hash
@@ -51,9 +51,9 @@ SC.mapDisplayNames = function(obj, level, path, seenHash, seenArray) {
   else {
     arrayToCheck = seenArray;
   }
-  
+
   if (arrayToCheck  &&  arrayToCheck.indexOf(obj) !== -1) return ;
-  
+
   if (arrayToCheck) {
     arrayToCheck.push(obj) ;
   }

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

@@ -11,7 +11,7 @@
   page in the browser history, which is the default behavior in most browsers.
   
   Usually it is best to leave this property set to `NO` in order to prevent the
-  user from inadvertantly losing data by pressing the backspace key.
+  user from inadvertently losing data by pressing the backspace key.
 
   @static
   @type Boolean

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js

@@ -71,7 +71,7 @@ SC.CollectionRowDelegate = {
 
   /**
     Index set of rows that should have a custom row height. If you need
-    certains rows to have a custom row height, then set this property to a
+    certain rows to have a custom row height, then set this property to a
     non-null value.  Otherwise leave it blank to disable custom row heights.
     
     @type SC.IndexSet

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_view_delegate.js

@@ -157,7 +157,7 @@ SC.CollectionViewDelegate = {
     The default implementation always returns `YES`.
     
     @param {SC.CollectionView} view the collection view
-    @returns {Boolean} YES to alow, NO to prevent it
+    @returns {Boolean} YES to allow, NO to prevent it
   */
   collectionViewShouldBeginDrag: function(view) {
     return YES;

data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js

@@ -214,7 +214,7 @@ SC.AlertPane = SC.PanelPane.extend(
   }.property('message').cacheable(),
 
   /**
-    An optional detailed decription. Use this string to provide further
+    An optional detailed description. Use this string to provide further
     explanation of the condition and, optionally, ways the user can resolve
     the problem.
     
@@ -331,7 +331,6 @@ SC.AlertPane = SC.PanelPane.extend(
           useStaticLayout: YES,
           actionKey: SC.BUTTON2_STATUS,
           localize: YES,
-          titleMinWidth: 64,
           layout: { right: 5, height: 'auto', width: 'auto', bottom: 0 },
           isCancel: YES,
           action: "dismiss",
@@ -342,7 +341,6 @@ SC.AlertPane = SC.PanelPane.extend(
           useStaticLayout: YES,
           actionKey: SC.BUTTON1_STATUS,
           localize: YES,
-          titleMinWidth: 64,
           layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
           isDefault: YES,
           action: "dismiss",
@@ -357,7 +355,6 @@ SC.AlertPane = SC.PanelPane.extend(
             useStaticLayout: YES,
             actionKey: SC.BUTTON3_STATUS,
             localize: YES,
-            titleMinWidth: 64,
             layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
             action: "dismiss",
             isVisible: NO

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -274,11 +274,15 @@ SC.MenuPane = SC.PickerPane.extend(
   popup: function(anchorViewOrElement, preferMatrix) {
     var anchor;
     this.beginPropertyChanges();
-    if (anchorViewOrElement) {
-      anchor = anchorViewOrElement.isView ? anchorViewOrElement.get('layer') : anchorViewOrElement;
+    if(anchorViewOrElement){
+      if (anchorViewOrElement.isView) {
+        this._anchorView = anchorViewOrElement;
+        this._setupScrollObservers(anchorViewOrElement);
+      } else {
+        this._anchorHTMLElement = anchorViewOrElement;
+      }
     }
-    this.set('anchorElement',anchor) ;
-    this.set('anchor',anchorViewOrElement);
+   // this.set('anchor',anchorViewOrElement);
     if (preferMatrix) this.set('preferMatrix',preferMatrix) ;
 
     this.adjust('height', this.get('menuHeight'));
@@ -544,7 +548,16 @@ SC.MenuPane = SC.PickerPane.extend(
       controlSize: this.get('controlSize')
     });
 
-    menuView = this._menuView = SC.View.create();
+    menuView = this._menuView = SC.View.create({
+      parentViewDidResize: function() {
+        this.notifyPropertyChange('frame');
+      },
+      
+      viewDidResize: function() {
+        
+      }
+    });
+    
     menuItemViews = this.get('menuItemViews');
     menuView.set('layout', { top: 0, left: 0, height : this.get('menuHeight')});
     menuView.replaceAllChildren(menuItemViews);
@@ -893,7 +906,7 @@ SC.MenuPane = SC.PickerPane.extend(
     }
 
     // Scroll to the selected menu item if it's not visible on screen.
-    // This is useful for keyboard navigation and programmaticaly selecting
+    // This is useful for keyboard navigation and programmatically selecting
     // the selected menu item, as in `SelectButtonView`.
     if (currentMenuItem && currentMenuItem.get('isEnabled')) {
       currentMenuItem.scrollToVisible();

data/lib/frameworks/sproutcore/frameworks/desktop/panes/modal.js

@@ -42,10 +42,19 @@ SC.ModalPane = SC.Pane.extend(
     @returns {SC.ModalPane} receiver
   */
   paneWillAppend: function(pane) {
+    var _tmpPane;
     this._openPaneCount++;
     if (!this.get('isVisibleInWindow')) this.append();
+    var panes = SC.RootResponder.responder.panes;
+    for(var i=0, iLen=panes.length; i<iLen; i++ ){
+      _tmpPane = panes[i];
+      if(_tmpPane!==pane) {
+        //_tmpPane.set('ariaHidden', YES);
+        this._hideShowTextfields(_tmpPane, NO);
+      }
+    }
     return this ;    
-  },
+  },  
   
   /** @private
     Called by a pane just after it removes itself.  The modal pane can remove
@@ -56,13 +65,33 @@ SC.ModalPane = SC.Pane.extend(
     @returns {SC.ModalPane} receiver
   */
   paneDidRemove: function(pane) { 
+    var _tmpPane;
     this._openPaneCount--;
+    var panes = SC.RootResponder.responder.panes;
+    for(var i=0, iLen=panes.length; i<iLen; i++ ){
+      _tmpPane = panes[i];
+      if(_tmpPane!==pane) {
+        //_tmpPane.set('ariaHidden', NO);
+        this._hideShowTextfields(_tmpPane, YES);
+      }
+    }
     if (this._openPaneCount <= 0) {
       this._openPaneCount = 0 ;
       if (this.get('isVisibleInWindow')) this.remove();
     }
   },
   
+  /** @private */
+  _hideShowTextfields: function(pane, focusable){
+    var view;
+    for(view in SC.View.views){
+      view = SC.View.views[view];
+      if (view!==pane && view.get('pane')===pane && view.get('isTextField')){
+        view.set('isBrowserFocusable', focusable);
+      }
+    }
+  },
+  
   /** @private */
   mouseDown: function(evt) {
     var owner = this.get('owner');

data/lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js

@@ -22,7 +22,7 @@ sc_require('panes/panel');
   
   Palette pane is a simple way to provide non-modal messaging that won't 
   blocks the user's interaction with your application.  Palette panes are 
-  useful for showing important detail informations with flexsible position.
+  useful for showing important detail information with flexible position.
   They provide a better user experience than modal panel.
   
   @extends SC.PanelPane

data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js

@@ -29,6 +29,12 @@ sc_require('panes/modal');
 SC.PanelPane = SC.Pane.extend(
 /** @scope SC.PanelPane.prototype */ {
 
+  /**
+    Walk like a duck.
+    @type {Boolean}
+  */
+  isPanelPane: YES,
+
   /**
     @type Array
     @default ['sc-panel']
@@ -60,6 +66,23 @@ SC.PanelPane = SC.Pane.extend(
   */
   ariaLabel: null,
 
+  /**
+    The WAI-ARIA labelledby for the panel. Screen readers will use this to tell
+    the header or name of your panel if there is no label. This should be an id
+    to an element inside the panel.
+
+    @type String
+  */
+  ariaLabelledBy: null,
+
+  /**
+    The WAI-ARIA describedby text. Screen readers will use this to speak the description
+    of the panel. This should be an id to an element inside the panel.
+
+    @type String
+  */
+  ariaDescribedBy: null,
+
   /**
     Indicates that a pane is modal and should not allow clicks to pass
     though to panes underneath it. This will usually cause the pane to show
@@ -198,5 +221,5 @@ SC.PanelPane = SC.Pane.extend(
     return ret ;
   },
 
-  displayProperties: ['ariaLabel']
+  displayProperties: ['ariaLabel', 'ariaLabelledBy', 'ariaDescribedBy']
 });