sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/apps/tests/english.lproj/strings.js

@@ -17,12 +17,14 @@ SC.stringsFor('English', {
   "Kind.module": "Modules",
   "Kind.theme": "Themes",
 
+  "_All": "All",
   "_Test Runner" : "Test Runner",
   "_No Targets" : "No Targets",
   "_No Tests" : "No Tests",
   "_Loading Targets" : "Loading Targets",
   "_No Target Selected" : "No Target Selected",
   "_Loading Tests" : "Loading Tests",
-  "_Window Title" : "Test Runner - %@",
+  "_Window Title" : "Test Runner – %@",
+  "_Window Test Title": "Test Runner – %@/%@",
   "_No Target" : "No Target"
 }) ;

data/lib/frameworks/sproutcore/apps/tests/main.js

@@ -1,8 +1,10 @@
 // ==========================================================================
-// Project:   TestRunner
-// Copyright: ©2011 Apple Inc.
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2013 7x7 Software, Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals TestRunner */
+/*global TestRunner */
 
 // This is the function that will start your app running.  The default
 // implementation will load any fixtures you have created then instantiate
@@ -12,16 +14,9 @@
 // See comments for some pointers on what to do next.
 //
 TestRunner.main = function main() {
-  
-  // setup views
-  TestRunner.getPath('mainPage.mainPane').append() ;
+  // Add the main pane.
+  TestRunner.getPath('mainPage.mainPane').append();
 
-  TestRunner.makeFirstResponder(TestRunner.START);
-
-  // load initial data
-  //var targets = TestRunner.store.findAll(CoreTools.Target);
-  //TestRunner.targetsController.set('content', targets);
-
-} ;
+};
 
 function main() { TestRunner.main(); }

data/lib/frameworks/sproutcore/apps/tests/statechart.js

