sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/platform.js

@@ -10,53 +10,53 @@ SC.mixin(SC.platform,
 
   /**
     YES if the ondeviceorientation event on window is supported.
-    
-    @property {Boolean}
+
+    @type Boolean
     @default NO
   */
   supportsGyroscope: ('ondeviceorientation' in window),
-  
+
   /**
     YES if the ondeviceorientation event on window has actually been
     fired. Some platforms have the event but will never fire it.
-    
-    @property {Boolean}
+
+    @type Boolean
     @default NO
   */
   hasGyroscope: NO,
-  
+
   /**
     YES if the ondevicemotion event on window is supported.
-    
-    @property {Boolean}
+
+    @type Boolean
     @default NO
   */
   supportsAccelerometer: ('ondevicemotion' in window),
-  
+
   /**
     YES if the ondevicemotion event on window has actually been
     fired. Some platforms have the event but will never fire it.
-    
-    @property {Boolean}
+
+    @type Boolean
     @default NO
   */
   hasAccelerometer: NO,
-  
+
   /*
     TODO [CC] Find out the actual values on a multitude of devices.
               We would want this to be a 'normal' use value...
   */
   /**
-    @property {Number}
+    @type Number
     @default -10
   */
   accelerationMinimum: function() {
     // we may want finer grained control of this by platform later
     return -10;
   }(),
-  
+
   /**
-    @property {Number}
+    @type Number
     @default 10
   */
   accelerationMaximum: function() {
@@ -64,4 +64,4 @@ SC.mixin(SC.platform,
     return 10;
   }()
 
-});
+});

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-(function() {
+(function () {
   var oldExtend = SC.Record.extend;
 
   SC.mixin(SC.Record,
@@ -30,7 +30,7 @@
       Polymorphic record types must have unique GUIDs for all
       subclasses.
 
-      @property {Boolean}
+      @type Boolean
       @default NO
     */
     isPolymorphic: NO,
@@ -47,7 +47,7 @@
 
       @see SC.Record.storeKeyFor
     */
-    storeKeyFor: function(id) {
+    storeKeyFor: function (id) {
       var storeKeys = this.storeKeysById(),
           ret = storeKeys[id],
           superclass = this.superclass;
@@ -67,19 +67,19 @@
         SC.Store.recordTypesByStoreKey[ret] = this;
 
         // Each Record must keep track of its own storeKeys so that a find at any level on the same ID
-        // doesn't generate new storeKeys.  Plus it will be faster than always running back up to the 
+        // doesn't generate new storeKeys.  Plus it will be faster than always running back up to the
         // superclass method to retrieve the key.
         storeKeys[id] = ret;
       }
 
-      return ret ;
+      return ret;
     },
 
     // ..........................................................
     // Internal Support
     //
 
-    extend: function() {
+    extend: function () {
       var ret = oldExtend.apply(this, arguments);
 
       if (ret.prototype.hasOwnProperty('isPolymorphic')) {
@@ -88,7 +88,47 @@
       }
 
       return ret;
+    },
+
+    /** @private Updates the storeKey cache on the oldId with the newId. */
+    _propagateNewId: function (oldId, newId) {
+      var superclass = this.superclass;
+
+      if (this.isPolymorphic && superclass.isPolymorphic && superclass !== SC.Record) {
+        var storeKeys = superclass.storeKeysById(),
+          storeKey = storeKeys[oldId];
+
+        delete storeKeys[oldId];
+        storeKeys[newId] = storeKey;
+
+        superclass._propagateNewId(oldId, newId);
+      }
     }
 
   });
 })();
+
+
+SC.Record.reopen({
+
+  /**
+    Because the storeKeys per id are stored on each class of the polymorphic
+    record, whenever the id changes, we have to update the caches.
+    */
+  id: function (key, value) {
+    if (value !== undefined) {
+      var storeKey = this.get('storeKey'),
+        oldId = SC.Store.idsByStoreKey[storeKey],
+        recordType = this.get('store').recordTypeFor(storeKey);
+
+      // Propagate the new id to all superclasses.
+      recordType._propagateNewId(oldId, value);
+
+      this.writeAttribute(this.get('primaryKey'), value);
+      return value;
+    } else {
+      return SC.Store.idFor(this.storeKey);
+    }
+  }.property('storeKey').cacheable()
+
+});

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js

@@ -6,9 +6,9 @@
 /*globals module ok equals same test MyApp */
 
 (function() {
-  
+
   var store, Person, Male, Female, colin, maggie;
-  
+
   module("Polymorphic SC.Record - Simple", {
     setup: function() {
       SC.RunLoop.begin();
@@ -34,6 +34,7 @@
         guid: '2'
       });
     },
+
     teardown: function() {
       store = Person = Male = Female = colin = maggie = null;
       SC.RunLoop.end();
@@ -73,4 +74,17 @@
     }
   });
 
+  test("Changing the 'id' updates the storeKeys for all types of the same record", function () {
+    var person1 = store.find(Person, '1'),
+      person2 = store.find(Person, '2');
+
+    equals(person1, colin, "find on Person record type with guid 1 should return male record");
+    colin.set('id', 'x');
+    person1 = store.find(Person, '1');
+
+    ok(person1 !== colin, "find on Person record type with guid 1 should not work anymore");
+
+    person1 = store.find(Person, 'x');
+    equals(person1, colin, "find on Person record type with guid x should return male record");
+  });
 })();

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/desktop_scroller.js

