sproutcore 1.5.0-java → 1.6.0.beta.2-java

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js

@@ -199,3 +199,58 @@ SC.ArraySuite.generate("SC.SparseArray", {
     return SC.SparseArray.create({ delegate: del });
   }
 });
+
+test("should notify enumerable property", function() {
+    var arr = SC.SparseArray.create();
+    var count = 0;
+    function counter() {
+        count++;
+    }
+
+    arr.provideLength(1);
+    arr.addObserver('[]', this, counter);
+    arr.provideObjectAtIndex(0, 'one');
+    equals(count, 1, "observer should have fired once");
+});
+
+test("should notify range observers", function() {
+    var arr = SC.SparseArray.create();
+    var count = 0;
+    function counter(arr, objects, key, indexes) {
+        count++;
+    }
+
+    arr.provideLength(4);
+    var is = SC.IndexSet.create(0,1).add(2,1);
+    arr.addRangeObserver(is, this, counter);
+    arr.provideObjectAtIndex(0, 'one');
+    arr.provideObjectAtIndex(1, 'two');
+    arr.provideObjectAtIndex(2, 'three');
+    arr.provideObjectAtIndex(3, 'four');
+    equals(2, count, "observer should have fired twice");
+});
+
+test("test updating SparseArray length via delegate", function() {
+    var delegate = SC.Object.create({
+        arrlen: null,
+        sparseArrayDidRequestLength: function(arr) {
+            arr.provideLength(this.arrlen);
+        }
+    });
+
+    var arr = SC.SparseArray.create({delegate: delegate});
+    delegate.arrlen = 5;
+    equals(arr.get('length'), 5)
+    arr.provideLength(null);
+    delegate.arrlen = 50;
+    equals(arr.get('length'), 50)
+});
+
+test("test updating SparseArray length explictly", function() {
+    var arr = SC.SparseArray.create();
+    arr.provideLength(5);
+    equals(arr.get('length'), 5)
+    arr.provideLength(50);
+    equals(arr.get('length'), 50)
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/collection.js

@@ -4,6 +4,8 @@
 //            ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*globals TemplateTests */
+
 module("SC.TemplateCollectionView");
 
 TemplateTests = {};
@@ -24,7 +26,7 @@ test("creating a collection view works", function() {
   var ulCollectionView  = CollectionView.create({ tagName: "ul" });
   var olCollectionView  = CollectionView.create({ tagName: "ol" });
   var dlCollectionView  = CollectionView.create({ tagName: "dl", itemView: DefinitionTermChildView });
-  var customTagCollectionView = CollectionView.create({ tagName: "p" })
+  var customTagCollectionView = CollectionView.create({ tagName: "p" });
   
   defaultCollectionView.createLayer();
   ulCollectionView.createLayer();
@@ -48,6 +50,22 @@ test("creating a collection view works", function() {
   equals(customTagCollectionView.$('div').length, 1, "Child view was rendered");
 });
 
+test("not passing a block to the collection helper creates a collection", function() {
+  TemplateTests.CollectionTestView = SC.TemplateCollectionView.create({
+    content: ['foo', 'bar', 'baz'],
+    itemView: SC.TemplateView.design({
+      template: SC.Handlebars.compile('<aside></aside>')
+    })
+  });
+
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{collection "TemplateTests.CollectionTestView"}}')
+  });
+
+  view.createLayer();
+  equals(view.$('aside').length, 3, 'one aside element is created for each content item');
+});
+
 test("passing a block to the collection helper sets it as the template for example views", function() {
   TemplateTests.CollectionTestView = SC.TemplateCollectionView.create({
     content: ['foo', 'bar', 'baz']
@@ -138,6 +156,36 @@ test("should give its item views the classBinding specified by itemClassBinding"
   equals(view.$('ul li.is-baz').length, 2, "removes class when property changes");
 });
 
+test("should pass item* property when created with a block", function() {
+  TemplateTests.CollectionTestView = SC.TemplateCollectionView.create({
+    content: ['foo', 'bar', 'baz']
+  });
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{#collection TemplateTests.CollectionTestView itemFoo="bar"}}baz{{/collection}}')
+  });
+  view.createLayer();
+
+  var childViews = view.getPath('childViews.firstObject.childViews');
+  childViews.forEach(function(childView, index) {
+    equals(childView.get('foo'), 'bar', "Child view #%@ has correct value for property set in template".fmt(index));
+  });
+});
+
+test("should pass item* property when created without a block", function() {
+  TemplateTests.CollectionTestView = SC.TemplateCollectionView.create({
+    content: ['foo', 'bar', 'baz']
+  });
+  var view = SC.TemplateView.create({
+    template: SC.Handlebars.compile('{{collection TemplateTests.CollectionTestView itemFoo="bar"}}')
+  });
+  view.createLayer();
+
+  var childViews = view.getPath('childViews.firstObject.childViews');
+  childViews.forEach(function(childView, index) {
+    equals(childView.get('foo'), 'bar', "Child view #%@ has correct value for property set in template".fmt(index));
+  });
+});
+
 test("should work inside a bound {{#if}}", function() {
   var testData = [SC.Object.create({ isBaz: false }), SC.Object.create({ isBaz: true }), SC.Object.create({ isBaz: true })];
   TemplateTests.ifTestCollectionView = SC.TemplateCollectionView.extend({

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/handlebars.js

@@ -494,7 +494,7 @@ test("Should insert a localized string if the {{loc}} helper is used", function(
     'Brazil': 'Brasilia'
   });
 
-  templates = SC.Object.create({
+  var templates = SC.Object.create({
     'loc': SC.Handlebars.compile('<h1>Country: {{loc "Brazil"}}')
   });
 
@@ -776,6 +776,24 @@ test("should be able to bind view class names to properties", function() {
   });
 
   equals(view.$('.is-done').length, 0, "removes class name if bound property is set to false");
+
+  // There is a bug that if the view becomes first responder, its class bindings get wiped out.
+  // This test illustrates the bug, by adding the view to a pane and making it firstResponder
+
+  var pane = SC.MainPane.design();
+  pane = pane.create().append();
+
+  SC.run(function() {
+    pane.appendChild(view);
+  });
+
+  TemplateTests.classBindingView.becomeFirstResponder();
+
+  SC.run(function() {
+    TemplateTests.classBindingView.set('isDone', YES);
+  });
+
+  equals(view.$('.is-done').length, 1, "dasherizes property and sets class name after becoming first responder");
 });
 
 test("should be able to bind element attributes using {{bindAttr}}", function() {

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template.js

@@ -3,6 +3,7 @@ sc_require("ext/handlebars/bind");
 sc_require("ext/handlebars/collection");
 sc_require("ext/handlebars/localization");
 sc_require("ext/handlebars/view");
+sc_require("views/view");
 
 // Global hash of shared templates. This will automatically be populated
 // by the build tools so that you can store your Handlebars templates in

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template_collection.js

@@ -80,6 +80,8 @@ SC.TemplateCollectionView = SC.TemplateView.extend({
 
     if (this.get('tagName') === 'ul' || this.get('tagName') === 'ol') {
       extensions.tagName = 'li';
+    } else if (this.get('tagName') === 'table' || this.get('tagName') === 'thead' || this.get('tagName') === 'tbody') {
+      extensions.tagName = 'tr';
     }
 
     return itemView.extend(extensions);

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js

@@ -856,7 +856,7 @@ SC.CoreView.reopen(
     @property {Array}
     @readOnly
   */
-  displayProperties: ['isFirstResponder'],
+  displayProperties: [],
 
   // .......................................................
   // SC.RESPONDER SUPPORT
@@ -882,11 +882,12 @@ SC.CoreView.reopen(
 
   /** @private
     Setup a view, but do not finish waking it up.
-    - configure childViews
-    - Determine the view's theme
-    - Fetch a render delegate from the theme, if necessary
-    - register the view with the global views hash, which is used for event
-      dispatch
+
+     - configure childViews
+     - Determine the view's theme
+     - Fetch a render delegate from the theme, if necessary
+     - register the view with the global views hash, which is used for event
+       dispatch
   */
   init: function() {
     var parentView = this.get('parentView'),
@@ -1466,48 +1467,42 @@ SC.CoreView.unload = function() {
 
   Base class for managing a view.  Views provide two functions:
 
-  1. They translate state and events into drawing instructions for the
+   1. They translate state and events into drawing instructions for the
      web browser and
-
-  2. They act as first responders for incoming keyboard, mouse, and
+   2. They act as first responders for incoming keyboard, mouse, and
      touch events.
 
-  h2. View Initialization
+  ## View Initialization
 
   When a view is setup, there are several methods you can override that
   will be called at different times depending on how your view is created.
   Here is a guide to which method you want to override and when:
 
-  - *init:* override this method for any general object setup (such as
-    observers, starting timers and animations, etc) that you need to happen
-    everytime the view is created, regardless of whether or not its layer
-    exists yet.
-
-  - *render:* override this method to generate or update your HTML to reflect
-    the current state of your view.  This method is called both when your view
-    is first created and later anytime it needs to be updated.
-
-  - *didCreateLayer:* the render() method is used to generate new HTML.
-    Override this method to perform any additional setup on the DOM you might
-    need to do after creating the view.  For example, if you need to listen
-    for events.
-
-  - *willDestroyLayer:* if you implement didCreateLayer() to setup event
-    listeners, you should implement this method as well to remove the same
-    just before the DOM for your view is destroyed.
-
-  - *updateLayer:* Normally, when a view needs to update its content, it will
-    re-render the view using the render() method.  If you would like to
-    override this behavior with your own custom updating code, you can
-    replace updateLayer() with your own implementation instead.
-
-  - *didAppendToDocument:* in theory all DOM setup could be done
-    in didCreateLayer() as you already have a DOM element instantiated.
-    However there is cases where the element has to be first appended to the
-    Document because there is either a bug on the browser or you are using
-    plugins which objects are not instantiated until you actually append the
-    element to the DOM. This will allow you to do things like registering
-    DOM events on flash or quicktime objects.
+   - `init` -- override this method for any general object setup (such as
+     observers, starting timers and animations, etc) that you need to happen
+     everytime the view is created, regardless of whether or not its layer
+     exists yet.
+   - `render` -- override this method to generate or update your HTML to reflect
+     the current state of your view.  This method is called both when your view
+     is first created and later anytime it needs to be updated.
+   - `didCreateLayer` -- the render() method is used to generate new HTML.
+     Override this method to perform any additional setup on the DOM you might
+     need to do after creating the view.  For example, if you need to listen
+     for events.
+   - `willDestroyLayer` -- if you implement didCreateLayer() to setup event
+     listeners, you should implement this method as well to remove the same
+     just before the DOM for your view is destroyed.
+   - `updateLayer` -- Normally, when a view needs to update its content, it will
+     re-render the view using the render() method.  If you would like to
+     override this behavior with your own custom updating code, you can
+     replace updateLayer() with your own implementation instead.
+   - `didAppendToDocument` -- in theory all DOM setup could be done
+     in didCreateLayer() as you already have a DOM element instantiated.
+     However there is cases where the element has to be first appended to the
+     Document because there is either a bug on the browser or you are using
+     plugins which objects are not instantiated until you actually append the
+     element to the DOM. This will allow you to do things like registering
+     DOM events on flash or quicktime objects.
 
   @extends SC.Responder
   @extends SC.DelegateSupport
@@ -1515,7 +1510,9 @@ SC.CoreView.unload = function() {
 
 */
 SC.View = SC.CoreView.extend(/** @scope SC.View.prototype */{
-  classNames: ['sc-view']
+  classNames: ['sc-view'],
+  
+  displayProperties: ['isFirstResponder']
 });
 
 //unload views for IE, trying to collect memory.

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js

@@ -35,9 +35,10 @@ SC.View.reopen(
 
     Takes a key, value and either a duration, or a hash of options.
     The options hash has the following parameters
-      - duration: Duration of animation in seconds
-      - callback: Callback method to run when animation completes
-      - timing: Animation timing function
+
+     - duration: Duration of animation in seconds
+     - callback: Callback method to run when animation completes
+     - timing: Animation timing function
 
     @param {String|Hash} key
     @param {Object} value

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/base.js

@@ -1,3 +1,4 @@
+sc_require('mixins/delegate_support');
 
 /** @class */
 SC.CoreView = SC.Responder.extend(SC.DelegateSupport);

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js

@@ -196,6 +196,7 @@ SC.View.reopen(
      - borderRight: right border
      - borderBottom: bottom border
      - borderLeft: bottom left
+     - zIndex: position above or below other views
 
     Note that you can only use certain combinations to set layout.  For
     example, you may set left/right or left/width, but not left/width/right,

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

@@ -1293,29 +1293,14 @@ SC.Query.mixin( /** @scope SC.Query */ {
   orderStoreKeys: function(storeKeys, query, store) {
     // apply the sort if there is one
     if (storeKeys) {
-      
-      // Set tmp variable because we can't pass variables to sort function.
-      // Do this instead of generating a temporary closure function for perf.
-      // We'll use a stack-based approach in case our sort routine ends up
-      // calling code that triggers a recursive invocation of orderStoreKeys.
-      var K           = SC.Query,
-          tempStores  = K._TMP_STORES,
-          tempQueries = K._TMP_QUERIES;
-      if (!tempStores)  tempStores  = K._TMP_STORES = [];
-      if (!tempQueries) tempQueries = K._TMP_QUERIES = [];
-      
-      tempStores.push(store);
-      tempQueries.push(query);
-        
-      var res = storeKeys.sort(SC.Query.compareStoreKeys);
-      
-      K._TMP_STORES.pop();
-      K._TMP_QUERIES.pop();
+      var res = storeKeys.sort(function(a, b) {
+        return SC.Query.compareStoreKeys(query, store, a, b);
+      });
     }
 
     return storeKeys;
   },
-  
+
   /** 
     Default sort method that is used when calling `containsStoreKeys()`
     or `containsRecords()` on this query. Simply materializes two records
@@ -1325,71 +1310,11 @@ SC.Query.mixin( /** @scope SC.Query */ {
     @param {Number} storeKey2 a store key
     @returns {Number} -1 if record1 < record2,  +1 if record1 > record2, 0 if equal
   */
-  compareStoreKeys: function(storeKey1, storeKey2) {
-    var K           = SC.Query,
-        tempStores  = K._TMP_STORES,
-        tempQueries = K._TMP_QUERIES,
-        store       = tempStores[tempStores.length - 1],
-        query       = tempQueries[tempQueries.length - 1],
-        compareFunc = query.compare,
-        record1     = store.materializeRecord(storeKey1),
+  compareStoreKeys: function(query, store, storeKey1, storeKey2) {
+    var record1     = store.materializeRecord(storeKey1),
         record2     = store.materializeRecord(storeKey2);
 
-    // If the query implements a custom 'compare' function, then use it.
-    // Otherwise, we have the logic from the standard version inlined here.
-    if (compareFunc !== K.prototype.compare) {
-      return compareFunc.call(query, record1, record2);
-    }
-    else {
-      // THIS CODE IS THE SAME AS THE 'compare' METHOD, EXCEPT THAT 'this' HAS
-      // BEEN CHANGED TO 'query'.
-      //
-      // It is inlined here to avoid the extra method invocation in the
-      // typical case where the client does not supply a custom 'compare'
-      // function.
-      
-      var result = 0, 
-          propertyName, order, len, i;
-
-      // fast cases go here
-      if (record1 === record2) return 0;
-    
-      // if called for the first time we have to build the order array
-      if (!query._isReady) query.parse();
-      if (!query._isReady) { // can't parse. guid is wrong but consistent
-        return SC.compare(record1.get('id'),record2.get('id'));
-      }
-    
-      // For every property specified in orderBy until non-eql result is found.
-      // Or, if orderBy is a comparison function, simply invoke it with the
-      // records.
-      order = query._order;
-      if (SC.typeOf(order) === SC.T_FUNCTION) {
-        result = order.call(null, record1, record2);
-      }
-      else {
-        len   = order ? order.length : 0;
-        for (i=0; result===0 && (i < len); i++) {
-          propertyName = order[i].propertyName;
-          // if query property has a registered comparison use that
-          if (SC.Query.comparisons[propertyName]) {
-            result = SC.Query.comparisons[propertyName](
-                      record1.get(propertyName),record2.get(propertyName));
-                  
-          // if not use default SC.compare()
-          } else {
-            result = SC.compare(
-                      record1.get(propertyName), record2.get(propertyName) );
-          }
-      
-          if ((result!==0) && order[i].descending) result = (-1) * result;
-        }
-      }
-
-      // return result or compare by guid
-      if (result !== 0) return result ;
-      else return SC.compare(record1.get('id'),record2.get('id'));
-    }
+    return query.compare(record1, record2);
   },
   
   /**

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

@@ -438,13 +438,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     this.set('needsFlush', YES);
 
-    // if we have storeKeys already, then flush immediately because
-    // it will not be as expensive as if we are starting from scratch
     if (this.get('storeKeys')) {
       this.flush();
-    }
-    else {
-      this.enumerableContentDidChange();
+    } else {
+      this.arrayContentDidChange();
     }
 
     return this;
@@ -712,6 +709,16 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
   }.observes('storeKeys'),
 
+  /** @private
+    If anyone adds an array observer on to the record array, make sure
+    we flush so that the observers don't fire the first time length is
+    calculated.
+  */
+  addArrayObservers: function() {
+    this.flush();
+    return SC.Array.addArrayObservers.apply(this, arguments);
+  },
+
   /** @private
     Invoked whenever the content of the `storeKeys` array changes.  This will
     dump any cached record lookup and then notify that the enumerable content