sproutcore 1.0.1049.pre.2 → 1.4.0.rc

data/Rakefile

@@ -268,7 +268,7 @@ namespace :release do
 
 
   desc "prepare release.  verify clean, update version, tag"
-  task :prepare => [:update_version, :tag, :push_tags]
+  task :prepare => ['git:verify_clean', :update_version, :tag, :push_tags]
 
   desc "release to rubyforge for old skool folks"
   task :rubyforge => [:prepare, 'rubyforge:release']

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
-:digest: f5de13f8e3034ce3c1f0c7cdd6fc4526eb03fdb4
 :major: 1
-:minor: 0
-:patch: 1049.pre.2
+:minor: 4
+:patch: 0.rc
+:digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
 :dist: 
-  frameworks/sproutcore: 66c5db9756d6829d5a439b65b4e644f8350d3afc
+  frameworks/sproutcore: 637dc82942f2fd5c1e9cd57ce7582fca821a3bfa

data/lib/Buildfile

@@ -79,7 +79,7 @@ mode :all do
     # In design mode, load the designer
     :design_required => ['sproutcore/designer'],
 
-    :use_packed => false,
+    :use_packed => true,
 
 		# If set to true, the specified framework, if loaded via the SC.loadBundle
 		# API, will be set up to be lazily instantiated when loaded.

data/lib/frameworks/sproutcore/Buildfile

@@ -12,7 +12,7 @@
 config :all, 
   :layout         => 'sproutcore:lib/index.rhtml',
   :test_layout    => 'sproutcore:lib/index.rhtml',
-  :test_required  => ['sproutcore/testing'],
+  :test_required  => ['sproutcore/testing', 'sproutcore/empty_theme'],
   :debug_required => ['sproutcore/debug', 'sproutcore/testing']
 
 # in debug mode, combine the JS for SC by default.  This will improve perf
@@ -28,17 +28,15 @@ end
 config :bootstrap,  :required => [], :use_modules => false
 
 config :runtime,    :required => []
-config :foundation, :required => [:jquery, :runtime]
-config :datastore,  :required => [:runtime]
+config :foundation, :required => [:runtime]
+config :datastore,  :required => [:foundation]
 config :statechart, :required => [:runtime]
 config :desktop,    :required => [:foundation]
 config :media,      :required => [:desktop]
 
 # APP-LEVEL FRAMEWORKS
 %w(mobile designer).each do |app_framework|
-  config app_framework, 
-    :required => [:runtime, :datastore, :foundation],
-    :test_required => ["sproutcore/testing", "sproutcore/empty_theme"]
+  config app_framework, :required => [:runtime, :datastore, :foundation]
 end
 
 config :mobile, 
@@ -49,8 +47,7 @@ config :mobile,
 config :designer, :required => [:runtime, :foundation]
 config :sproutcore, :required => [:desktop, :datastore]
 config :mini, :required => [:runtime, :datastore]
-config :animation, :required => :foundation
-config :forms, :required => :desktop
+
 
 # SPECIAL FRAMEWORKS AND THEMES
 # These do not require any of the built-in SproutCore frameworks
@@ -62,7 +59,7 @@ end
 # CONFIGURE THEMES
 config :empty_theme, 
   :theme_name => 'empty-theme',
-  :test_required  => ['sproutcore/foundation', 'sproutcore/testing'],
+  :test_required  => ['sproutcore/testing'],
   :debug_required => ['sproutcore/debug']
 
 config :iphone_theme, 
@@ -77,28 +74,18 @@ config :standard_theme,
   :test_required  => ['sproutcore/testing'],
   :debug_required => ['sproutcore/debug']
 
-config :ace, 
-  :required => :empty_theme, 
-  :theme_name => 'sc-theme',
-  :test_required  => ['sproutcore/testing'],
-  :debug_required => ['sproutcore/debug']
-
-
-# CONFIGURE DOCUMENTATION
-config :documentation,
-  :required => [:desktop, :animation]
-
 # CONFIGURE APPS