@@ -36,22 +36,22 @@ SC.BaseTheme.desktopScrollerRenderDelegate = SC.RenderDelegate.create({
       '</div>');
 
 
-    context.attr('aria-orientation',
+    context.setAttr('aria-orientation',
                  (layoutDirection === SC.LAYOUT_VERTICAL) ? 'vertical' : 'horizontal');
-    context.attr('aria-valuemax', dataSource.get('maximum'));
-    context.attr('aria-valuemin', dataSource.get('minimum'));
-    context.attr('aria-valuenow', dataSource.get('value'));
-    context.attr('aria-controls', dataSource.get('controlsId'));
+    context.setAttr('aria-valuemax', dataSource.get('maximum'));
+    context.setAttr('aria-valuemin', dataSource.get('minimum'));
+    context.setAttr('aria-valuenow', dataSource.get('value'));
+    context.setAttr('aria-controls', dataSource.get('controlsId'));
   },
 
-  update: function (dataSource, context) {
+  update: function (dataSource, jquery) {
     var layoutDirection = dataSource.get('layoutDirection'),
         isVertical = layoutDirection === SC.LAYOUT_VERTICAL,
         isHorizontal = layoutDirection === SC.LAYOUT_HORIZONTAL,
         controlsAreHidden = dataSource.get('controlsHidden'),
         thumb, K = 'desktopScrollerRenderDelegate';
 
-    context.setClass({
+    jquery.setClass({
       'sc-vertical': isVertical,
       'sc-horizontal': isHorizontal,
       disabled: !dataSource.get('isEnabled'),
@@ -59,24 +59,24 @@ SC.BaseTheme.desktopScrollerRenderDelegate = SC.RenderDelegate.create({
     });
 
     if (dataSource.didChangeFor(K, 'maximum')) {
-      context.attr('aria-valuemax', dataSource.get('maximum'));
+      jquery.attr('aria-valuemax', dataSource.get('maximum'));
     }
 
     if (dataSource.didChangeFor(K, 'minimum')) {
-      context.attr('aria-valuemin', dataSource.get('minimum'));
+      jquery.attr('aria-valuemin', dataSource.get('minimum'));
     }
 
     if (dataSource.didChangeFor(K, 'value')) {
-      context.attr('aria-valuenow', dataSource.get('value'));
+      jquery.attr('aria-valuenow', dataSource.get('value'));
     }
 
     if (dataSource.didChangeFor(K, 'controlsId')) {
-      context.attr('aria-controls', dataSource.get('controlsId'));
+      jquery.attr('aria-controls', dataSource.get('controlsId'));
     }
 
     // Don't bother if the controls are hidden.
     if (!controlsAreHidden) {
-      thumb = context.find('.thumb');
+      thumb = jquery.find('.thumb');
 
       if (dataSource.didChangeFor(K, 'thumbPosition')) {
         thumb.css(layoutDirection === SC.LAYOUT_VERTICAL ?

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/ui.js

@@ -12,84 +12,82 @@
     var iv=SC.ImageView.design({value: appleURL, layout: {height:400, width:400}});
     var pane = SC.ControlTestPane.design({ height: 100 })
     .add("basic", SC.ScrollView, {
-  
+
     })
 
     .add("basic2", SC.ScrollView, {
         contentView: iv
     })
-    
+
     .add("basic3", SC.ScrollView, {
       contentView: iv,
       isHorizontalScrollerVisible: NO,
       autohidesHorizontalScroller: NO,
       autohidesVerticalScroller: NO
     })
-    
+
     .add("nestedHoriz", SC.ScrollView, {
       layout: { width: 100, height: 440 },
-        
+
       contentView: SC.ScrollView.design({
         layout: { width: 200, height: 420 },
         contentView: iv
       })
     })
-    
+
     .add("nestedVert", SC.ScrollView, {
       layout: { width: 440, height: 100 },
-        
+
       contentView: SC.ScrollView.design({
         layout: { width: 420, height: 200 },
         contentView: iv
       })
     })
-    
+
     .add("nestedVertInHoriz", SC.ScrollView, {
       layout: { width: 100, height: 220 },
-        
+
       contentView: SC.ScrollView.design({
         layout: { width: 420, height: 200 },
         contentView: iv
       })
     })
-    
+
     .add("nestedHorizInVert", SC.ScrollView, {
       layout: { width: 220, height: 100 },
-        
+
       contentView: SC.ScrollView.design({
         layout: { width: 200, height: 420 },
         contentView: iv
       })
     })
-    
+
     .add("disabled", SC.ScrollView, {
       isEnabled: NO
     })
-    
+
     .add("verticalScrollerBottom",SC.ScrollView, {
       contentView: iv,
       hasHorizontalScroller : NO,
       verticalScrollerBottom: 16,
       isVerticalScrollerVisible: YES,
       autohidesVerticalScroller: NO
-      
+
     })
     .add("aria-controls_attribute", SC.ScrollView, {
       contentView: iv
     });
 
-    pane.show(); // add a test to show the test pane
-
   // ..........................................................
   // TEST VIEWS
-  // 
+  //
   module('SC.ScrollView UI', pane.standardSetup());
-  
+
   test("basic", function() {
     var view = pane.view('basic');
     ok(!view.$().hasClass('disabled'), 'should not have disabled class');
     ok(!view.$().hasClass('sel'), 'should not have sel class');
-    
+
     equals(view.getPath('childViews.length'), 3, 'scroll view should have only three child views');
 
     var containerView = view.get('containerView') ;
@@ -98,11 +96,11 @@
     ok(containerView.get('contentView') === null, 'default containerView should have a null contentView itself');
     ok(view.get('contentView') === null, 'scroll view should have no contentView by default');
     equals(containerView.getPath('childViews.length'), 0, 'containerView should have no child views');
-    
+
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    
+
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
@@ -110,43 +108,43 @@
 
   test("basic2", function() {
     var view = pane.view('basic2');
-    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');    
-        
+    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');
+
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');        
-	  var maxHScroll = view.maximumHorizontalScrollOffset();    
+    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');
+	  var maxHScroll = view.maximumHorizontalScrollOffset();
 	  ok((maxHScroll > 0), 'Max horizontal scroll should be greater than zero');
-    
+
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
-    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');    
-	  var maxVScroll = view.maximumVerticalScrollOffset();    
+    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');
+	  var maxVScroll = view.maximumVerticalScrollOffset();
 	  ok((maxVScroll > 0), 'Max vertical scroll should be greater than zero');
 
     view.scrollTo(0,100);
     SC.RunLoop.begin().end();
     var elem = view.get('containerView').$()[0];
     equals(elem.scrollTop, 100, 'vertical scrolling should adjust scrollTop of container view');
-    
+
     view.scrollTo(50,0);
     SC.RunLoop.begin().end();
     elem = view.get('containerView').$()[0];
     equals(elem.scrollLeft, 50, 'horizontal scrolling should adjust scrollLeft of container view');
   });
-   
+
   test("basic3", function() {
     var view = pane.view('basic3');
     view.set('isHorizontalScrollerVisible',NO);
     ok(!view.get('canScrollHorizontal'),'cannot scroll in horizontal direction');
-    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');    
+    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');        
-    var maxHScroll = view.maximumHorizontalScrollOffset();    
+    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');
+    var maxHScroll = view.maximumHorizontalScrollOffset();
     equals(maxHScroll , 0, 'Max horizontal scroll should be equal to zero');
 
     view.set('isVerticalScrollerVisible',NO);
@@ -154,11 +152,11 @@
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
-    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');    
-    var maxVScroll = view.maximumVerticalScrollOffset();    
+    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');
+    var maxVScroll = view.maximumVerticalScrollOffset();
     equals(maxVScroll ,0, 'Max vertical scroll should be equal to zero');
   });
-   
+
   test("nestedHoriz", function() {
     var view = pane.view('nestedHoriz');
     ok(view.get('canScrollHorizontal'),'can scroll in horizontal direction');
@@ -188,7 +186,7 @@
     equals(nestedView.$('> .sc-scroll-container-view').css('overflow-x'), 'hidden', 'should have \'overflow-x\': \'scroll\' style');
     equals(nestedView.$('> .sc-scroll-container-view').css('overflow-y'), 'scroll', 'should have \'overflow-y\': \'hidden\' style');
   });
-  
+
   test("nestedVertInHoriz", function() {
     var view = pane.view('nestedVertInHoriz');
     ok(view.get('canScrollHorizontal'),'can scroll in horizontal direction');
@@ -218,22 +216,22 @@
     equals(nestedView.$('> .sc-scroll-container-view').css('overflow-x'), 'scroll', 'should have \'overflow-x\': \'scroll\' style');
     equals(nestedView.$('> .sc-scroll-container-view').css('overflow-y'), 'hidden', 'should have \'overflow-y\': \'hidden\' style');
   });
-  
+
   test("disabled", function() {
-     var view = pane.view('disabled'); 
+     var view = pane.view('disabled');
      ok(view.$().hasClass('disabled'), 'should have disabled class');
      ok(!view.$().hasClass('sel'), 'should not have sel class');
    });
 
    test("non-zero bottom in vertical scrollbar", function() {
-      var view = pane.view('verticalScrollerBottom'); 
+      var view = pane.view('verticalScrollerBottom');
       equals(view.get('verticalScrollerBottom'),16, "should have verticalScrollerBottom as ");
       var scroller = view.get('verticalScrollerView') ;
       ok(scroller, 'should have vertical scroller view ');
       equals(scroller.get('layout').bottom,16, 'should have layout.bottom of scroller as ');
       equals(scroller.$()[0].style.bottom,'16px', 'should have style.bottom of scroller as ');
     });
-   
+
    test('ScrollView should readjust scrollTop/scrollLeft if layer changes', function() {
      var view = pane.view('basic2'), cv = view.get('contentView'), container = view.get('containerView') ;
      view.scrollTo(10, 10);