sproutcore 1.9.1 → 1.9.2

data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js

@@ -557,7 +557,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
           // right-justify the view.
           if (!layout.right) layout.right = 0 ;
 
-          rightAccessoryView.adjust({ layout: layout }) ;
+          rightAccessoryView.adjust(layout) ;
         }
       }
     }
@@ -1181,6 +1181,64 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     return YES ; // handled
   },
 
+  // If this is a multi-line field, then allow the new line to proceed.
+  /** @private */
+  insertNewline: function(evt) {
+    if (this.get('isTextArea')) {
+      evt.allowDefault();
+      return YES; // handled
+    }
+    return NO;
+  },
+  
+  /** @private */
+  deleteForward: function(evt) { 
+    evt.allowDefault();
+    return YES;
+  },
+
+  /** @private */
+  deleteBackward: function(evt) { 
+    evt.allowDefault();
+    return YES;
+  },
+
+  /** @private */
+  moveLeft: function(evt) { 
+    evt.allowDefault();
+    return YES;
+  },
+
+  /** @private */
+  moveRight: function(evt) { 
+    evt.allowDefault();
+    return YES;
+  },
+
+  /** @private */
+  selectAll: function(evt) { 
+    evt.allowDefault();
+    return YES;
+  },
+
+  /** @private */
+  moveUp: function(evt) {
+    if (this.get('isTextArea')) {
+      evt.allowDefault();
+      return YES;
+    }
+    return NO;
+  },
+
+  /** @private */
+  moveDown: function(evt) {
+    if (this.get('isTextArea')) {
+      evt.allowDefault();
+      return YES;
+    }
+    return NO;
+  },
+  
   keyUp: function (evt) {
     if (SC.browser.isMozilla &&
         evt.keyCode === SC.Event.KEY_RETURN) { this.fieldValueDidChange(); }

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

@@ -39,7 +39,7 @@ window.SproutCore = window.SproutCore || SC ;
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.9.1
+  @version 1.9.2
   @namespace
 
   All SproutCore methods and functions are defined
@@ -59,7 +59,7 @@ window.SproutCore = window.SproutCore || SC ;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.9.1';
+SC.VERSION = '1.9.2';
 
 /**
   @private

data/lib/frameworks/sproutcore/themes/ace/resources/master-detail/master-detail.css

@@ -2,6 +2,8 @@ $theme.master-detail {
   background: #333;
   
   &.round-toolbars $theme.toolbar {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
     -webkit-border-top-left-radius: 10px;
     -webkit-border-top-right-radius: 10px;
     -moz-border-radius-topleft: 10px;
@@ -19,6 +21,8 @@ $theme.master-detail {
   }
   
   &.round-toolbars > .sc-view {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
     -webkit-border-top-left-radius: 10px;
     -webkit-border-top-right-radius: 10px;
     -moz-border-radius-topleft: 10px;

data/lib/gen/app/templates/apps/@target_name@/Buildfile

@@ -3,7 +3,9 @@
 # This is your Buildfile for your app, <%= namespace %>. This tells SproutCore
 # how to build your app. These settings override those in your project
 # Buildfile, which contains default settings for all apps in your project.
+#
+# To learn more about configuring the Buildfile, please visit
+# http://guides.sproutcore.com/build_tools.html.
 
 # It is better to add :required targets here than in the global Buildfile.
 config :<%= target_name %>, :required => :sproutcore
-

data/lib/gen/app/templates/apps/@target_name@/core.js

@@ -4,7 +4,7 @@
 /** @namespace
 
   My cool new app.  Describe your application.
-  
+
   @extends SC.Object
 */
 <%= namespace %> = SC.Application.create(
@@ -18,7 +18,7 @@
   // connect to a backend server.  The default setup below connects the store
   // to any fixtures you define.
   store: SC.Store.create().from(SC.Record.fixtures)
-  
+
   // TODO: Add global constants or singleton objects needed by your app here.
 
-}) ;
+});

data/lib/gen/app/templates/apps/@target_name@/main.js

@@ -12,16 +12,18 @@
 
   // Step 1: Instantiate Your Views
   // The default code here will make the mainPane for your application visible
-  // on screen.  If you app gets any level of complexity, you will probably 
-  // create multiple pages and panes.  
+  // on screen.  If you app gets any level of complexity, you will probably
+  // create multiple pages and panes.
   <%= namespace %>.getPath('mainPage.mainPane').append() ;
 
   // Step 2. Set the content property on your primary controller.
   // This will make your app come alive!
+  //
+  // ex.
+  // var content = <%= namespace %>.store.find(<%= namespace %>.Group);
+  // <%= namespace %>.groupsController.set('content', content);
 
-  // TODO: Set the content property on your primary controller
-  // ex: <%= namespace %>.contactsController.set('content',<%= namespace %>.contacts);
+};
 