-config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
+
+config :core_tools, :required => [:desktop, :datastore]
 
 # mode :debug do
 #   config :core_tools, :combine_javascript => false
 # end
 
-%w(tests test_controls docs welcome).each do |app_target|
+%w(tests docs welcome).each do |app_target|
   config app_target, 
-    :required => [:desktop, :datastore, :core_tools],
-    :theme => :ace
+    :required => [:desktop, :datastore, :core_tools], 
+    :theme => :standard_theme
     
   # mode :debug do
   #   config app_target, :combine_javascript => false
@@ -108,8 +95,7 @@ end
 
 config :greenhouse, 
   :required => [:sproutcore, :'sproutcore/designer', :statechart],
-  :theme    => :ace
-
+  :theme    => :standard_theme
   
 
- 
+ 

data/lib/frameworks/sproutcore/apps/greenhouse/controllers/library.js

@@ -14,48 +14,6 @@
 
 Greenhouse.libraryController = SC.TreeController.create( SC.CollectionViewDelegate,
 /** @scope Greenhouse.libraryController.prototype */ {
-  // ..........................................................
-  // Temporary content data
-  // 
- 
-  /*
-  Additional properties should include:
-  -defaultProperties
-  -guid line defaults
-  -icon
-  */
-  content: SC.Object.create({
-    treeItemIsExpanded: YES,
-    treeItemChildren: [
-      SC.Object.create({
-        name: 'Views',
-        treeItemIsExpanded: YES,
-        treeItemChildren: [
-          SC.Object.create({name: 'Button', scClass: 'SC.ButtonView', defaults: {layout: {width: 100, height: 24}}}),
-          SC.Object.create({name: 'List', scClass: 'SC.ListView', defaults: {layout: {}} }),
-          SC.Object.create({name: 'Tab', scClass: 'SC.TabView', defaults: {layout: {width: 200, height: 200}} }),
-          SC.Object.create({name: 'TextField', scClass: 'SC.TextFieldView', defaults: {layout: {width: 100, height: 24}} }),
-          SC.Object.create({name: 'Segmented', scClass: 'SC.SegmentedView', defaults: {layout: {width: 200, height: 24}} }),
-          SC.Object.create({name: 'Web', scClass: 'SC.WebView', defaults: {layout: {width: 200, height: 200}} }),
-          SC.Object.create({name: 'Scroll', scClass: 'SC.ScrollView', defaults: {layout: {width: 200, height: 200}} } ),
-          SC.Object.create({name: 'Container', scClass: 'SC.ContainerView', defaults: {layout: {width: 200, height: 200}}}),
-          SC.Object.create({name: 'View', scClass: 'SC.View', defaults: {layout: {width: 100, height: 100}}}),
-          SC.Object.create({name: 'Label', scClass: 'SC.LabelView', defaults: {layout: {width: 100, height: 24}, value: 'Label'}})
-        ]
-      }),
-      SC.Object.create({
-        name: 'Controllers',
-        treeItemIsExpanded: YES,
-        treeItemChildren: [
-          SC.Object.create({name: 'SC.Object', scClass: 'SC.Object' }),
-          SC.Object.create({name: 'Object Controller', scClass: 'SC.ObjectController' }),
-          SC.Object.create({name: 'Array Controller', scClass: 'SC.ArrayController'  }),
-          SC.Object.create({name: 'Tree Controller', scClass: 'SC.TreeController'})
-        ]
-      }) 
-    ]
-  }),
-  
   /**
     Call this method whenever you want to relaod the library from hte server
   */

data/lib/frameworks/sproutcore/apps/greenhouse/controllers/view_configs.js

@@ -0,0 +1,100 @@
+// ==========================================================================
+// Project:   Greenhouse.viewConfigsController
+// Copyright: ©2009 Mike Ball
+// ==========================================================================
+/*globals Greenhouse */
+
+/** @class
+  
+  
+  @extends SC.ArrayController
+*/
+
+Greenhouse.viewConfigsController = SC.ArrayController.create(
+/** @scope Greenhouse.viewConfigsController.prototype */ {
+
+  /**
+    Call this method whenever you want to relaod the view configs from the server.
+  */
+  reload: function() {
+    var configQuery = Greenhouse.CONFIG_QUERY, target = Greenhouse.targetController.get('content');
+    configQuery.set('app', target.get('name'));
+    var files = Greenhouse.store.find(configQuery);
+    this.set('content', files);
+  },
+  
+  _content_status_changed: function(){
+    var c = this.get('content'), that = this;    
+    if(c && c.get && c.get('status') && c.get('status') === SC.Record.READY_CLEAN){
+      Greenhouse.libraryController.set('content', SC.Object.create({
+        treeItemIsExpanded: YES,
+        treeItemChildren: [
+          SC.Object.create({
+            name: 'Views',
+            treeItemIsExpanded: YES,
+            treeItemChildren: that.get('views')
+          }),
+          SC.Object.create({
+            name: 'Controllers',
+            treeItemIsExpanded: YES,
+            treeItemChildren: that.get('controllers')
+          }),
+          SC.Object.create({
+            name: 'Panes',
+            treeItemIsExpanded: YES,
+            treeItemChildren: that.get('panes')
+          })
+        ]
+      }));
+    }
+  }.observes('*content.status'),
+  
+  refreshContent: function(){
+   this._content_status_changed(); 
+  },
+  
+  /** 
+    Generates the arrays of views, panes and controllers that can be dropped into this app
+  */
+  views: function() {
+    return this._collect_all_the_elements('views');
+  }.property('[]').cacheable(),
+  
+  panes: function() {
+    return this._collect_all_the_elements('panes');
+    
+  }.property('[]').cacheable(),
+  
+  controllers: function() {
+    return this._collect_all_the_elements('controllers');
+    
+  }.property('[]').cacheable(),
+  
+  
+  _collect_all_the_elements: function(key){
+    var c = this.get('content'), ret = [], subItem;
+    if(c && c.get('length') > 0){
+      c.forEach(function(vc){
+        subItem = vc.get(key);
+        if(subItem){
+          subItem.forEach(function(item){
+            ret.pushObject(item);
+          });
+        }
+      });
+    }
+    return ret;
+  },
+  /*
+    lists the editable views
+  */
+  editable: function(){
+    var ret = [], c =this.get('content');
+    if(c){
+      c.forEach(function(item){
+        if(item.get('canEdit') === YES) ret.pushObject(item);
+      });
+    }
+    return ret;
+  }.property('content').cacheable()
+}) ;

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/app_page.js

@@ -272,7 +272,7 @@ Greenhouse.appPage = SC.Page.design({
         layout: { bottom: 1, right: 0, height: 24, width: 90 },
         titleMinWidth: 0,
         hasIcon: NO,
-        title: "_Add View".loc(),
+        title: "_Add Design".loc(),
         action: 'newCustomView'
       })
     })

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/dialogs.js

