sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/.rspec

@@ -0,0 +1 @@
+--colour

data/CHANGELOG

@@ -1,3 +1,45 @@
+*SproutCore 1.5.0.pre.4 (February 28, 2011)*
+
+* We are beginning to move API that we don't believe will be ready before 1.5
+release into the `experimental` framework. If your apps rely on code that is
+migrated to experimental, please make sure you include it as a dependency. For
+more, please see frameworks/experimental/README.md.
+* Support for extending classes after they've been created with the
+reopen()/enhance() combo. For more, see: [this
+discussion](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/d65ad54d6fddef5d)
+	* This change may break existing code if you call sc_super() in your mixins.
+	If your app throws exceptions after updating, please see [this post](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/cc6a97e6133cb8cc).
+* Added SC.TemplateView and Handlebars. These allow you to specify the content
+of your views using templates.
+	* {{#view}} helper allows you to define child views
+	* {{#bind}} helper allows you to render a property, and automatically update DOM if that
+	property ever changes.
+	* {{#collection}} helpers allows you to render a simple collection of items
+	using templates
+	* SC.TextFieldSupport and SC.CheckboxSupport mixins for SC.TemplateViews
+	that wrap <input> elements.
+* Split SC.View into units of functionality. SC.View remains functionally the
+same, but you can now use SC.CoreView, a light-weight subset of SC.View.
+* SC.ImageView will use a <canvas> tag on platforms that support it, which
+improves performance significantly.
+* SC.SegmentedView now creates an overflow menu if there are too many segments
+to display.
+	* Class names for SC.SegmentedView have been cleaned up. You may need to
+	update your CSS if you were theming SC.SegmentedView.
+* You can now observe the contents of enumerables using the special `@each`
+key.
+* Dependent keys can accept property paths. For example, you can say
+.property('foo.bar'), and it will be invalidated if the `bar` property of
+`foo` changes.
+* Deprecated SC.viewportOffset(). Please use SC.offset() instead, which is
+more explicit about what it returns.
+* SC.browser now detects Android devices.
+* SC.device.orientation now works reliably on desktop, iOS, and Android 2.1
+and above.
+* Experimental support for gyroscope information, if provided by the browser.
+* Unit tests for runtime, desktop, foundation, core_foundation, and datastore
+are all passing.
+
 *SproutCore 1.5.0.pre.3 (February 3, 2011)*
 
 * More fixes to Ruby 1.8/1.9 compat

data/README.txt

@@ -39,6 +39,31 @@ This gem includes both the Abbot build tools and a copy of the SproutCore
 JavaScript framework.  You can use built-in commands to create, develop, 
 build, and deploy SproutCore-based applications.
 
+== USING ABBOT FROM SOURCE:
+
+These steps will allow the use of a development release of abbot rather than an installed gem.
+
+  1. Inside a empty project folder create a file named 'Gemfile' (no extension)
+
+    Modify the file so that it contains:
+      source "http://rubygems.org"
+      gem "sproutcore", :git => "git://github.com/sproutcore/abbot.git"
+      # if you want to use a version of abbot already checked out into your system rather than the remote repository
+      # gem "sproutcore", :path => "/path/to/abbot"
+
+  2. Install Abbot and its dependencies by running these commands
+
+    $ sudo gem install bundler
+    $ bundle install --binstubs
+
+    This will install the Ruby 'bundler' gem (if it is not already), then add a 'bin' directory to your project containing executables like "sc-server".
+    The bundle install command will take care of locating, installing and linking to either the remote git or locally installed version of abbot and dependencies.
+
+  3. Init the Sproutcore project and start the server
+
+    $ bin/sc-init .
+    $ bin/sc-server
+
 == KNOWN LIMITATIONS:
 
 * Currently does not support sites using relative-links.  You must specify

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 5
-:patch: 0.pre.3
+:patch: 0.pre.4

data/bin/sc-build

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-build-number

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-docs

@@ -8,7 +8,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-gen

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-init

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-manifest

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-server

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sproutcore

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/lib/buildtasks/build.rake

@@ -20,6 +20,11 @@ namespace :build do
     SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
   end
 
+  desc "converts a Handlebars file to JavaScript"
+  build_task :handlebars do |task, env|
+    SC::Builder::Handlebars.build env[:entry], env[:dst_path]
+  end
+
   desc "stub task for images"
   build_task :image do |task, env|
 

data/lib/buildtasks/manifest.rake

@@ -202,7 +202,7 @@ namespace :manifest do
   namespace :prepare_build_tasks do
 
     desc "main entrypoint for preparing all build tasks.  This should invoke all needed tasks"
-    task :all => %w(css javascript module_info sass scss less combine string_wrap minify string_wrap html strings tests packed)
+    task :all => %w(css handlebars javascript module_info sass scss less combine string_wrap minify string_wrap html strings tests packed)
 
     desc "executes prerequisites needed before one of the subtasks can be invoked.  All subtasks that have this as a prereq"
     task :setup => %w(manifest:catalog manifest:hide_buildfiles manifest:localize)
@@ -311,6 +311,25 @@ namespace :manifest do
       end
     end
 
+    desc "scans for Handlebars templates and converts them to JavaScript"
+    task :handlebars => %w(setup) do |task, env|
+      manifest = env[:manifest]
+
+      entries = manifest.entries.select do |e|
+        e[:ext] == 'handlebars'
+      end
+
+      entries.each do |entry|
+        entry = manifest.add_transform entry,
+          :filename => ['source', entry[:filename]].join('/'),
+          :build_path => File.join(manifest[:build_root], 'source', entry[:filename].ext('js')),
+          :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
+          :build_task => 'build:handlebars',
+          :resource   => 'javascript',
+          :entry_type => :javascript
+      end
+    end
+
     desc "adds a module_info.js entry for all deferred and prefetched modules"
     task :module_info => %w(setup) do |task, env|
       target   = env[:target]

data/lib/frameworks/sproutcore/Buildfile

@@ -27,14 +27,16 @@ end
 # CORE FRAMEWORKS
 config :bootstrap,  :required => [], :use_modules => false
 
-config :jquery,     :required => []
-config :runtime,    :required => [:jquery]
-config :amber,      :required => [:runtime]
-config :foundation, :required => [:amber]
-config :datastore,  :required => [:foundation]
-config :statechart, :required => [:amber]
-config :desktop,    :required => [:foundation]
-config :media,      :required => [:desktop]
+config :jquery,          :required => []
+config :handlebars,      :required => []
+config :runtime,         :required => [:jquery]
+config :datetime,        :required => [:runtime]
+config :core_foundation, :required => [:runtime, :handlebars]
+config :foundation,      :required => [:core_foundation, :datetime]
+config :datastore,       :required => [:runtime, :datetime]
+config :statechart,      :required => [:core_foundation]
+config :desktop,         :required => [:foundation]
+config :media,           :required => [:desktop]
 
 # APP-LEVEL FRAMEWORKS
 %w(mobile designer).each do |app_framework|
@@ -109,4 +111,5 @@ config :test_controls, :css_theme => 'ace.test-controls'
 
 config :greenhouse, 
   :required => [:sproutcore, :'sproutcore/designer', :statechart],
-  :theme    => :standard_theme
+  :theme => :ace,
+  :css_theme    => 'ace.greenhouse'

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -1,3 +1,51 @@
+
+CHANGE LOG FOR 1.5
+==================
+
+1.5.0.pre.4
+-----------
+
+* We are beginning to move API that we don't believe will be ready before 1.5
+release into the `experimental` framework. If your apps rely on code that is
+migrated to experimental, please make sure you include it as a dependency. For
+more, please see frameworks/experimental/README.md.
+* Support for extending classes after they've been created with the
+reopen()/enhance() combo. For more, see: [this
+discussion](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/d65ad54d6fddef5d)
+	- This change may break existing code if you call sc_super() in your mixins.
+	If your app throws exceptions after updating, please see [this post](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/cc6a97e6133cb8cc).
+* Added SC.TemplateView and Handlebars. These allow you to specify the content
+of your views using templates.
+	- {{#view}} helper allows you to define child views
+	- {{#bind}} helper allows you to render a property, and automatically update DOM if that
+	property ever changes.
+	- {{#collection}} helpers allows you to render a simple collection of items
+	using templates
+	- SC.TextFieldSupport and SC.CheckboxSupport mixins for SC.TemplateViews
+	that wrap <input> elements.
+* Split SC.View into units of functionality. SC.View remains functionally the
+same, but you can now use SC.CoreView, a light-weight subset of SC.View.
+* SC.ImageView will use a <canvas> tag on platforms that support it, which
+improves performance significantly.
+* SC.SegmentedView now creates an overflow menu if there are too many segments
+to display.
+	- Class names for SC.SegmentedView have been cleaned up. You may need to
+	update your CSS if you were theming SC.SegmentedView.
+* You can now observe the contents of enumerables using the special `@each`
+key.
+* Dependent keys can accept property paths. For example, you can say
+.property('foo.bar'), and it will be invalidated if the `bar` property of
+`foo` changes.
+* Deprecated SC.viewportOffset(). Please use SC.offset() instead, which is
+more explicit about what it returns.
+* SC.browser now detects Android devices.
+* SC.device.orientation now works reliably on desktop, iOS, and Android 2.1
+and above.
+* Experimental support for gyroscope information, if provided by the browser.
+* Unit tests for runtime, desktop, foundation, core_foundation, and datastore
+are all passing.
+
+
 CHANGE LOG FOR 1.4
 ==================
 

data/lib/frameworks/sproutcore/apps/greenhouse/README

@@ -1,16 +1,9 @@
 Getting Started with Greenhouse (PageDesigner)
 ==============================================================================
 
-git clone git://github.com/sproutit/sproutcore-abbot.git abbot
-cd abbot
-mkdir frameworks
-cd frameworks
-git clone git://github.com/sproutit/sproutcore.git sproutcore
-git checkout greenhouse
-
 to run:
-cd into/your/project
-../abbot/bin/sc-server --filesystem
+cd into/your/sc_project
+sc-server
 
 visit:
 http://localhost:4020/sproutcore/greenhouse

data/lib/frameworks/sproutcore/apps/greenhouse/TODO

@@ -1,28 +1,3 @@
--JS config file to store all custom files (in design/greenhouse.json or ./greenhouse.json) and load all configs of all frameworks currently required
-- move all desingers into the /designer folder of their respective frameworks
-- open main page if it exists 
-
-
-
-
-
-
-DEMO Punch-list:
-- adding a base view to a new page [MB] @Done
-- exceptions when dragging view or controller into page [MB] @Done
-- cleanup dimensions of modals [EG] @Done
-- finish tear-off picker panes [MB/EG] @Done
-- binding value is undefined [EG/MB]
-- fix add custom view event [MB] @Done
-- add js beautifier [MB] @Done
-
-
-
-- Inner run loop not triggering re-draw of anchor view [CJ]
-- figure out location for SC meetup [MB/EG]
-
-
-
 TODO for demo:
 - delete views from page
 v change view type inline
@@ -35,12 +10,21 @@ v View hierarchy inchworm view...
 - routes that choose project
 
 New UI Changes:
-- move (tools) inspector to picker/tear-off menu
 - update grid view to have horizontal scroll 
-- dock tear-off pickers to side 
 
 Done stuff...
 =========================
+- dock tear-off pickers to side 
+- move (tools) inspector to picker/tear-off menu
+- Inner run loop not triggering re-draw of anchor view [MB] @Done
+- adding a base view to a new page [MB] @Done
+- exceptions when dragging view or controller into page [MB] @Done
+- cleanup dimensions of modals [EG] @Done
+- finish tear-off picker panes [MB/EG] @Done
+- binding value is undefined [EG/MB]
+- fix add custom view event [MB] @Done
+- add js beautifier [MB] @Done
+-JS config file to store all custom files (in design/greenhouse.json or ./greenhouse.json) and load all configs of all frameworks currently required
 v add a controller (or execute any sc-gen command via greenhouse) @Done
 - page creation broken! @Done
 ^ draw lines to hook up bindings @Done

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

@@ -73,10 +73,6 @@ Greenhouse.libraryController = SC.TreeController.create( SC.CollectionViewDelega
     @returns {Object} the data object or null if the data could not be provided.
   */
   collectionViewDragDataForType: function(view, drag, dataType) {
-    //store the iframe's frame for use on drop
-    var webView = Greenhouse.appPage.getPath('webView');
-  
-    drag.iframeFrame = webView.get('parentView').convertFrameToView(webView.get('frame'), null);
     var ret = (dataType === 'SC.Object') ? this.get('selection').firstObject() : null;
     return ret ;
   },
@@ -92,12 +88,9 @@ Greenhouse.libraryController = SC.TreeController.create( SC.CollectionViewDelega
     @returns {SC.View} view or null
   */
   collectionViewDragViewFor: function(view, dragContent) {
-    var dragView = view.itemViewForContentIndex(dragContent.firstObject());
-    var layer = view.get('layer').cloneNode(false) ;
-    dragView.set('parentView', view) ;
-    dragView.set('layer', layer) ;
-    dragView.adjust({height: view.get('rowHeight'), top: (dragContent.firstObject()*view.get('rowHeight')) }) ;
-    return dragView ;
+    var selectedItemIndex = dragContent.firstObject();
+    var itemView = view.itemViewForContentIndex(selectedItemIndex);
+    return itemView;
   },
 
   /**

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/main-page.css

@@ -8,8 +8,9 @@
 
 /* Toolbar */
 
-.toolbar {
+.ace .toolbar {
   background: static_url('images/toolbar-bg.png') repeat-x;
+  border-bottom: none;
 }
 
 .greenhouse-logo-s {
@@ -29,61 +30,33 @@
   background: static_url('images/icons/projects.png') no-repeat;
   width: 28px;
   height: 14px;
-  position: absolute;
-  top: 50%;
-  margin-top: -7px;
-  left: 50%;
-  margin-left: -14px;
 }
 .toolbar .save {
   background: static_url('images/icons/save.png') no-repeat;
   width: 14px;
   height: 15px;
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  left: 50%;
-  margin-left: -7px;
 }
 .toolbar .run {
   background: static_url('images/icons/run.png') no-repeat;
   width: 10px;
   height: 12px;
-  position: absolute;
-  top: 50%;
-  margin-top: -6px;
-  left: 50%;
-  margin-left: -5px;
 }
 .toolbar .library {
   background: static_url('images/icons/library.png') no-repeat;
   width: 21px;
   height: 16px;
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  left: 50%;
-  margin-left: -10px;
 }
 .toolbar .inspector {
   background: static_url('images/icons/inspector.png') no-repeat;
   width: 25px;
   height: 17px;
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  left: 50%;
-  margin-left: -12px;
+
 }
 .toolbar .actions {
   background: static_url('images/icons/actions.png') no-repeat;
   width: 28px;
   height: 17px;
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  left: 50%;
-  margin-left: -14px;
+
 }
 
 .toolbar .projects.active {

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

@@ -81,8 +81,9 @@ Greenhouse.dialogPage = SC.Page.design({
   }),
   
   propertyEditor: SC.View.design({
-    childViews: 'title keyLabel key valueLabel value update cancel'.w(),
-    
+    // childViews: 'title keyLabel key valueLabel value update cancel'.w(),
+    childViews: 'title keyLabel key valueLabel value updateButton cancelButton'.w(),
+      
     title: SC.LabelView.design({
       layout: {top: 2, left: 15, right: 5, height: 22},
       value: "_Edit Property:".loc(),
@@ -123,7 +124,7 @@ Greenhouse.dialogPage = SC.Page.design({
       valueBinding: 'Greenhouse.propertyEditorController.value',
       isTextArea: YES
     }),
-    cancel: SC.ButtonView.design({
+    cancelButton: SC.ButtonView.design({
       layout: {bottom: 5, right: 105, width: 84, height: 24},
       isDefault: NO,
       action: 'cancel',
@@ -131,7 +132,7 @@ Greenhouse.dialogPage = SC.Page.design({
       keyEquivalent: 'escape',
       title: "_Cancel".loc()
     }),
-    update: SC.ButtonView.design({
+    updateButton: SC.ButtonView.design({
       layout: {bottom: 5, right: 15, width: 84, height: 24},
       isDefault: YES,
       action: 'update',

data/lib/frameworks/sproutcore/apps/greenhouse/models/dir.js

@@ -13,13 +13,13 @@ require('core');
   @property name
   @property contents
   
-  @extends SC.ChildRecord
+  @extends SC.Record
   @version 0.1
 */
-Greenhouse.Dir = SC.ChildRecord.extend(
+Greenhouse.Dir = SC.Record.extend(
 /** @scope Greenhouse.Dir.prototype */ {
   type: 'Dir',
-  childRecordNamespace: Greenhouse,
+  nestedRecordNamespace: Greenhouse,
   
   name: SC.Record.attr(String),
   dir: SC.Record.attr(String),  

data/lib/frameworks/sproutcore/apps/greenhouse/models/file.js

@@ -15,10 +15,10 @@ require('core');
   @extends SC.ChildRecord
   @version 0.1
 */
-Greenhouse.File = SC.ChildRecord.extend(
+Greenhouse.File = SC.Record.extend(
 /** @scope Greenhouse.File.prototype */ {
   type: 'File',
-  childRecordNamespace: Greenhouse,
+  nestedRecordNamespace: Greenhouse,
   name: SC.Record.attr(String),
   dir: SC.Record.attr(String),
   body: SC.Record.attr(String),

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

@@ -194,13 +194,22 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var iframe = Greenhouse.get('iframe'), 
             innerTargets,
             webViewFrame,
+            dropContainerLayout,
             webView = Greenhouse.appPage.get('webView');
 
         var pv = webView.get('parentView');
           webViewFrame = webView.get('frame');
         webViewFrame = pv.convertFrameToView(webViewFrame, null);
-
-
+        //add the drop container to the adjusted layout
+        dropContainerLayout = iframe.SC.designPage.getPath('designMainPane.container').layout;
+        
+        if(dropContainerLayout){
+          webViewFrame.x += dropContainerLayout.left;
+          webViewFrame.y += dropContainerLayout.top;
+        }
+        //assign this to 
+        Greenhouse._webViewFrame = webViewFrame;
+        
         //add existing targets
         innerTargets = iframe.SC.Drag._dropTargets;
 
@@ -221,33 +230,41 @@ Greenhouse.mixin( /** @scope Greenhouse */{
           delete iframe.SC.Drag._dropTargets[iframe.SC.guidFor(target)] ;
           delete SC.Drag._dropTargets[iframe.SC.guidFor(target)];
         };
+        
+        //make sure all drags have an iframeTargetOffset...
+        SC.Drag.start = function(ops) {
+          var ret = this.create(ops);
+          ret.globalTargetOffset = Greenhouse._webViewFrame;
+          ret.startDrag();
+          return ret;
+        };
+
+        //all inner drags are actually outer drags
+        iframe.SC.Drag.start = SC.Drag.start;
 
 
         SC.Drag.prototype._findDropTarget = function(evt) {
-          var loc = { x: evt.pageX, y: evt.pageY } ;
-
+          var loc = { x: evt.pageX, y: evt.pageY }, globalOffset = this.globalTargetOffset ;
           var target, frame ;
           var ary = this._dropTargets() ;
           for (var idx=0, len=ary.length; idx<len; idx++) {
             target = ary[idx] ;
-
             // If the target is not visible, it is not valid.
             if (!target.get('isVisibleInWindow')) continue ;
 
             // get clippingFrame, converted to the pane.
             frame = target.convertFrameToView(target.get('clippingFrame'), null) ;
-
-            //if this is in the iframe adjust the frame accordingly
-            if(target.get('targetIsInIFrame')){
-               frame.x = frame.x + webViewFrame.x;
-               frame.y = frame.y + webViewFrame.y;
-             }
+            //convert to iframe pane if it is in the winodw
+            if(globalOffset && target.inGlobalOffset){
+              frame.x += globalOffset.x;
+              frame.y += globalOffset.y;
+            }
             // check to see if loc is inside.  If so, then make this the drop target
             // unless there is a drop target and the current one is not deeper.
-            if (SC.pointInRect(loc, frame)) return target;
+            if(SC.pointInRect(loc, frame)) return target;
+
           } 
-          return null ;
-        };
+          return null ;        };
         //all inner drags are actually outer drags
         iframe.SC.Drag.start = SC.Drag.start;
       },

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

@@ -210,7 +210,8 @@ Greenhouse.mixin( /** @scope Greenhouse */{
 
       enterState: function(){
         var picker = Greenhouse.dialogPage.get('propertyPicker');
-        picker.set('contentView', Greenhouse.dialogPage.get('propertyEditor'));
+        var cv = Greenhouse.dialogPage.get('propertyEditor');
+        picker.set('contentView', cv);
         var list = Greenhouse.inspectorsPage.getPath('propertiesInspector.list.contentView');
         var content = Greenhouse.propertyController.get('content');