sproutcore 1.6.0.rc.2-java → 1.6.0.1-java

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.

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/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

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

@@ -132,7 +132,7 @@ SC.LOGGER_LEVEL_NONE  = 'none';
   functions, such as defining groups.
 
   The FireFox plugin Firebug was used as a function reference. Please see
-  {@link <a href="http://getfirebug.com/logging.html">Firebug Logging Reference</a>}
+  [Firebug Logging Reference](http://getfirebug.com/logging.html)
   for further information.
 
   @author Colin Campbell
@@ -258,7 +258,7 @@ SC.Logger = SC.Object.create(
     If this property is set to YES, it will set 'logOutputLevel' to
     SC.LOGGER_LEVEL_DEBUG.  Otherwise, it will have no effect.
 
-    @deprecated
+    @deprecated Set the log level instead.
     @property: {Boolean}
   */
   debugEnabled: NO,

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

@@ -555,7 +555,7 @@ SC.Object.prototype = {
     Although the default init() method returns the receiver, the return
     value is ignored.
 
-    
+
   */
   init: function() {
     this.initObservable();
@@ -729,7 +729,7 @@ SC.Object.prototype = {
     method is called automatically for view classes but may be used for any
     object.
 
-    
+
   */
   awake: function() {
     var outlets = this.outlets,

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

@@ -56,7 +56,7 @@ SC.RangeObserver = /** @scope SC.RangeObserver.prototype */{
     ret.source = source;
     ret.indexes = indexSet ? indexSet.frozenCopy() : null;
     ret.target = target;
-    ret.method = method;
+    ret.method = (typeof method === 'string') ? target[method] : method;
     ret.context = context ;
     ret.isDeep  = isDeep || false ;
     ret.beginObserving();

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

@@ -291,12 +291,12 @@ SC.run = function(callback, target, forceNested) {
       if (callback) callback.call(target);
       if(forceNested || !alreadyRunning) SC.RunLoop.end();
     } catch (e) {
-      SC.ExceptionHandler.handleException(e);
+      var handled = SC.ExceptionHandler.handleException(e);
 
-      // Now that we've handled the exception, throw it again so the browser
+      // If the exception was not handled, throw it again so the browser
       // can deal with it (and potentially use it for debugging).
       // (We don't throw it in IE because the user will see two errors)
-      if (!SC.browser.msie) {
+      if (!handled && !SC.browser.msie) {
         throw e;
       }
     }

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

@@ -32,7 +32,7 @@ sc_require('mixins/copyable');
 
   Whether or not property observing is enabled, sets offer very powerful
   notifications of items being added and removed, through the
-  `#js:addSetObserver` and `#js:removeSetObserver` methods; this can be
+  `:addSetObserver` and `:removeSetObserver` methods; this can be
   very useful, for instance, for filtering or mapping sets.
 
   Note that SC.Set is a primitive object, like an array.  It does implement
@@ -49,18 +49,17 @@ sc_require('mixins/copyable');
   Finally, you can pass in an existing set and the set will be copied.  You
   can also create a copy of a set by calling SC.Set#clone().
 
-      #js
-      // creates a new empty set
-      var foundNames = SC.Set.create();
+        // creates a new empty set
+        var foundNames = SC.Set.create();
 
-      // creates a set with four names in it.
-      var names = SC.Set.create(["Charles", "Tom", "Juan", "Alex"]) ; // :P
+        // creates a set with four names in it.
+        var names = SC.Set.create(["Charles", "Tom", "Juan", "Alex"]) ; // :P
 
-      // creates a copy of the names set.
-      var namesCopy = SC.Set.create(names);
+        // creates a copy of the names set.
+        var namesCopy = SC.Set.create(names);
 
-      // same as above.
-      var anotherNamesCopy = names.clone();
+        // same as above.
+        var anotherNamesCopy = names.clone();
 
   Adding/Removing Objects
   -----------------------
@@ -91,8 +90,8 @@ sc_require('mixins/copyable');
 
   Observing changes
   -----------------
-  When using `#js:SC.Set` (rather than `#js:SC.CoreSet`), you can observe the
-  `#js:"[]"` property to be alerted whenever the content changes.
+  When using `:SC.Set` (rather than `:SC.CoreSet`), you can observe the
+  `:"[]"` property to be alerted whenever the content changes.
 
   This is often unhelpful. If you are filtering sets of objects, for instance,
   it is very inefficient to re-filter all of the items each time the set changes.
@@ -100,10 +99,10 @@ sc_require('mixins/copyable');
   was changed on the original set. The same issue applies to merging sets,
   as well.
 
-  `#js:SC.Set` and `#js:SC.CoreSet` both offer another method of being observed:
-  `#js:addSetObserver` and `#js:removeSetObserver`. These take a single parameter:
-  an object which implements `#js:didAddItem(set, item)` and
-  `#js:didRemoveItem(set, item)`.
+  `:SC.Set` and `:SC.CoreSet` both offer another method of being observed:
+  `:addSetObserver` and `:removeSetObserver`. These take a single parameter:
+  an object which implements `:didAddItem(set, item)` and
+  `:didRemoveItem(set, item)`.
 
   Whenever an item is added or removed from the set, all objects in the set
   (a SC.CoreSet, actually) of observing objects will be alerted appropriately.

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

@@ -10,7 +10,8 @@ test("SC.typeOf", function() {
 	var a = null,
 	    arr = [1,2,3],
 	    obj = {},
-      object = SC.Object.create({ method: function() {} })
+      object = SC.Object.create({ method: function() {} }),
+      E = SC.Error.extend();
 
   equals(SC.T_UNDEFINED,  SC.typeOf(undefined),         "item of type undefined");
   equals(SC.T_NULL,       SC.typeOf(a),                 "item of type null");
@@ -20,6 +21,9 @@ test("SC.typeOf", function() {
 	equals(SC.T_FUNCTION,   SC.typeOf(object.method),     "item of type function") ;
 	equals(SC.T_CLASS,      SC.typeOf(SC.Object),         "item of type class");
   equals(SC.T_ERROR,      SC.typeOf(SC.Error.create()), "item of type error");
+  equals(SC.T_OBJECT,     SC.typeOf(SC.Object.create({ isError: YES })), "sc object with isError property should be of type object");
+  equals(SC.T_ERROR,      SC.typeOf(E.create()),         "item of type error");
+  equals(SC.T_HASH,       SC.typeOf({ isObject: YES }),  "hash object with isObject property should be of type hash");
 });
 
 test("SC.none", function() {
@@ -71,7 +75,7 @@ test("SC.isArray" ,function(){
   equals( SC.isArray(fn),       false, "function() {}" );
 
   if (window.document) {
-    var nodelist      = document.getElementsByTagName("body")
+    var nodelist      = document.getElementsByTagName("body");
     equals( SC.isArray(nodelist), true, "NodeList" );
   }
 });

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/enhance.js

@@ -194,3 +194,33 @@ test("enhance still works if there is no base method to enhance", function() {
 
   ok(enhanced.weirdName(), "enhanced function runs with no errors");
 });
+
+test("should invalidate a computed property added to a subclass via reopen() that depends on a key defined in original");
+
+// Enable the following once we fix this
+/*
+test("should invalidate a computed property added to a subclass via reopen() that depends on a key defined in original", function() {
+  var MyClass = SC.Object.extend({ property: function() { }.property() });
+  var MySubclass = MyClass.extend({ anotherProperty: function() { }.property() });
+
+  var observerCalled = 0;
+
+  MyClass.reopen({
+    yetAnotherProperty: function() {
+      return "Yet Another Property";
+    }.property('property')
+  });
+
+  var mySubclass = MySubclass.create();
+  mySubclass.addObserver('yetAnothesProperty', function() {
+    observerCalled++;
+  });
+
+  SC.run(function() {
+    mySubclass.set('property', "foo");
+  });
+
+  equals(observerCalled, 1, "fires observer once");
+});
+*/
+

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/create.js

@@ -57,3 +57,20 @@ test("does not observe object properties if isDeep is NO", function() {
   }
   equals(observer.callCount, 0, 'range observer should not fire');
 });
+
+test("SC.RangeObserver.create should accept methods specified as strings", function() {
+  var myArray = [ SC.Object.create({ prop: 0 })],
+      rangeObserverCount = 0,
+      observer = SC.Object.create({
+        rangeObserverDidFire: function(source, object, key, index) {
+          ++rangeObserverCount;
+        }
+      }),
+      rangeObserver = SC.RangeObserver.create( myArray, SC.IndexSet.create(0, 1),
+                                               observer, 'rangeObserverDidFire',
+                                               null, true /* isDeep */);
+
+  equals(rangeObserverCount, 0, "Range observer hasn't fired yet");
+  myArray[0].incrementProperty('prop');
+  equals(rangeObserverCount, 1, "Range observer should fire on property change");
+});

data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js

@@ -18,11 +18,14 @@
   You do not create an instance of a state itself. The statechart manager will go through its 
   state heirarchy and create the states itself.
 
+  For more information on using statecharts, see SC.StatechartManager.
+
   @author Michael Cohen
   @extends SC.Object
 */
-SC.State = SC.Object.extend({
-  
+SC.State = SC.Object.extend(
+  /** @lends SC.State.prototype */ {
+
   /**
     The name of the state
     
@@ -1062,6 +1065,10 @@ SC.State.plugin = function(value) {
       console.error('SC.State.plugin: Unable to determine path %@'.fmt(value));
       return undefined;
     }
+    if (!klass.isClass || !klass.kindOf(SC.State)) {
+      console.error('SC.State.plugin: Unable to extend. %@ must be a class extending from SC.State'.fmt(value));
+      return undefined;
+    }
     return klass.extend.apply(klass, args);
   };
   func.statePlugin = YES;

data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js

@@ -62,7 +62,7 @@ sc_require('system/state');
   
   If you liked to specify a class that should be used as the root state but using the above method to defined
   states, you can set the rootStateExample property with a class that extends from SC.State. If the 
-  rootStateExaple property is not explicitly assigned the then default class used will be SC.State.
+  rootStateExample property is not explicitly assigned the then default class used will be SC.State.
   
   To provide your statechart with orthogonality, you use concurrent states. If you use concurrent states,
   then your statechart will have multiple current states. That is because each concurrent state represents an
@@ -590,6 +590,8 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       // No explicit current state to start from; therefore, just use the first current state as 
       // a default, if there is a current state.
       fromCurrentState = this.get('currentStates')[0];
+      msg = "gotoState: fromCurrentState not explicitly provided. Using a default current state to transition from: %@";
+      this.statechartLogWarning(msg.fmt(fromCurrentState));
     }
         
     if (trace) {

data/lib/frameworks/sproutcore/frameworks/testing/resources/runner.css

@@ -71,7 +71,6 @@
 .core-test table {
   background: #000;
   border-spacing: 1px;
-  border-collapse: separate;
   width: 100%;
 }