sproutcore 1.5.0.pre.5 → 1.5.0.rc.1

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

@@ -1,8 +1,10 @@
-// ========================================================================
-// SproutCore -- JavaScript Application Framework
-// Copyright ©2006-2011, Strobe Inc. and contributors.
-// Portions copyright ©2008 Apple Inc.  All rights reserved.
-// ========================================================================
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
 
 /**
   @class

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -82,7 +82,15 @@ SC.SliderView = SC.View.extend(SC.Control,
   // INTERNAL PROPERTIES
   // 
   
-  displayProperties: 'displayValue minimum maximum step frame'.w(),
+  displayProperties: 'displayValue ariaValue minimum maximum step frame'.w(),
+
+  /**
+   @property
+   The raw, unchanged value to be provided to screen readers and the like.
+  */
+  ariaValue: function() {
+    return this.get('value');
+  }.property('value').cacheable(),
 
   // The name of the render delegate which is creating and maintaining
   // the DOM associated with instances of this view

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

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

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

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

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

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

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

@@ -1,11 +1,10 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('views/split');
 
 /**
   @class

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

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

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

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

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -108,16 +108,17 @@ SC.TabView = SC.View.extend(
     var childViews  = [], view, containerView, layout,
         tabLocation = this.get('tabLocation'),
         tabHeight   = this.get('tabHeight');
-    
-    layout = (tabLocation === SC.TOP_LOCATION) ?
-             { top: tabHeight/2+1, left: 0, right: 0, bottom: 0 } :
-             (tabLocation === SC.TOP_TOOLBAR_LOCATION) ?
-             { top: tabHeight+1, left: 0, right: 0, bottom: 0 } :
-             { top: 0, left: 0, right: 0, bottom: tabHeight-1 } ;
-    
-    containerView = this.containerView.extend(SC.Border, {
+
+    if (tabLocation === SC.TOP_LOCATION) {
+      layout = { top: tabHeight/2+1, left: 0, right: 0, bottom: 0, border: 1 };
+    } else if (tabLocation === SC.TOP_TOOLBAR_LOCATION) {
+      layout = { top: tabHeight+1, left: 0, right: 0, bottom: 0, border: 1 };
+    } else {
+      layout = { top: 0, left: 0, right: 0, bottom: tabHeight-1, border: 1 };
+    }
+
+    containerView = this.containerView.extend({
       layout: layout,
-      borderStyle: SC.BORDER_BLACK,
       //adding the role
       ariaRole: 'tabpanel'
     });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md

@@ -1,33 +1,45 @@
 Polymorphism Framework
 ======================
  
-This framework adds polymorphism support to SC.Record relationships.
-Right now, only one-to-one polymorphism is supported, but to-many
-support is planned.
+This framework adds subtype polymorphism support to SC.Record relationships and
+SC.Store\#find.
 
 
 ## Using the Framework
 
-In order to use the polymorphic to-one relationship, include this
-framework in your Buildfile. Inside your Records, you can define
-a relationship like this:
-
-    MyApp.Child = SC.Record.extend({
-	    parent: SC.Record.toOneOf(['MyApp.Male', 'MyApp.Female'], {typeKey: 'parentType'}),
-	    parentType: SC.Record.attr(String)
-	});
-
-You need to pass in a hash like the following when creating the record:
-
-    {parent: 1, parentType: 'MyApp.Male'}
-
-
-For other, more flexible, ways of using this polymorphic support,
-see the unit tests or source code.
-
-<!--
-	TODO Write more examples
--->
+In order to use the polymorphism for your record type, you need to set
+the `isPolymorphic` property:
+
+    MyApp.SomeRecord = SC.Record.extend({
+      // your code here
+    });
+    MyApp.SomeRecord.isPolymorphic = YES;
+
+
+## Example
+
+    YourApp.Person = SC.Record.extend();
+    YourApp.Person.isPolymorphic = YES;
+
+    YourApp.Male = YourApp.Person.extend({
+      isMale: YES
+    });
+
+    YourApp.Female = YourApp.Person.extend({
+      isFemale: YES
+    });
+    
+    YourApp.store.createRecord(YourApp.Male, {
+      guid: '1'
+    });
+    
+    YourApp.store.createRecord(YourApp.Female, {
+      guid: '2'
+    });
+    
+    // SC.Store#find now returns records of the expected type
+    SC.Logger.log(SC.kindOf(YourApp.store.find(YourApp.Person, '1'), YourApp.Male)); // true
+    SC.Logger.log(SC.kindOf(YourApp.store.find(YourApp.Person, '2'), YourApp.Female)); // true
 
 ## Contributors
 

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

@@ -5,19 +5,93 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-SC.mixin(SC.Record, {
+SC.mixin(SC.Record,
+/** @scope SC.Record */{
+
+  // ..........................................................
+  // Properties
+  // 
+
+  /**
+    If YES, then searches for records of this type will return
+    subclass instances. For example:
+
+    {{{
+      Person = SC.Record.extend();
+      Person.isPolymorphic = YES;
+
+      Male = Person.extend();
+      Female = Person.extend();
+    }}}
+
+    Using SC.Store#find, or a toOne or toMany relationship on
+    Person will then return records of type Male and Female.
+    Polymorphic record types must have unique GUIDs for all
+    subclasses.
+
+    @property {Boolean}
+    @default NO
+  */
+  isPolymorphic: NO,
+
+
+  // ..........................................................
+  // Propagation Support
+  // 
 
   /**
-    Returns a SC.PolymorphicSingleAttribute that converts the underlying ID to
-    a number of types, dependent on a attribute on the record (the name of this
-    attribute is provided by the typeKey property).
+    Like the original SC.Record.storeKeyFor,
+    but when a storeKey is generated, it will
+    propagate it to superclasses.
     
-    @param {Array} recordTypes the array of record types the object could be
-    @param {Hash} opts additional options
-    @returns {SC.PolymorphicSingleAttribute} created instance
+    @see SC.Record.storeKeyFor
   */
-  toOneOf: function(recordTypes, opts) {
-    return SC.PolymorphicSingleAttribute.attr(recordTypes, opts);
+  storeKeyFor: function(id) {
+    var storeKeys = this.storeKeysById(),
+        ret = storeKeys[id];
+    
+    if (!ret) {
+      ret = SC.Store.generateStoreKey();
+      SC.Store.idsByStoreKey[ret] = id;
+      SC.Store.recordTypesByStoreKey[ret] = this;
+      storeKeys[id] = ret;
+      this._propagateIdForStoreKey(id, ret);
+    }
+    
+    return ret ;
+  },
+
+
+  // ..........................................................
+  // Internal Support
+  // 
+
+  /** @private */
+  _propagateIdForStoreKey: function(id, storeKey) {
+    var superclass = this.superclass;
+    if (this.isPolymorphic) {
+      while (superclass.isPolymorphic && superclass !== SC.Record) {
+        superclass._storeKeyForId(storeKey, id);
+        superclass = superclass.superclass;
+      }
+    }
+  },
+
+  /** @private */
+  _storeKeyForId: function(storeKey, id) {
+    var storeKeys;
+    if (!this.isPolymorphic) return;
+
+    /*
+      TODO [CC] SC.Store.recordTypesByStoreKey will be broken
+    */
+
+    storeKeys = this.storeKeysById();
+    if (storeKeys[id]) {
+      throw "A store key (%@) already existing for %@ on %@".fmt(storeKey, id, this);
+    }
+
+    storeKeys[id] = storeKey;
   }
 
 });

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