@@ -0,0 +1,268 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2013 7x7 Software, Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*global TestRunner, CoreTools */
+
+
+/**
+  Application statechart.
+*/
+TestRunner.statechart = SC.Object.create(SC.StatechartManager, {
+
+  trace: false,
+
+  rootState: SC.State.extend({
+    initialSubstate: 'loadingTargets',
+
+    loadingTargets: SC.State.extend({
+
+      enterState: function () {
+        var targets = TestRunner.store.find(CoreTools.TARGETS_QUERY);
+
+        TestRunner.set('currentScene', 'targetsLoading');
+
+        TestRunner.targetsController.set('content', targets);
+        return SC.Async.perform();
+      }
+
+    }),
+
+    readyTargets: SC.State.extend({
+
+      initialSubstate: 'noSelectedTarget',
+
+      /**
+        Invoked when you select a target.
+      */
+      selectTarget: function (sender) {
+        var selection = sender.get('selection'),
+          target = selection.get('firstObject');
+
+        // Give bindings a chance to flush.
+        this.invokeLast(function () {
+          if (target) {
+            this.gotoState('selectedTarget');
+          } else {
+            this.gotoState('noSelectedTarget');
+          }
+        });
+      },
+
+      noSelectedTarget: SC.State.extend({
+
+        representRoute: '',
+
+        enterState: function () {
+          var hasTargets = TestRunner.targetsController.get('length') > 0;
+
+          if (hasTargets) {
+            TestRunner.set('currentScene', 'testsNone');
+          } else {
+            TestRunner.set('currentScene', 'noTests');
+          }
+
+          document.title = "_Window Title".loc('_No Target'.loc());
+          this.set('location', '');
+        }
+
+      }),
+
+      selectedTarget: SC.State.extend({
+
+        initialSubstate: 'noSelectedTest',
+
+        enterState: function () {
+          var target = TestRunner.targetController.get('content'),
+            tests = target.get('tests'),
+            ret = true;
+
+          if (tests && (tests.get('status') & SC.Record.BUSY)) {
+            TestRunner.set('currentScene', 'testsLoading');
+
+            ret = SC.Async.perform();
+          }
+
+          return ret;
+        },
+
+        enterStateByRoute: function (context) {
+          var name = context.params.target,
+            target,
+            tests;
+
+          // Select the proper target.
+          target = TestRunner.targetsController.findProperty('name', '/' + name.replace(/-/g, '/'));
+          TestRunner.targetsController.selectObject(target);
+          tests = target.get('tests');
+
+          if (tests.get('status') & SC.Record.BUSY) {
+            // This will call resumeGotoState.
+            TestRunner.set('currentScene', 'testsLoading');
+          } else {
+            // Resume after the bindings have flushed.
+            this.invokeLast(function () {
+              this.resumeGotoState();
+            }, this);
+          }
+
+          return SC.Async.perform();
+        },
+
+        noSelectedTest: SC.State.extend({
+
+          representRoute: ':target',
+
+          /**
+            Invoked when you select a test.
+          */
+          selectTest: function (sender) {
+            var selection = sender.get('selection'),
+              target = selection.get('firstObject');
+
+            // Give bindings a chance to flush.
+            this.invokeLast(function () {
+              if (target) {
+                this.gotoState('selectedTest');
+              } else {
+                this.gotoState('noSelectedTest');
+              }
+            });
+          },
+
+          // runTests: function (sender) {
+          //   this.gotoState('allSelectedTests');
+          // },
+
+          enterState: function () {
+            var target = TestRunner.targetController.get('content'),
+              tests = target.get('tests'),
+              name;
+
+            if (tests.get('length') === 0) {
+              TestRunner.set('currentScene', 'noTests');
+            } else {
+              TestRunner.set('currentScene', 'testsMaster');
+            }
+
+            // Update the window title and location
+            name = target.get('urlName');
+            this.set('location', name);
+            document.title = "_Window Title".loc(target.get('displayName'));
+          }
+
+        }),
+
+        // allSelectedTests: SC.State.extend({
+
+        //   representRoute: ':target/all',
+
+        //   runTests: function () {
+        //     TestRunner.testController.notifyPropertyChange('uncachedUrl');
+        //   },
+
+        //   /**
+        //     Invoked when you click "back"
+        //   */
+        //   back: function () {
+        //     TestRunner.testsController.selectObject(null);
+        //     this.gotoState('noSelectedTest');
+        //   },
+
+        //   enterState: function () {
+        //     var target = TestRunner.targetController.get('content'),
+        //       test = TestRunner.testController.get('content'),
+        //       name,
+        //       filename;
+
+        //     TestRunner.set('currentScene', 'testsDetail');
+
+        //     // Update the window title and location
+        //     name = target.get('urlName');
+        //     filename = test.get('filename');
+        //     document.title = "_Window Test Title".loc(target.get('displayName'), filename);
+
+        //     this.set('location', name + '/' + filename);
+        //   },
+
+        //   enterStateByRoute: function (context) {
+        //     var name = context.params.target,
+        //       target,
+        //       test, tests;
+
+        //     // Select the proper target.
+        //     target = TestRunner.targetsController.findProperty('name', '/' + name.replace(/-/g, '/'));
+        //     TestRunner.targetsController.selectObject(target);
+        //     tests = target.get('tests');
+        //     TestRunner.testsController.selectObjects(tests);
+
+        //     TestRunner.set('currentScene', 'testsDetail');
+
+        //     // Update the window title.
+        //     document.title = "_Window Test Title".loc(target.get('displayName'), '_All'.loc());
+        //   }
+
+        // }),
+
+        selectedTest: SC.State.extend({
+
+          representRoute: ':target/*filename',
+
+          runTests: function () {
+            TestRunner.testController.notifyPropertyChange('uncachedUrl');
+          },
+
+          /**
+            Invoked when you click "back"
+          */
+          back: function () {
+            TestRunner.testsController.selectObject(null);
+            this.gotoState('noSelectedTest');
+          },
+
+          enterState: function () {
+            var target = TestRunner.targetController.get('content'),
+              test = TestRunner.testController.get('content'),
+              name,
+              filename;
+
+            TestRunner.set('currentScene', 'testsDetail');
+
+            // Update the window title and location
+            name = target.get('urlName');
+            filename = test.get('filename');
+            document.title = "_Window Test Title".loc(target.get('displayName'), filename);
+
+            this.set('location', name + '/' + filename);
+          },
+
+          enterStateByRoute: function (context) {
+            var name = context.params.target,
+              filename = context.params.filename,
+              target,
+              test, tests;
+
+            // Select the proper target.
+            target = TestRunner.targetsController.findProperty('name', '/' + name.replace(/-/g, '/'));
+            TestRunner.targetsController.selectObject(target);
+            tests = target.get('tests');
+            test = tests.findProperty('filename', filename);
+            TestRunner.testsController.selectObject(test);
+
+            TestRunner.set('currentScene', 'testsDetail');
+
+            // Update the window title.
+            document.title = "_Window Test Title".loc(target.get('displayName'), filename);
+          }
+
+        })
+
+      })
+
+    })
+
+  })
+
+});