-} ;
 
 function main() { <%= namespace %>.main(); }

data/lib/gen/app/templates/apps/@target_name@/resources/main_page.css

@@ -0,0 +1,20 @@
+// Add your custom CSS styles here.
+//
+// You may want to create additional stylesheet files for every page or pane
+// within your application rather than placing all your CSS in here.  In any
+// case, all stylesheet files will be combined into a single stylesheet on
+// build to let it load super fast.
+//
+// Remember, Compass (http://compass-style.org) is built in and you can use
+// SCSS syntax (http://sass-lang.com/) even though stylesheet files should end
+// with the .css extension.
+//
+// Learn more on styling your app here: http://sproutcore.com/guides/chance.html
+
+// Example.  This style is applied to the labelView child view.
+$theme.sc-label-view.welcome-label {
+  font-size: 16px;
+  line-height: 24px;
+  text-align: center;
+  text-shadow: rgba(255, 255, 255, 0.5) 0 1px 1px;
+}

data/lib/gen/app/templates/apps/@target_name@/resources/main_page.js

@@ -1,19 +1,19 @@
 <%= copyright_block("#{namespace} - mainPage") %>
 /*globals <%= namespace %> */
 
-// This page describes the main user interface for your application.  
+// This page describes the main user interface for your application.
 <%= namespace %>.mainPage = SC.Page.design({
 
   // The main pane is made visible on screen as soon as your app is loaded.
-  // Add childViews to this pane for views to display immediately on page 
+  // Add childViews to this pane for views to display immediately on page
   // load.
   mainPane: SC.MainPane.design({
-    childViews: 'labelView'.w(),
-    
+    childViews: ['labelView'],
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, width: 200, height: 18 },
-      textAlign: SC.ALIGN_CENTER,
-      tagName: "h1", 
+      classNames: ['welcome-label'],
+      layout: { centerX: 0, centerY: 0, width: 300, height: 24 },
+      tagName: "h1",
       value: "Welcome to SproutCore!"
     })
   })

data/lib/gen/controller/templates/controllers/@filename@_controller.js

@@ -5,11 +5,11 @@
 
   (Document Your Controller Here)
 
-  @extends <%= base_class_name || 'SC.Object' %>
+  @extends <%= base_class_name || 'SC.ObjectController' %>
 */
 <%= namespace_instance_name %> = <%= base_class_name || 'SC.ObjectController' %>.create(
 /** @scope <%= namespace_instance_name %>.prototype */ {
 
   // TODO: Add your own code here.
 
-}) ;
+});

data/lib/gen/data-source/templates/data_sources/@filename@_data_source.js

@@ -12,50 +12,50 @@
 
   // ..........................................................
   // QUERY SUPPORT
-  // 
+  //
 
   fetch: function(store, query) {
 
-    // TODO: Add handlers to fetch data for specific queries.  
+    // TODO: Add handlers to fetch data for specific queries.
     // call store.dataSourceDidFetchQuery(query) when done.
 
-    return NO ; // return YES if you handled the query
+    return NO; // return YES if you handled the query
   },
 
   // ..........................................................
   // RECORD SUPPORT
-  // 
-  
+  //
+
   retrieveRecord: function(store, storeKey) {
-    
+
     // TODO: Add handlers to retrieve an individual record's contents
     // call store.dataSourceDidComplete(storeKey) when done.
-    
-    return NO ; // return YES if you handled the storeKey
+
+    return NO; // return YES if you handled the storeKey
   },
-  
+
   createRecord: function(store, storeKey) {
-    
+
     // TODO: Add handlers to submit new records to the data source.
     // call store.dataSourceDidComplete(storeKey) when done.
-    
-    return NO ; // return YES if you handled the storeKey
+
+    return NO; // return YES if you handled the storeKey
   },
-  
+
   updateRecord: function(store, storeKey) {
-    
+
     // TODO: Add handlers to submit modified record to the data source
     // call store.dataSourceDidComplete(storeKey) when done.
 
-    return NO ; // return YES if you handled the storeKey
+    return NO; // return YES if you handled the storeKey
   },
-  
+
   destroyRecord: function(store, storeKey) {
-    
+
     // TODO: Add handlers to destroy records on the data source.
     // call store.dataSourceDidDestroy(storeKey) when done
-    
-    return NO ; // return YES if you handled the storeKey
+
+    return NO; // return YES if you handled the storeKey
   }
-  
-}) ;
+
+});

data/lib/gen/design/templates/resources/@filename@.css