@@ -0,0 +1,79 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+(function() {
+  
+  var store, Employee, Company, Engineer, Executive, Accountant, Other,
+      strobe, colin, charles, matt, yehuda, erin, digits;
+  
+  module("Polymorphic SC.Record - toMany tests", {
+    setup: function() {
+      SC.RunLoop.begin();
+      store = SC.Store.create();
+
+      Employee = SC.Record.extend({
+        name: SC.Record.attr(String)
+      });
+      Employee.isPolymorphic = YES;
+
+      Company = SC.Record.extend({
+        name: SC.Record.attr(String),
+        employees: SC.Record.toMany(Employee, {inverse: 'company'})
+      });
+
+      Engineer = Employee.extend({
+        isEngineer: YES
+      });
+
+      Executive = Employee.extend({
+        isExecutive: YES
+      });
+
+      Accountant = Employee.extend({
+        isAccountant: YES
+      });
+
+      Other = Employee.extend({
+        isOther: YES
+      });
+
+      strobe = store.createRecord(Company, {
+        name: "Strobe",
+        employees: ['1', '2', '3', '4', '5', '6']
+      });
+
+      colin = store.createRecord(Engineer, {guid: '1', name: 'Colin'});
+      yehuda = store.createRecord(Engineer, {guid: '2', name: 'Yehuda'});
+      charles = store.createRecord(Executive, {guid: '3', name: 'Charles'});
+      matt = store.createRecord(Executive, {guid: '4', name: 'Matt'});
+      erin = store.createRecord(Other, {guid: '5', name: 'Erin'});
+      digits = store.createRecord(Accountant, {guid: '6', name: 'P. Diggy'});
+
+    },
+    teardown: function() {
+      store = Employee = Company = Engineer = Executive = Accountant = Other = null;
+      strobe = colin = charles = matt = yehuda = erin = digits = null;
+      SC.RunLoop.end();
+    }
+  });
+
+  function testRecord(record, expected) {
+    equals(record, expected, "Record should be the same as what's expected");
+    ok(record.constructor === expected.constructor, "Record should be the same subtype as expected");
+  }
+
+  test("toOne relationship returns record of correct type", function() {
+    var employees = strobe.get('employees');
+    testRecord(employees.objectAt(0), colin);
+    testRecord(employees.objectAt(1), yehuda);
+    testRecord(employees.objectAt(2), charles);
+    testRecord(employees.objectAt(3), matt);
+    testRecord(employees.objectAt(4), erin);
+    testRecord(employees.objectAt(5), digits);
+  });
+
+})();