data/lib/frameworks/sproutcore/apps/tests/views/offset_checkbox.js

@@ -4,11 +4,11 @@
 // ==========================================================================
 /*globals TestRunner */
 
-/** @class
+/**
 
-  This special view class will automatically adjusts its left offset based 
+  This special view class will automatically adjusts its left offset based
   on an "offset" value, which is will be bound to the width of the split view.
-  
+
   This way when you resize the split view, the checkbox view will move also.
 
   @extends SC.CheckboxView
@@ -18,7 +18,7 @@ TestRunner.OffsetCheckboxView = SC.CheckboxView.extend(
 
   /** bind to thickness of splitview (though a controller) */
   offset: 0,
-  
+
   offsetDidChange: function() {
     this.adjust('left', this.get('offset')+6);
   }.observes('offset')

data/lib/frameworks/sproutcore/apps/welcome/controllers/targets.js

@@ -2,10 +2,10 @@
 // Project:   Welcome.targetsController
 // Copyright: ©2011 Apple Inc.
 // ==========================================================================
-/*globals CoreTools Welcome */
+/*global CoreTools Welcome */
+
+/**
 
-/** @class
-  
   Manages the list of targets
 
   @extends SC.ArrayController
@@ -16,30 +16,30 @@ Welcome.targetsController = SC.ArrayController.create(
   /**
     Call this method whenever you want to reload the targets from the server.
   */
-  reload: function() {
+  reload: function () {
     var targets = Welcome.store.find(CoreTools.TARGETS_QUERY);
     this.set('content', targets);
   },
-  
-  appsOnly: function() {
-    return this.filter(function(t) {
+
+  appsOnly: function () {
+    return this.filter(function (t) {
       return t.get('kind') === 'app' && !t.get('name').match(/sproutcore\/(welcome|experimental)/);
-    });
+    }).sortProperty('sortKind', 'displayName');
   }.property('[]').cacheable(),
-  
-  loadApplication: function() {
+
+  loadApplication: function () {
     var app = this.get('selection').firstObject(),
         url = app ? app.get('appUrl') : null;
-        
+
     if (url) {
       this.set('canLoadApp', NO);
-      this.invokeLater(function() { 
+      this.invokeLater(function () {
         window.location.href = url; // load new app
       });
     }
   },
-  
-  launchEnabled: function() {
+
+  launchEnabled: function () {
     var canLoadApp = this.get('canLoadApp'),
         selection = this.get('selection'),
         selectedObject = selection.firstObject();
@@ -48,8 +48,8 @@ Welcome.targetsController = SC.ArrayController.create(
 
   // used to disable all controls
   canLoadApp: YES,
-  
+
   allowsEmptySelection: NO,
   allowsMultipleSelection: NO
 
-}) ;
+});

data/lib/frameworks/sproutcore/apps/welcome/core.js

@@ -4,14 +4,14 @@
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals Welcome */
+/*global Welcome */
+
+/**
 
-/** @namespace
-  
   The Welcome app is displayed when you load the root URL and the dev server
-  is visible.  It will fetch the list of targets from the server and list 
+  is visible.  It will fetch the list of targets from the server and list
   them.
-  
+
   @extends SC.Object
 */
 Welcome = SC.Object.create(
@@ -19,12 +19,12 @@ Welcome = SC.Object.create(
 
   NAMESPACE: 'Welcome',
   VERSION: '1.0.0',
-  
+
   store: SC.Store.create().from('CoreTools.DataSource'),
-  
-  displayTitle: function() {
+
+  displayTitle: function () {
     var hostname = (window.location.hostname || 'localhost').toString();
     return hostname.match(/sproutcore\.com/) ? "SproutCore Demos".loc() : "SproutCore Developer Tools";
   }.property().cacheable()
 
-}) ;
+});