@@ -145,33 +145,57 @@ Greenhouse.dialogPage = SC.Page.design({
   // add custom view panel
   // 
   customViewModal: SC.View.design({
-    layout: {centerX: 0, centerY: 0, width: 350, height: 300},
-    childViews: 'title cancel add classNameLabel className defaultPropertiesLabel defaultProperties'.w(),
+    layout: {centerX: 0, centerY: 0, width: 350, height: 380},
+    childViews: 'title cancel add classNameLabel className defaultPropertiesLabel defaultProperties targetLabel targetSelect designTypeLabel designType'.w(),
     
     title: SC.LabelView.design({
       layout: {top: 2, left: 15, right: 5, height: 22},
-      value: "_Add a Custom View to the Library".loc(),
+      value: "_Add a Custom Designer to the Library".loc(),
       fontWeight: SC.BOLD_WEIGHT
     }),
+    targetLabel: SC.LabelView.design({
+      layout: {top: 25, left: 15, right: 5, height: 22},
+      value: "_Target:".loc()
+    }),
+    
+    targetSelect: SC.SelectButtonView.design({
+      layout: {top: 48, left: 15, right: 15, height: 22},
+      objectsBinding: 'Greenhouse.viewConfigsController.editable',
+      valueBinding: 'Greenhouse.newDesignViewConfig',
+      nameKey: 'name'
+    }),
+    
+    designTypeLabel: SC.LabelView.design({
+      layout: {top: 80, left: 15, right: 5, height: 22},
+      value: "_Design Type:".loc()
+    }),
+    
+    designType: SC.SelectButtonView.design({
+      layout: {top:103, left: 15, right: 15, height: 22},
+      objects: [{name: 'Controller', value: 'controllers'}, {name: 'View', value: 'views'}, {name: 'Pane', value: 'panes'}],
+      valueBinding: 'Greenhouse.newDesignType',
+      nameKey: 'name',
+      valueKey: 'value'
+    }),
     
     classNameLabel: SC.LabelView.design({
-      layout: {top: 25, left: 15, right: 5, height: 22},
+      layout: {top: 130, left: 15, right: 5, height: 22},
       value: "_Class Name:".loc()
     }),
     className: SC.TextFieldView.design({
-      layout: {top: 50, left: 15, right: 15, height: 22},
+      layout: {top: 153, left: 15, right: 15, height: 22},
       hint: "_MyApp.AwesomeView".loc(),
-      valueBinding: 'Greenhouse.newViewClass'
+      valueBinding: 'Greenhouse.newDesignClass'
     }),
     
     defaultPropertiesLabel: SC.LabelView.design({
-      layout: {top: 95, left: 15, right: 5, height: 22},
+      layout: {top: 176, left: 15, right: 5, height: 22},
       value: "_Default Properties:".loc()
     }),
     defaultProperties: SC.TextFieldView.design({
-      layout: {top: 115, left: 15, right: 15, height: 135},
+      layout: {top: 199, left: 15, right: 15, height: 135},
       isTextArea: YES,
-      valueBinding: 'Greenhouse.newViewDefaults'
+      valueBinding: 'Greenhouse.newDesignDefaults'
     }),
     
     cancel: SC.ButtonView.design({

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

@@ -63,7 +63,7 @@ SC.stringsFor('English', {
   "_Run": "Run",
   "_Library": "Library",
   "_Add": "Add",
-  "_Add a Custom View to the Library": "Add a Custom View to the Library",
+  "_Add a Custom Designer to the Library": "Add a Custom Designer to the Library",
   "_MyApp.AwesomeView": "MyApp.AwesomeView",
   "_Class Name:": "Class Name:",
   "_Default Properties:": "Default Properties:",
@@ -79,6 +79,9 @@ SC.stringsFor('English', {
   "_Dock Inspector": "Dock Inspector",
   "_Actions": "Actions",
   "_Inspector": "Inspector",
-  "_Reload App": "Reload App"
+  "_Reload App": "Reload App",
+  "_Target:": "Target:",
+  "_Design Type:": "Design Type:",
+  "_Add Design": "Add Design"
   
 }) ;

data/lib/frameworks/sproutcore/apps/greenhouse/states/main.js

@@ -59,6 +59,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
     //
     loadApplication: function(){
       Greenhouse.filesController.reload();
+      Greenhouse.viewConfigsController.reload();
       this.goState('loading');
     }
   }),

data/lib/frameworks/sproutcore/apps/greenhouse/states/modals.js

@@ -115,16 +115,21 @@ Greenhouse.mixin( /** @scope Greenhouse */{
     enterState: function(){
       var modal = Greenhouse.dialogPage.get('modal');
       modal.set('contentView', Greenhouse.dialogPage.get('customViewModal'));
-      modal.set('layout', {centerX: 0, centerY: 0, width: 350, height: 300});
-      Greenhouse.set('newViewClass', null);
-      Greenhouse.set('newViewDefaults', null); 
+      modal.set('layout', {centerX: 0, centerY: 0, width: 350, height: 380});
+      Greenhouse.set('newDesignClass', null);
+      Greenhouse.set('newDesignDefaults', null);
+      Greenhouse.set('newDesignViewConfig', null);
+      Greenhouse.set('newDesignType', null);
       modal.append();
     },
     exitState: function(){
       var modal = Greenhouse.dialogPage.get('modal');
       modal.remove();
-      Greenhouse.set('newViewClass', null);
-      Greenhouse.set('newViewDefaults', null);
+      Greenhouse.set('newDesignClass', null);
+      Greenhouse.set('newDesignDefaults', null);
+      Greenhouse.set('newDesignViewConfig', null);
+      Greenhouse.set('newDesignType', null);
+      
     },
     
     cancel: function(){
@@ -132,12 +137,17 @@ Greenhouse.mixin( /** @scope Greenhouse */{
     },
 
     add: function(){
-      var newView = SC.Object.create({name: Greenhouse.get('newViewClass'), 
-                                      scClass: Greenhouse.get('newViewClass'), 
-                                      defaults: eval("("+Greenhouse.get('newViewDefaults')+")")});
-
-      var lib = Greenhouse.libraryController.get('views');
-      lib.pushObject(newView);
+      var viewConfig = Greenhouse.get('newDesignViewConfig');
+      var array = viewConfig.get(Greenhouse.get('newDesignType'));
+      
+      var newView = array.pushObject({name: Greenhouse.get('newDesignClass'), 
+                         scClass: Greenhouse.get('newDesignClass'), 
+                         defaults: eval("("+Greenhouse.get('newDesignDefaults')+")")});
+
+      viewConfig.commitRecord();
+      Greenhouse.viewConfigsController.notifyPropertyChange(Greenhouse.get('newDesignType'));
+      Greenhouse.viewConfigsController.refreshContent();
+            
       this.goState('modalReady');
     }
   }),

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

@@ -39,13 +39,6 @@ Welcome.targetsController = SC.ArrayController.create(
       });
     }
   },
-  
-  launchEnabled: function() {
-    var canLoadApp = this.get('canLoadApp'),
-        selection = this.get('selection'),
-        selectedObject = selection.firstObject();
-    return canLoadApp && selectedObject && selectedObject.get('name') !== '/sproutcore';
-  }.property('canLoadApp', 'selection').cacheable(),
 
   // used to disable all controls
   canLoadApp: YES,

data/lib/frameworks/sproutcore/apps/welcome/english.lproj/main_page.css

@@ -1,25 +1,7 @@
-.sc-view.sc-main {
-  background: #262B32 static_url('images/main-bg.png') repeat;
-}
-
-.app-selector {
-  background-color: #f4f4f4;
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border: 1px solid #f4f4f4;
-  border-bottom-color: #fff;
-  -webkit-box-shadow: inset rgba(0,0,0,0.3) 0 3px 8px;
-  -moz-box-shadow: inset rgba(0,0,0,0.3) 0 3px 8px;
-}
-
-.sc-list-view .sc-list-item-view {
-  border-bottom: 1px solid #ddd;
-  font-weight: bold;
-}
-
-.sc-list-view .sc-list-item-view:first-child {
-  -webkit-border-top-left-radius: 8px;
-  -webkit-border-top-right-radius: 8px;
-  -moz-border-radius-topleft: 8px;
-  -moz-border-radius-topright: 8px;
+h1.sc-view.heading {
+  font-size: 24px;
+  letter-spacing: -2px;
+  line-height: 1.1;
+  margin: 0;
+  padding: 0;
 }