sproutcore 1.6.0.beta.3-java → 1.6.0-java

data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js

@@ -6,6 +6,8 @@
 // ==========================================================================
 
 /**
+  @class
+
   SC.routes manages the browser location. You can change the hash part of the
   current location. The following code
   
@@ -35,7 +37,8 @@
   SC.routes also supports HTML5 history, which uses a '/' instead of a '#'
   in the URLs, so that all your website's URLs are consistent.
 */
-SC.routes = SC.Object.create({
+SC.routes = SC.Object.create(
+  /** @scope SC.routes.prototype */{
   
   /**
     Set this property to YES if you want to use HTML5 history, if available on
@@ -387,8 +390,8 @@ SC.routes = SC.Object.create({
       delete params.route;
       delete params.params;
       route = firstRoute.routeForParts(location.split('/'), params);
-      if (route && route.target && route.method) {
-        route.method.call(route.target, params);
+      if (route && route.method) {
+        route.method.call(route.target || this, params);
       }
     }
   },

data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js

@@ -169,6 +169,17 @@ module('SC.routes defined routes', {
   
 });
 
+test('setting location triggers function when only passed function', function() {
+  var barred = false;
+
+  SC.routes.add('bar', function(params) {
+    barred = true;
+  });
+  SC.routes.set('location', 'bar');
+
+  ok(barred, 'Function was called');
+});
+
 test('setting location simply triggers route', function() {
   SC.routes.add("foo", router, "triggerRoute");
   SC.routes.set('location', 'bar');

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

@@ -29,6 +29,9 @@ if (typeof console === 'undefined') {
   console.log = console.info = console.warn = console.error = function(){};
 }
 
+window.SC = window.SC || {} ;
+window.SproutCore = window.SproutCore || SC ;
+
 // ........................................
 // BOOTSTRAP
 //
@@ -36,7 +39,7 @@ if (typeof console === 'undefined') {
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0.beta.3
+  @version 1.6.0
   @namespace
 
   All SproutCore methods and functions are defined
@@ -54,10 +57,9 @@ if (typeof console === 'undefined') {
   The core Base framework is based on the jQuery API with a number of
   performance optimizations.
 */
-window.SC = window.SC || {} ;
-window.SproutCore = window.SproutCore || SC ;
+SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.6.0.beta.3';
+SC.VERSION = '1.6.0';
 
 /**
   @private
@@ -187,7 +189,8 @@ SC.mixin(/** @scope window.SC.prototype */ {
             SC.T_ARRAY: An instance of Array,<br>
             SC.T_CLASS: A SproutCore class (created using SC.Object.extend()),<br>
             SC.T_OBJECT: A SproutCore object instance,<br>
-            SC.T_HASH: A JavaScript object not inheriting from SC.Object
+            SC.T_HASH: A JavaScript object not inheriting from SC.Object, <br>
+            SC.T_ERROR: A SproutCore SC.Error object <br>
   */
   typeOf: function(item) {
     if (item === undefined) return SC.T_UNDEFINED ;
@@ -198,16 +201,21 @@ SC.mixin(/** @scope window.SC.prototype */ {
     if (nativeType === "function") {
       return item.isClass ? SC.T_CLASS : SC.T_FUNCTION;
     } else if (nativeType === "object") {
-      if (item.isError) {
-        return SC.T_ERROR ;
-      } else if (item.isObject) {
-        return SC.T_OBJECT ;
+      
+      // Note: typeOf() may be called before SC.Error has had a chance to load
+      // so this code checks for the presence of SC.Error first just to make
+      // sure.  No error instance can exist before the class loads anyway so
+      // this is safe.
+      if (SC.Error && (item instanceof SC.Error)) {
+        return SC.T_ERROR;
+      } else if (item instanceof SC.Object) {
+        return SC.T_OBJECT;
       } else {
-        return SC.T_HASH ;
+        return SC.T_HASH;
       }
     }
 
-    return nativeType ;
+    return nativeType;
   },
 
   /**
@@ -304,7 +312,8 @@ SC.mixin(/** @scope window.SC.prototype */ {
   // GUIDS & HASHES
   //
 
-  guidKey: jQuery.expando || ("SproutCore" + ( SC.VERSION + Math.random() ).replace( /\D/g, "" )),
+  // Like jQuery.expando but without any risk of conflict
+  guidKey: "SproutCore" + ( SC.VERSION + Math.random() ).replace( /\D/g, "" ),
 
   // Used for guid generation...
   _guidPrefixes: {"number": "nu", "string": "st"},
@@ -731,6 +740,23 @@ SC.mixin(/** @scope window.SC.prototype */ {
     }
 
     return root ;
+  },
+
+  /**
+   Acts very similar to SC.objectForPropertyPath(), the only difference is
+   that it will throw an error when object can't be found.
+
+    @param {String} path the path
+    @param {Object} root optional root object.  window is used otherwise
+    @param {Integer} stopAt optional point to stop searching the path.
+    @returns {Object} the found object or throws an error.
+  */
+  requiredObjectForPropertyPath: function(path, root, stopAt) {
+    var o = SC.objectForPropertyPath(path, root, stopAt);
+    if(!o) {
+      throw path + " could not be found";
+    }
+    return o;
   }
 
 }); // end mixin

data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/flatten.js

@@ -0,0 +1,24 @@
+// ==========================================================================
+// Project:   SproutCore Costello - Property Observing Library
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*globals module test ok equals same CoreTest */
+
+sc_require('debug/test_suites/array/base');
+
+SC.ArraySuite.define(function(T) {
+
+  T.module("flatten");
+
+  test("should return flattened arrays", function() {
+    var expected = [1,2,3,4,'a'],
+        obj      = T.newObject([1,2,[3,[4]],'a']);
+
+    expected.forEach(function(i,idx) {
+      equals(obj.flatten().objectAt(idx), i,'obj.flatten().objectAt(%@) should match %@'.fmt(idx,i));
+    });
+  });
+});

data/lib/frameworks/sproutcore/frameworks/runtime/ext/array.js

@@ -11,7 +11,8 @@ SC.supplement(Array.prototype, SC.CoreArray);
 
 // Because Arrays are dealt with so much, we add specialized functions.
 
-SC.mixin(Array.prototype, {
+SC.mixin(Array.prototype,
+  /** @lends Array.prototype */ {
 
   // primitive for array support.
   replace: function(idx, amt, objects) {

data/lib/frameworks/sproutcore/frameworks/runtime/ext/function.js

@@ -142,7 +142,7 @@ SC.mixin(Function.prototype,
     not cacheable.
 
     @param {Boolean} aFlag optionally indicate cacheable or no, default YES
-    @returns {Function} reciever, useful for chaining calls.
+    @returns {Function} receiver, useful for chaining calls.
   */
   cacheable: function(aFlag) {
     return SC.Function.cacheable(this, aFlag);
@@ -163,7 +163,7 @@ SC.mixin(Function.prototype,
     non-volatile.
 
     @param {Boolean} aFlag optionally indicate state, default to YES
-    @returns {Function} reciever, useful for chaining calls.
+    @returns {Function} receiver, useful for chaining calls.
   */
   idempotent: function(aFlag) {
     return SC.Function.idempotent(this, aFlag);
@@ -174,13 +174,13 @@ SC.mixin(Function.prototype,
   },
 
   /**
-    Declare that a function should observe an object or property at the named 
+    Declare that a function should observe an object or property at the named
     path.  Note that the path is used only to construct the observation one time.
 
     @param {String...} propertyPaths A list of strings which indicate the
       properties being observed
-      
-    @returns {Function} reciever, useful for chaining calls.
+
+    @returns {Function} receiver, useful for chaining calls.
   */
   observes: function(propertyPaths) {
     return SC.Function.observes(this, arguments);

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js

@@ -373,6 +373,25 @@ SC.CoreArray = /** @lends SC.Array.prototype */ {
     return ret ;
   },
 
+  /**
+    Returns a new array that is a one-dimensional flattening of this array,
+    i.e. for every element of this array extract that and it's elements into
+    a new array.
+
+    @returns {Array}
+   */
+  flatten: function() {
+    var ret = [];
+    this.forEach(function(k) {
+      if (k && k.isEnumerable) {
+        ret = ret.pushObjects(k.flatten());
+      } else {
+        ret.pushObject(k);
+      }
+    });
+    return ret;
+  },
+
   /**
     Returns the largest Number in an array of Numbers. Make sure the array
     only contains values of type Number to get expected result.
@@ -662,7 +681,7 @@ SC.CoreArray = /** @lends SC.Array.prototype */ {
         chain.notifyPropertyDidChange();
 
         for (idx = 0; idx < len; idx++) {
-          item = removedObjects[idx];
+          item = removedObjects.objectAt(idx);
           clonedChain = item[kvoChainList][chainGuid];
           clonedChain.deactivate();
           delete item[kvoChainList][chainGuid];
@@ -691,7 +710,7 @@ SC.CoreArray = /** @lends SC.Array.prototype */ {
 
         len = addedObjects.get('length');
         for (idx = 0; idx < len; idx++) {
-          this._clonePropertyChainToItem(chain, addedObjects[idx]);
+          this._clonePropertyChainToItem(chain, addedObjects.objectAt(idx));
         }
       }, this);
     }

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/copyable.js

@@ -36,7 +36,8 @@ SC.Copyable = /** @scope SC.Copyable.prototype */{
     @returns {Object} copy of receiver
   */
   copy: function(deep) {
-    throw "%@.copy() is not implemented";
+    var className = SC._object_className(this.constructor);
+    throw "%@.copy() is not implemented".fmt(className);
   },
 
   /**
@@ -76,4 +77,4 @@ Array.prototype.copy = function(deep) {
 	  while (idx--) ret[idx] = SC.copy(ret[idx], true);
 	}
 	return ret;
-}
+};

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/freezable.js

@@ -91,7 +91,7 @@ SC.Freezable = /** @scope SC.Freezable.prototype */ {
     Freezes the object.  Once this method has been called the object should
     no longer allow any properties to be edited.
 
-    @returns {Object} reciever
+    @returns {Object} receiver
   */
   freeze: function() {
     // NOTE: Once someone actually implements Object.freeze() in the browser,

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -783,7 +783,7 @@ SC.Observable = /** @scope SC.Observable.prototype */{
       @param {String} key the key to observer
       @param {Object} target the target object to invoke
       @param {String|Function} method the method to invoke.
-      @returns {SC.Observable} reciever
+      @returns {SC.Observable} receiver
     */
     removeObserver: function(key, target, method) {
 

data/lib/frameworks/sproutcore/frameworks/runtime/private/property_chain.js

@@ -151,7 +151,7 @@ SC._PropertyChain = SC.Object.extend(
     }
   },
 
-  //@ if (debug)
+  // @if (debug)
   /**
     Returns a string representation of the chain segment.
 
@@ -161,7 +161,7 @@ SC._PropertyChain = SC.Object.extend(
     return "SC._PropertyChain(target: %@, property: %@)".fmt(
       this.get('target'), this.get('property'));
   }
-  //@ endif
+  // @endif
 });
 
 SC._PropertyChain.createChain = function(path, target, toInvalidate) {

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -259,7 +259,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     The returned instance will also have its parentBinding property set to the
     receiver.
 
-    @param {String} fromPath optional from path.
+    @param {String} [fromPath]
     @returns {SC.Binding} new binding instance
   */
   beget: function(fromPath) {
@@ -291,7 +291,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     behavior is used to support the high-level API provided by SC.Object.
 
     @param {String|Tuple} propertyPath A property path or tuple
-    @param {Object} root optional root object to use when resolving the path.
+    @param {Object} [root] root object to use when resolving the path.
     @returns {SC.Binding} this
   */
   from: function(propertyPath, root) {
@@ -315,7 +315,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
    until you connect the binding.
 
     @param {String|Tuple} propertyPath A property path or tuple
-    @param {Object} root optional root object to use when resolving the path.
+    @param {Object} [root] root object to use when resolving the path.
     @returns {SC.Binding} this
   */
   to: function(propertyPath, root) {
@@ -724,8 +724,8 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     means that if you change the "to" side directly, the "from" side may have
     a different value.
 
-    @param {String} fromPath optional from path to connect.
-    @param {Boolean} aFlag Optionally pass NO to set the binding back to two-way
+    @param {String} [fromPath] from path to connect.
+    @param {Boolean} [aFlag] Pass NO to set the binding back to two-way
     @returns {SC.Binding} this
   */
   oneWay: function(fromPath, aFlag) {
@@ -795,8 +795,8 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     Note that this is not a transform function since it will be called at the
     end of the transform chain.
 
-    @param {String} fromPath optional from path to connect.
-    @param {Boolean} aFlag optionally pass NO to allow error objects again.
+    @param {String} [fromPath] from path to connect.
+    @param {Boolean} [aFlag] Pass NO to allow error objects again.
     @returns {SC.Binding} this
   */
   noError: function(fromPath, aFlag) {
@@ -828,7 +828,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     values are send unchanged.
 
     @param {String} fromPath from path or null
-    @param {Object} placeholder optional placeholder value.
+    @param {Object} [placeholder] placeholder value.
     @returns {SC.Binding} this
   */
   single: function(fromPath, placeholder) {
@@ -849,7 +849,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     null, undefined, an empty array or an empty string.  See also notNull().
 
     @param {String} fromPath from path or null
-    @param {Object} placeholder optional placeholder.
+    @param {Object} [placeholder]
     @returns {SC.Binding} this
   */
   notEmpty: function(fromPath, placeholder) {
@@ -867,7 +867,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     null or undefined.  Otherwise it will passthrough untouched.  See also notEmpty().
 
     @param {String} fromPath from path or null
-    @param {Object} placeholder optional placeholder;
+    @param {Object} [placeholder]
     @returns {SC.Binding} this
   */
   notNull: function(fromPath, placeholder) {
@@ -882,7 +882,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     Adds a transform that will convert the passed value to an array.  If
     the value is null or undefined, it will be converted to an empty array.
 
-    @param {String} fromPath optional from path
+    @param {String} [fromPath]
     @returns {SC.Binding} this
   */
   multiple: function(fromPath) {
@@ -897,7 +897,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     an array it will return YES if array is not empty.  If the value is a string
     it will return YES if the string is not empty.
 
-    @param {String} fromPath optional from path
+    @param {String} [fromPath]
     @returns {SC.Binding} this
   */
   bool: function(fromPath) {
@@ -970,7 +970,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     Adds a transform to convert the value to the inverse of a bool value.  This
     uses the same transform as bool() but inverts it.
 
-    @param {String} fromPath optional from path
+    @param {String} [fromPath]
     @returns {SC.Binding} this
   */
   not: function(fromPath) {
@@ -984,7 +984,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   /**
     Adds a transform that will return YES if the value is null or undefined, NO otherwise.
     
-    @param {String} fromPath optional from path
+    @param {String} [fromPath]
     @returns {SC.Binding} this
   */
   isNull: function(fromPath) {

data/lib/frameworks/sproutcore/frameworks/runtime/system/error.js

@@ -32,6 +32,9 @@ sc_require('ext/function');
   set isError to YES, then calling SC.ok(obj) on your object will return NO.
   If isError is YES, then SC.val(obj) will return your errorValue property
   instead of the receiver.
+  
+  When using SC.typeOf(obj), SC.T_ERROR will only be returned if the obj
+  is an instance of SC.Error
 
   @extends SC.Object
   @since SproutCore 1.0
@@ -124,7 +127,7 @@ SC.$error = function(description, label, value, c) {
 } ;
 
 /**
-  Returns YES if the passed value is an error object or false.
+  Returns NO if the passed value is an error object or false.
 
   @param {Object} ret object value
   @returns {Boolean}