sproutcore 0.9.1 → 0.9.2

data/clients/sc_docs/english.lproj/no_docs.rhtml

@@ -1,4 +1,5 @@
-<% view :no_docs_panel, :panel => true, :width => 400 do %>
+
+<% view :no_docs_panel, :width => 400 do %>
 <div>
   <h1>Client Has No Documents</h1>
   <p style="font-size: 15px;">This client does not currently have any unit tests.  To add a unit test, open a terminal to the root directly and type:</p>

data/clients/sc_docs/english.lproj/tabs.rhtml

@@ -0,0 +1,16 @@
+<%= view :runner_tab, 
+  :tag => :iframe, 
+  :visible => false,
+  :view => 'Docs.DocFrameView', 
+  :bind => { :doc => 'Docs.docsController.selectedDoc' } %>
+
+<% view :rebuilding_tab, :visible => false do %>
+  <div class="dialog">
+    <h1>
+      <img src="<%= static_url('indicator') %>" /> Rebuilding Reference Documentation...<br />(This may take awhile)
+    </h1>
+  </div>
+<% end %>
+
+<% view :empty_tab do %>      
+<% end %>

data/clients/sc_docs/main.js

@@ -4,18 +4,23 @@
 
 function main() {
   SC.page.awake() ;
-  
-  console.log('main') ;
-  var clientRoot = window.location.pathname.toString().replace(/-docs\/.*/,'-docs').substr(1,window.location.pathname.length);
-  var clientName = clientRoot.match(/([^\/]+)\/-docs/)[1];
-  Docs.hidePanels() ;
+
+  // SproutCore loads the files from a pre-generated location unlike when
+  // this apps runs on your local box, hence this logic.
+  if (window.location.hostname.toString().indexOf('sproutcore.com') >= 0) {
+    var clientRoot = 'sproutcore/-docs' ;
+    var clientName = 'sproutcore' ;   
+    var canRebuild = NO ; 
+  } else {
+    var clientRoot = window.location.pathname.toString().replace(/-docs\/.*/,'-docs').substr(1,window.location.pathname.length);
+    var clientName = clientRoot.match(/([^\/]+)\/-docs/)[1];
+    var canRebuild = YES ; 
+  }
+
   Docs.docsController.set('selection',[]) ;
   Docs.docsController.set('clientRoot', clientRoot) ;
   Docs.docsController.set('clientName', clientName) ;
+  Docs.docsController.set('canRebuild', canRebuild) ;
   Docs.docsController.reloadDocs() ;
 } ;
 
-Docs.hidePanels = function() {
-  SC.page.get('warningPanel').set('isVisible', false) ;
-  SC.page.get('noDocsPanel').set('isVisible',false) ;
-} ;

data/clients/sc_docs/models/doc.js

@@ -5,5 +5,5 @@
 require('core');
 
 Docs.Doc = SC.Record.extend({
-    
+  icon: 'sc-icon-document-16'
 }) ;

data/clients/sc_docs/tests/controllers/docs.rhtml

@@ -14,8 +14,7 @@ Test.context("Docs.DocsController",{
 
 }) ;
 
-appMain = main; main = null ; // Cancel main() so app does not start
-
+if (window.main && (appMain = main)) main = null ; 
 </script>
 
 <% end %>

data/clients/sc_docs/tests/models/doc.rhtml

@@ -14,8 +14,7 @@ Test.context("Docs.Doc",{
 
 }) ;
 
-appMain = main; main = null ; // Cancel main() so app does not start
-
+if (window.main && (appMain = main)) main = null ; 
 </script>
 
 <% end %>

data/clients/sc_docs/tests/views/doc_frame.rhtml

@@ -14,8 +14,7 @@ Test.context("Docs.DocFrameView",{
 
 }) ;
 
-appMain = main; main = null ; // Cancel main() so app does not start
-
+if (window.main && (appMain = main)) main = null ; 
 </script>
 
 <% end %>

data/clients/sc_docs/tests/views/doc_label_view.rhtml

@@ -14,8 +14,7 @@ Test.context("Docs.DocLabelView",{
 
 }) ;
 
-appMain = main; main = null ; // Cancel main() so app does not start
-
+if (window.main && (appMain = main)) main = null ; 
 </script>
 
 <% end %>

data/clients/sc_docs/views/doc_frame.js