@@ -0,0 +1,12 @@
+// Add your custom CSS styles here.
+//
+// You may want to create additional stylesheet files for every page or pane
+// within your application rather than placing all your CSS in here.  In any
+// case, all stylesheet files will be combined into a single stylesheet on
+// build to let it load super fast.
+//
+// Remember, Compass (http://compass-style.org) is built in and you can use
+// SCSS syntax (http://sass-lang.com/) even though stylesheet files should end
+// with the .css extension.
+//
+// Learn more on styling your app here: http://sproutcore.com/guides/chance.html

data/lib/gen/framework/templates/frameworks/@target_name@/core.js

@@ -4,15 +4,15 @@
 /** @namespace
 
   My cool new framework.  Describe your framework.
-  
+
   @extends SC.Object
 */
 <%= namespace %> = SC.Object.create(
   /** @scope <%= namespace %>.prototype */ {
 
   NAMESPACE: '<%= namespace %>',
-  VERSION: '0.1.0',
+  VERSION: '0.1.0'
 
   // TODO: Add global constants or singleton objects needed by your app here.
 
-}) ;
+});

data/lib/gen/framework/templates/frameworks/@target_name@/english.lproj/strings.js

@@ -9,4 +9,4 @@
 //
 SC.stringsFor('English', {
   // "_String Key": "Localized String"
-}) ;
+});

data/lib/gen/language/templates/@filename@/strings.js

@@ -8,4 +8,4 @@
 //
 SC.stringsFor('<%= language %>', {
   // "_String Key": "Localized String"
-}) ;
+});

data/lib/gen/model/templates/models/@filename@_model.js

@@ -13,4 +13,4 @@
 
   // TODO: Add your own code here.
 
-}) ;
+});

data/lib/gen/page/templates/pages/@target_name@/core.js

@@ -4,7 +4,7 @@
 /** @namespace
 
   Static page JavaScript
-  
+
   @extends SC.Object
 */
 <%= namespace %> = SC.Object.create(
@@ -12,8 +12,8 @@
 
   NAMESPACE: '<%= namespace %>',
   VERSION: '0.1.0'
-  
+
   // TODO: You can place any JavaScript you need on your page here.  If you
   // don't want any JavaScript, just delete this file.
 
-}) ;
+});

data/lib/gen/project/templates/@filename@/Buildfile

@@ -1,9 +1,33 @@
 <%= copyright_block(namespace, :ruby) %>
 
-# This is your Buildfile, which sets build settings for your project.
-# For example, this tells SproutCore's build tools that EVERYTHING
-# requires the SproutCore framework.
+# This is your Buildfile, which determines how your project is built.
+# In addition to this Buildfile, each of your apps and frameworks may have its
+# own Buildfile with settings specific to each.
+
+# General configuration.
 config :all, :required => :sproutcore
 
-# In addition to this Buildfile, which gives settings for your entire project,
-# each of your apps has its own Buildfile with settings specific to that app.
+# Development (debug) mode configuration.
+mode :debug do
+end
+
+# Production (build) mode configuration.
+mode :production do
+end
+
+
+
+# Proxying.
+# When running the app locally, same-origin policy prevents the app (at localhost)
+# from accessing other domains.  One of the major roles of the SproutCore
+# development server is to proxy local requests for remote resources so that
+# the browser believes they are coming from the same domain.
+#
+# You should place all your proxy directives in this Buildfile.
+#
+# For example, proxy all requests for '/users' to 'https://my-domain.com/people'.
+# proxy "/users", :to => "my-domain.com", :secure => true, :url => "/people"
+
+
+# To learn more about configuring the Buildfile, please visit
+# http://guides.sproutcore.com/build_tools.html.

data/lib/gen/{responder → state}/Buildfile

@@ -8,11 +8,12 @@ namespace :generator do
 
   # - Verify required properties are present
   # - Accept second argument as base class
+  # - If file name ends in "_state", strip it off
 
   task :prepare do
     GENERATOR.requires! :target_project, :target, :namespace, :class_name
-    GENERATOR.class_name = GENERATOR.class_name.upcase
     GENERATOR.base_class_name ||= GENERATOR.arguments[2]
+    GENERATOR.filename = GENERATOR.filename.sub(/_state$/,'')
   end
-  
+
 end

data/lib/gen/state/README

@@ -0,0 +1 @@
+Your state is ready to use!  Fill in the missing methods in the new file.

data/lib/gen/state/USAGE

@@ -0,0 +1,15 @@
+state - Create a new State class to use in your statecharts.
+
+USAGE:
+
+  sc-gen state AppName.StateName [--filename=FILENAME] [--target=TARGET_NAME]
+
+DISCUSSION:
+
+This generator will create a new SproutCore State template file in your
+app.  You should pass as the first parameter your AppName.StateName combination you want to create.  For example:
+
+sc-gen responder Todos.LoadingState
+
+defines a new class called Todos.LoadingState in the file apps/todos/states/loading_state.js.
+