sproutcore 1.5.0 → 1.6.0.beta.1

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

@@ -297,7 +297,7 @@ test("two bindings to the same value should sync in the order they are initializ
   
   var b = window.b;
 
-  SC.LOG_BINDINGS = YES;
+  SC.LOG_BINDINGS = NO;
     
   SC.RunLoop.end();
   

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/contains.js

@@ -53,17 +53,17 @@ test("handle range partially inside set", function() {
 // INDEX SET
 // 
 
-test("handle set inside set", function() {
+test("handle set inside IndexSet", function() {
   var test = SC.IndexSet.create().add(1001,4).add(1005,2);
   equals(set.contains(test), YES, '%@ should be in %@'.fmt(test, set));
 });
 
-test("handle range outside of set", function() {
+test("handle range outside of IndexSet", function() {
   var test = SC.IndexSet.create().add(100,4).add(105,2);
   equals(set.contains(test), NO, '%@ should be in %@'.fmt(test, set));
 });
 
-test("handle range partially inside set", function() {
+test("handle range partially inside IndexSet", function() {
   var test = SC.IndexSet.create().add(1001,4).add(100,2);
   equals(set.contains(test), NO, '%@ should be in %@'.fmt(test, set));
 });

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/intersects.js

@@ -53,17 +53,17 @@ test("handle range partially inside set", function() {
 // INDEX SET
 // 
 
-test("handle set inside set", function() {
+test("handle set inside IndexSet", function() {
   var test = SC.IndexSet.create().add(1001,4).add(1005,2);
   equals(set.intersects(test), YES, '%@ should be in %@'.fmt(test, set));
 });
 
-test("handle range outside of set", function() {
+test("handle range outside of IndexSet", function() {
   var test = SC.IndexSet.create().add(100,4).add(105,2);
   equals(set.intersects(test), NO, '%@ should be in %@'.fmt(test, set));
 });
 
-test("handle range partially inside set", function() {
+test("handle range partially inside IndexSet", function() {
   var test = SC.IndexSet.create().add(1001,4).add(100,2);
   equals(set.intersects(test), YES, '%@ should be in %@'.fmt(test, set));
 });

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

@@ -508,15 +508,11 @@ SC.State = SC.Object.extend({
     
     Method can be called in the following ways: 
     
-    {{{
-    
-      // With one argument
-      gotoState(<state>)
+        // With one argument
+        gotoState(<state>)
       
-      // With two arguments
-      gotoState(<state>, <hash>)
-    
-    }}}
+        // With two arguments
+        gotoState(<state>, <hash>)
     
     Where <state> is either a string or a SC.State object and <hash> is a regular JS hash object.
     
@@ -545,18 +541,14 @@ SC.State = SC.Object.extend({
     
     Method can be called in the following ways:
     
-    {{{
+        // With one argument
+        gotoHistoryState(<state>)
     
-      // With one argument
-      gotoHistoryState(<state>)
-      
-      // With two arguments
-      gotoHistoryState(<state>, <boolean | hash>)
-      
-      // With three arguments
-      gotoHistoryState(<state>, <boolean>, <hash>)
+        // With two arguments
+        gotoHistoryState(<state>, <boolean | hash>)
     
-    }}}
+        // With three arguments
+        gotoHistoryState(<state>, <boolean>, <hash>)
     
     Where <state> is either a string or a SC.State object and <hash> is a regular JS hash object.
     
@@ -692,10 +684,10 @@ SC.State = SC.Object.extend({
     
     There is a particular order in how an event is handled by a state:
     
-      1) Basic function whose name matches the event
-      2) Registered event handler that is associated with an event represented as a string
-      3) Registered event handler that is associated with events matching a regular expression
-      4) The unknownEvent function
+     1. Basic function whose name matches the event
+     2. Registered event handler that is associated with an event represented as a string
+     3. Registered event handler that is associated with events matching a regular expression
+     4. The unknownEvent function
       
     Use of event handlers that are associated with events matching a regular expression may
     incur a performance hit, so they should be used sparingly.
@@ -706,33 +698,29 @@ SC.State = SC.Object.extend({
     
     Example of a state using all four event handling techniques:
     
-    {{{
-    
-      SC.State.extend({
+        SC.State.extend({
       
-        // Basic function handling event 'foo'
-        foo: function(arg1, arg2) { ... },
+          // Basic function handling event 'foo'
+          foo: function(arg1, arg2) { ... },
         
-        // event handler that handles 'frozen' and 'canuck'
-        eventHandlerA: function(event, arg1, arg2) {
-          ...
-        }.handleEvent('frozen', 'canuck'),
+          // event handler that handles 'frozen' and 'canuck'
+          eventHandlerA: function(event, arg1, arg2) {
+            ...
+          }.handleEvent('frozen', 'canuck'),
         
-        // event handler that handles events matching the regular expression /num\d/
-        //   ex. num1, num2
-        eventHandlerB: function(event, arg1, arg2) {
-          ...
-        }.handleEvent(/num\d/),
+          // event handler that handles events matching the regular expression /num\d/
+          //   ex. num1, num2
+          eventHandlerB: function(event, arg1, arg2) {
+            ...
+          }.handleEvent(/num\d/),
         
-        // Handle any event that was not handled by some other
-        // method on the state
-        unknownEvent: function(event, arg1, arg2) {
+          // Handle any event that was not handled by some other
+          // method on the state
+          unknownEvent: function(event, arg1, arg2) {
         
-        }
+          }
       
-      })
-    
-    }}}
+        });
   */
   tryToHandleEvent: function(event, arg1, arg2) {
 
@@ -795,13 +783,9 @@ SC.State = SC.Object.extend({
     as an animation or fetching remote data, then you need to return an asynchronous 
     action, which is done like so:
     
-    {{{
-    
-      enterState: function() {
-        return this.performAsync('foo');
-      }
-    
-    }}}
+        enterState: function() {
+          return this.performAsync('foo');
+        }
     
     After returning an action to be performed asynchronously, the statechart will suspend
     the active state transition process. In order to resume the process, you must call
@@ -845,13 +829,9 @@ SC.State = SC.Object.extend({
     as an animation or fetching remote data, then you need to return an asynchronous 
     action, which is done like so:
     
-    {{{
-    
-      exitState: function() {
-        return this.performAsync('foo');
-      }
-    
-    }}}
+        exitState: function() {
+          return this.performAsync('foo');
+        }
     
     After returning an action to be performed asynchronously, the statechart will suspend
     the active state transition process. In order to resume the process, you must call
@@ -1055,35 +1035,21 @@ SC.State = SC.Object.extend({
   
   Example:
   
-    {{{
-    
       MyApp.statechart = SC.Statechart.create({
-      
         rootState: SC.State.design({
-        
           initialSubstate: 'a',
-          
           a: SC.State.plugin('path.to.a.state.class'),
-          
           b: SC.State.plugin('path.to.another.state.class')
-        
         })
-      
-      })
-    
-    }}}
+      });
     
   You can also supply hashes the plugin feature in order to enhance a state or
   implement required functionality:
-  
-    {{{
-    
+
       SomeMixin = { ... };
-    
+
       stateA: SC.State.plugin('path.to.state', SomeMixin, { ... })
-    
-    }}}
-  
+
   @param value {String} property path to a state class
   @param args {Hash,...} Optional. Hash objects to be added to the created state
 */
@@ -1107,39 +1073,25 @@ SC.State.design = SC.State.extend;
   By default, when you add a method to a state, the state will react to 
   events that matches a method's name, like so:
   
-  {{{
-  
-    state = SC.State.extend({
-    
-      // Will be invoked when a event named "foo" is sent to this state
-      foo: function(event, sender, context) { ... }
-    
-    })
-  
-  }}}
+      state = SC.State.extend({
+        // Will be invoked when a event named "foo" is sent to this state
+        foo: function(event, sender, context) { ... }
+      });
   
   In some situations, it may be advantageous to use one method that can react to 
   multiple events instead of having multiple methods that essentially all do the
   same thing. In order to set a method to handle more than one event you use
   the handleEvents method which can be supplied a list of string and/or regular
   expressions. The following example demonstrates the use of handleEvents:
-  
-  {{{
-  
-    state = SC.State.extend({
-    
-      eventHandlerA: function(event, sender, context) {
-      
-      }.handleEvents('foo', 'bar'),
-      
-      eventHandlerB: function(event, sender, context) {
-      
-      }.handleEvents(/num\d/, 'decimal')
-    
-    })
-  
-  }}}
-  
+
+      state = SC.State.extend({
+        eventHandlerA: function(event, sender, context) {
+        }.handleEvents('foo', 'bar'),
+
+        eventHandlerB: function(event, sender, context) {
+        }.handleEvents(/num\d/, 'decimal')
+      });
+
   Whenever events 'foo' and 'bar' are sent to the state, the method eventHandlerA
   will be invoked. When there is an event that matches the regular expression
   /num\d/ or the event is 'decimal' then eventHandlerB is invoked. In both 
@@ -1172,29 +1124,18 @@ Function.prototype.handleEvents = function() {
   will be inactive. This removes the need for you having to explicitly call
   addObserver and removeObserver. As an example:
   
-  {{{
-  
-    state = SC.State.extend({
-    
-      foo: null,
-      
-      user: null,
-    
-      observeHandlerA: function(target, key) {
-        
-      }.stateObserves('MyApp.someController.status'),
-      
-      observeHandlerB: function(target, key) {
-      
-      }.stateObserves('foo'),
-      
-      observeHandlerC: function(target, key) {
-      
-      }.stateObserves('.user.name', '.user.salary')
-    
-    })
-  
-  }}}
+      state = SC.State.extend({
+        foo: null,
+        user: null,
+        observeHandlerA: function(target, key) {        
+        }.stateObserves('MyApp.someController.status'),
+
+        observeHandlerB: function(target, key) {
+        }.stateObserves('foo'),
+
+        observeHandlerC: function(target, key) {
+        }.stateObserves('.user.name', '.user.salary')
+      });
   
   Above, state has three state observe handlers: observeHandlerA, observeHandlerB, and
   observeHandlerC. When state is entered, the state will automatically add itself as
@@ -1225,10 +1166,7 @@ Function.prototype.stateObserves = function() {
   
   An example of how to use:
   
-  {{{
-  
     stateA: SC.State.design({
-    
       initialSubstate: SC.HistoryState({
         defaultState: 'stateB'
       }),
@@ -1236,12 +1174,7 @@ Function.prototype.stateObserves = function() {
       stateB: SC.State.design({ ... }),
       
       stateC: SC.State.design({ ... })
-    
     })
-  
-  }}}
-  
-  
 */
 SC.HistoryState = SC.Object.extend({