@@ -28,6 +28,6 @@ Docs.DocFrameView = SC.View.extend({
       this.rootElement.src = url ;
     }
     
-  }.observes('doc')
+  }.observes('doc', 'isVisibleInWindow')
     
 }) ;

data/clients/sc_test_runner/controllers/runner.js

@@ -14,7 +14,9 @@ TestRunner.runnerController = SC.Object.create({
   
   // This is displayed as the main UI label.
   displayClientName: function() {
-    return "%@ Tests".fmt((this.get('clientName') || '').humanize().capitalize()) ;
+    var clientName = (this.get('clientName') || '').humanize().capitalize();
+    if (clientName == 'Sproutcore') clientName = 'SproutCore' ; 
+    return "%@ Tests".fmt(clientName) ;
   }.property('clientName'),
   
   arrangedObjects: [],
@@ -45,18 +47,37 @@ TestRunner.runnerController = SC.Object.create({
         return '' ;
     }
   }.property('testState'),
+
+  testStateIsRunning: function() {
+    return (this.get('testState') === TestRunner.TEST_RUNNING) ;
+  }.property('testState'),
   
   isRunning: NO,
   isContinuousIntegrationEnabled: NO,
   
   runTestLabel: function() {
-    return (this.get('isRunning')) ? "Stop Tests" : "Run Tests" ;
+    return (this.get('isRunning')) ? "Stop All Tests" : "Run All Tests" ;
   }.property('isRunning'),
   
   toggleRunTests: function() {
     this.toggleProperty('isRunning') ;
   },
   
+  rerunCurrentTest: function() {
+    var test = this.get('selectedTest') ;
+    if (test) {
+      this.set('selection', []) ;
+      this.set('selection', [test]) ;
+    }
+  },
+  
+  canRerunCurrentTest: function() {
+    if (this.get('isRunning')) return NO ;
+    var state = this.get('testState') ;
+    var ret = (state === TestRunner.TEST_FAILED || state === TestRunner.TEST_PASSED) ? YES : NO ;
+    return ret; 
+  }.property('isRunning', 'testState'),
+  
   reloadTests: function() {
     
     // Use Ajax to ask the server for the latest set of tests for the 
@@ -85,16 +106,18 @@ TestRunner.runnerController = SC.Object.create({
     // working away immediately.
     if (recs.length == 0) {
       SC.page.get('noTestsPanel').set('isVisible',true) ;
-      setTimeout(this.reloadTests.bind(this),2000) ; 
+      this.invokeLater(this.reloadTests,2000) ; 
     } else {
       SC.page.get('noTestsPanel').set('isVisible',false) ;
     }
     
     // sort the records by name and set as the new arrangedObjects.
     recs = recs.sort(function(a,b) {
-      a = a.get('name') || '';
-      b = b.get('name') || '';
-      return a.localeCompare(b) ;
+      var a_g = a.get('group') || '';
+      var b_g = b.get('group') || '';
+      
+      var ret = a_g.localeCompare(b_g) ;
+      return (ret != 0) ? ret : (a.get('title') || '').localeCompare(b.get('title') || '') ;
     }) ;
     
     var hadArrangedObjects = this.get('arrangedObjects').length > 0 ;
@@ -122,9 +145,9 @@ TestRunner.runnerController = SC.Object.create({
         var tests = this.get('arrangedObjects') ;
         var firstTest = (tests && tests.length > 0) ? [tests[0]] : [] ;
         this.set('selection', []) ; // clear selection.
-        setTimeout(function() {
+        var t = function() {
           this.set('selection', firstTest) ;
-        }.bind(this),1) ;
+        }.invokeLater(this,1) ;
       }
     }
   }.observes('isRunning'),

data/clients/sc_test_runner/english.lproj/body.css

@@ -1,151 +1,91 @@
+/* @override 
+	http://localhost:4020/static/sc_docs/en/_cache/body-1208633994.css
+	http://localhost:4020/static/sc_docs/en/_cache/body-1208635640.css
+*/
 
+/* @group Core */
 
-/* @group Workspace */
-
-#workspace {
-	background-color: #8db69a;
+body {
 	position: absolute ;
-	top: 0;
 	left: 0;
-	right:  0;
-	bottom: 0; 
+	right: 0;
+	top: 0;
+	bottom: 0;
+	padding: 0;
+	margin: 0;
+	overflow: hidden ;
 }
 
-#workspace .container {
-	position: absolute ;
-	top:  49px;
-	left: 171px;
-	right: 0px;
-	bottom: 26px;
-	background-color: white ;
-	overflow: auto;
+.workspace .sidebar {
+	position: absolute;
+	left:  0;
+	top:  0;
+	width: 200px;
+	bottom: 0;
 }
 
-#workspace .container iframe {
-	border: none ;
-	width: 100%;
-	height: 100%;
-	outline: hidden ;	
+.sc-theme .workspace.horizontal .sc-split-divider-view {
+  position: absolute;
+  left: 200px;
+  top: 0;
+  bottom: 0;
 }
 
-#workspace .footer {
-	position: absolute ;
-	bottom: 0px;
-	left: 0px;
-	height: 26px;
-	right:  0px;
-	background: static_url('images/gradients') repeat-x left -72px;
-	border-top: 1px solid #62806d;
-	text-align: center ;
-	font-weight:  bold ;
+.workspace .document_view {
+	position: absolute;	
+	left: 205px;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	border: none ;
+	background-color: #aaa ;
 }
 
-#workspace .footer div {
-	margin-top: 5px;
+.document_view iframe {
+	position: absolute ;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	border: none ;
+	padding: 0;
+	margin: 0;
+	background: white;
 }
 
 
-/* @end */
-
-/* @group Toolbar */
-
-#workspace .toolbar {
-	position: absolute ;
-	top:  0;
-	left:  0px;
-	right: 0px;
-	height: 48px;
-	border-bottom: 1px solid #62806d;
-	background: static_url('images/gradients') repeat-x center top;
+.left.app-label {
+ 	padding-top: 5px;
 }
- 
-#workspace .toolbar .buttons {
-	text-align: right ;
-	position: absolute ;
-	top:  13px ;
-	right: 10px ;
+
+.sc-theme .app-label .sc-label-view {
+	text-shadow: white 0px 1px 0px;
+	font-weight: bold ;
+	font-size: 15px;
 }
 
-#workspace .toolbar h1 {
-  border: none ;
-  padding: 0;
-  margin : 0;
-	position: absolute ;
-	left: 8px;
-	top:  4px;
-	font-size: 28px;
-	font-weight: normal ;
+.app-label img {
+	width: 27px;
+	height: 27px;
+	vertical-align: middle;
+	position: relative ;
+	top: -3px;
+	margin-right: 2px;
 }
 
 /* @end */
 
 /* @group Sidebar */
 
-#workspace .sidebar {
+.sidebar .source_list {
 	position: absolute ;
-	top: 49px;
-	left: 0px;
-	width: 170px;
-	bottom: 26px;
-	background-color: #e0efed;
-	border-right: 1px #62806d solid;
-	overflow: auto ;
-}
-
-.sidebar {
-	list-style-type: none ;
-	padding: 0;
-	margin: 0;
-}
-
-.sidebar a {
-	display: block ;
-	text-decoration: none ;
-	color: black ;
-	border: 1px solid #e0efed;
-	padding-bottom: 4px;
-	padding-top: 7px ;
-	padding-left: 8px ;
-	border-left-style: none;
-	border-right-style: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-.sidebar a.sel {
-	border: 1px solid #1e504a;
-	color: white ;
-	font-weight: bold;
-	padding-top: 6px;
-	background: static_url('images/gradients') repeat-x center -144px;
-	border-top-color: #188b7d;
-	border-right-style: none;
-	border-left-style: none;
-}
-
-.sidebar a.sel:active {
-	border: 1px solid #1e504a;
-	color: white ;
-	font-weight: bold;
-	padding-top: 6px;
-	background: static_url('images/gradients') repeat-x center -144px;
-	border-top-color: #188b7d;
-	border-right-style: none;
-	border-left-style: none;
+	top: 0;
+	left:  0;
+	right: 0;
+	bottom: 0;
+	border: none ;
 }
 
-.sidebar a:active {
-	background-color: #cedfdf;
-	border: 1px solid #cedfdf;
-	border-right-style: none;
-	border-left-style: none;
-}
+/* @end */
 
-.sidebar hr {
-	border:  none ;
-	border-top: #ccc solid 1px;
-	margin: 4px 8px;
-}
 
-/* @end */

data/clients/sc_test_runner/english.lproj/body.rhtml

@@ -1,35 +1,71 @@
 <% content_for('body') do %>
 
-<% view :workspace do %>
-
-<% # PRIMARY TOOLBAR -%>
-<div class="toolbar">
-  <%= label_view :outlet => true, :tag => 'h1', :bind => {
-    :content => 'TestRunner.runnerController.displayClientName'
-  } %>
-  <div class="buttons">
-  <%= checkbox_view :outlet => true, :label => "Continuous Integration", :bind => { :value => 'TestRunner.runnerController.isContinuousIntegrationEnabled' } %>
-  <%= button_view :outlet => true, :label => "Run Tests", :image => static_url('icons/small/reset'), :bind => {
-    :label_text => 'TestRunner.runnerController.runTestLabel' }, :action => 'TestRunner.runnerController.toggleRunTests' %>
+<% view :header, :class => 'sc-header sc-square-theme' do %>
+  <div class="left app-label">
+    <img src="<%= static_url('images/sproutcore-logo.png') %>" /><%= label_view :outlet => true, :tag => :span, 
+    :bind => { :value => 'TestRunner.runnerController.displayClientName' } %>
+  </div>
+  <div class="center">
+  </div>
+  <div class="right">
+    <%= checkbox_view :outlet => true, :label => "Continuous Integration", :bind => { :value => 'TestRunner.runnerController.isContinuousIntegrationEnabled' } %>
+    <%= button_view :outlet => true, :title => "Run All Tests", :bind => {
+      :title => 'TestRunner.runnerController.runTestLabel' }, :action => 'TestRunner.runnerController.toggleRunTests' %>
   </div>
-</div>
+<% end %>
 
-<%= collection_view :outlet => :sidebar, :class => :sidebar, :bind => {
-  :content => 'TestRunner.runnerController.arrangedObjects',
-  :selection => 'TestRunner.runnerController.selection'
-}, :example_view => 'TestRunner.TestLabelView' %>
 
-<div class="container">
-<%= view :outlet => :runner_frame, :tag => :iframe, :view => 'TestRunner.RunnerFrameView', :bind => { 
-  :test => 'TestRunner.runnerController.selectedTest',
-  :state => 'TestRunner.runnerController.testState' } %>
-</div>
+<% split_view :workspace, :class => 'sc-app-workspace header footer', :direction => :horizontal do %>  
+  <% view :sidebar, :outlet => true do %>
+    <% scroll_view :source_list, :outlet => true do %>
+      <%= source_list_view :outlet => true, 
+        :group => :group,
+        :group_visible_key => true,
+        :content_value_key => :title,
+        :content_icon_key => :icon,
+        :bind => {
+          :content => 'TestRunner.runnerController.arrangedObjects',
+          :selection => 'TestRunner.runnerController.selection'
+        } %>
+        
+    <% end %>
+  <% end %>
+  
+  <%= split_divider_view :outlet => true, :width => 5 %>
 
-<% # FOOTER -%>
-<div class="footer">
-  <%= label_view :outlet => :runner_status, :bind => { :content => 'TestRunner.runnerController.testStateLabel' } %>
-</div>
+  <% view :document_view, :outlet => true do %>
+    <%= view :outlet => :runner_frame, :tag => :iframe, 
+      :view => 'TestRunner.RunnerFrameView', 
+      :bind => { 
+        :test => 'TestRunner.runnerController.selectedTest',
+        :state => 'TestRunner.runnerController.testState' 
+      } %>
+  <% end %>
+    
+<% end %>
 
+<% view :footer, :class => 'sc-footer sc-square-theme' do %>
+  <div class="left">
+  </div>
+  <div class="center">
+    <%= image_view :outlet => true, 
+        :value => static_url('indicator'), 
+        :style => 'vertical-align: middle; position: relative; top: -1px;',
+        :bind => { 
+          :visible => 'TestRunner.runnerController.testStateIsRunning'
+        } %>
+    <%= label_view :outlet => :runner_status, :tag => 'span',
+        :bind => {
+          :value => 'TestRunner.runnerController.testStateLabel' 
+        } %>
+  </div>
+  <div class="right">
+    <%= button_view :outlet => true, :title => 'Rerun Current Test', 
+      :action => 'TestRunner.runnerController.rerunCurrentTest',
+      :bind => { 
+        :enabled => 'TestRunner.runnerController.canRerunCurrentTest' 
+      } %>
+  </div>
 <% end %>
 
 <script>
@@ -37,4 +73,4 @@ window.urlPrefix = "<%= bundle.url_prefix %>";
 window.indexPrefix = "<%= bundle.index_prefix %>";
 </script>
 
-<% end %>
+<% end %>