sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/models/file.js

@@ -6,12 +6,12 @@
 /*globals Greenhouse*/
 
 sc_require('core');
-/** @class
+/**
 
   file properties
   @property dir
   @property name
-  
+
   @extends SC.ChildRecord
   @version 0.1
 */
@@ -23,29 +23,27 @@ Greenhouse.File = SC.Record.extend(
   dir: SC.Record.attr(String),
   body: SC.Record.attr(String),
   primaryKey: 'id',
-  
+
   isFile: YES,
 
   path: function(){
     return this.get('dir') + this.get('name');
   }.property('name', 'dir').cacheable(),
-  
+
   pageRegex: function(){
     var b = this.get('body'), re =/(\w+)\.(\w+)\s*=\s*SC\.Page\.(design|create)/;
     return b ? b.match(re): b;
   }.property('body').cacheable(),
-  
+
   isPage: function(){
     return this.get('pageRegex') !== null;
   }.property('pageRegex').cacheable(),
-  
+
   pageName: function(){
     var r = this.get('pageRegex') || [];
     return "%@.%@".fmt(r[1],r[2]);
   }.property('pageRegex').cacheable()
 
 }) ;
-Greenhouse.FILES_QUERY = SC.Query.remote(Greenhouse.File);
-Greenhouse.File.mixin({
 
-});
+Greenhouse.FILES_QUERY = SC.Query.remote(Greenhouse.File);

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/models/target.js

@@ -4,7 +4,7 @@
 // ==========================================================================
 /*globals Greenhouse */
 
-/** @class
+/**
 
   Describes a target in the build system.
 
@@ -14,12 +14,12 @@ Greenhouse.Target = SC.Record.extend(
 /** @scope Greenhouse.Target.prototype */ {
 
   primaryKey: "name",
-  
+
   /**
     Name of target.  This is also the primary key.
   */
   name: SC.Record.attr(String),
-  
+
   /**
     Parent of target.  Only non-null for nested targets.
   */
@@ -29,19 +29,19 @@ Greenhouse.Target = SC.Record.extend(
     URL to use to load tests.
   */
   testsUrl: SC.Record.attr(String, { key: "link_tests" }),
-  
-  /**  
-    URL to use to load the app.  If no an app, returns null
+
+  /**
+    URL to use to load the app.  If not an app, returns null
   */
   appUrl: function() {
     return (this.get('kind') === 'app') ? this.get('name')+"?designMode=YES" : null;
   }.property('kind', 'name').cacheable(),
-  
+
   /**
     The isExpanded state.  Defaults to NO on load.
   */
   isExpanded: SC.Record.attr(Boolean, { defaultValue: NO }),
-  
+
   /**
     Display name for this target
   */
@@ -49,7 +49,7 @@ Greenhouse.Target = SC.Record.extend(
     var name = (this.get('name') || '(unknown)').split('/');
     return name[name.length-1];
   }.property('name').cacheable(),
-  
+
   /**
     The icon to display.  Based on the type.
   */
@@ -59,14 +59,14 @@ Greenhouse.Target = SC.Record.extend(
       case "framework":
         ret = 'sc-icon-folder-16';
         break;
-        
+
       case "app":
-        ret = 'sc-icon-options-16';
+        ret = this.get('sortKind') === 'sproutcore' ? 'sc-icon-options-16' : 'sc-icon-sproutcore-16';
         break;
     }
     return ret ;
   }.property('kind').cacheable(),
-  
+
   /**
     This is the group key used to display.  Will be the kind unless the item
     belongs to the sproutcore target.

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/models/view_config.js

@@ -4,7 +4,7 @@
 // ==========================================================================
 /*globals Greenhouse js_beautify*/
 
-/** @class
+/**
 
   (Document your Model here)
 
@@ -13,37 +13,37 @@
 */
 Greenhouse.ViewConfig = SC.Record.extend(
 /** @scope Greenhouse.ViewConfig.prototype */ {
-  
+
   primaryKey: 'path',
-  
+
   views: SC.Record.toMany('Greenhouse.Design', {nested: YES}),
   panes: SC.Record.toMany('Greenhouse.Design', {nested: YES}),
   controllers: SC.Record.toMany('Greenhouse.Design', {nested: YES}),
   canEdit: SC.Record.attr(Boolean),
   name: SC.Record.attr(String),
   path: SC.Record.attr(String),
-  
+
   body: function(){
     var ret = {name: this.get('name'), path: this.get('path'), views: [], controllers: [], panes: []},
         views = this.get('views'),
         controllers = this.get('controllers'),
         panes = this.get('panes');
-    
-    
+
+
     views.forEach(function(i){
       ret.views.push(i.get('attributes'));
     });
-    
+
     controllers.forEach(function(i){
       ret.controllers.push(i.get('attributes'));
     });
-    
+
     panes.forEach(function(i){
       ret.panes.push(i.get('attributes'));
     });
-    
+
     return js_beautify(SC.json.encode(ret));
   }.property('views', 'panes', 'controllers')
-  
+
 }) ;
 Greenhouse.CONFIG_QUERY = SC.Query.remote(Greenhouse.ViewConfig);

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/states/inspector.js

@@ -5,7 +5,7 @@
 /*globals Greenhouse */
 /*jslint evil: true */
 
-/** @mixin
+/**
   @extends Greenhouse
   @author Mike Ball
   @author Evin Grano
@@ -13,10 +13,10 @@
   @since RC1
 */
 Greenhouse.mixin( /** @scope Greenhouse */{
-  
+
   inspectorStates: SC.State.design({
     initialSubstate: 'inspectorClosed',
-    
+
     inspectorClosed: SC.State.design({
 
       parallelStatechart: 'inspector',
@@ -52,7 +52,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         picker.becomeFirstResponder();
       },
       exitState: function(){
-        var ap = Greenhouse.appPage; 
+        var ap = Greenhouse.appPage;
         var picker = ap.get('inspectorPicker'),
             pickerContentView = ap.get('inspectorPickerContentView');
         pickerContentView.setIfChanged('nowShowing', null);
@@ -80,7 +80,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
       parallelStatechart: 'inspector',
 
       enterState: function(){
-        var ap = Greenhouse.appPage; 
+        var ap = Greenhouse.appPage;
         var picker = ap.get('inspectorPicker'),
             pickerContentView = ap.get('inspectorPickerContentView');
 
@@ -92,11 +92,11 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var content = ap.getPath('inspectorContentView.content'),
             toolbar = ap.getPath('inspectorContentView.toolbar');
 
-        content.adjust('top', 28);    
-        toolbar.set('isVisible', YES); 
+        content.adjust('top', 28);
+        toolbar.set('isVisible', YES);
       },
       exitState: function(){
-        var ap = Greenhouse.appPage; 
+        var ap = Greenhouse.appPage;
         var picker = ap.get('inspectorPicker'),
             pickerContentView = ap.get('inspectorPickerContentView');
 
@@ -108,7 +108,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var content = ap.getPath('inspectorContentView.content'),
             toolbar = ap.getPath('inspectorContentView.toolbar');
 
-        content.adjust('top', 0);    
+        content.adjust('top', 0);
         toolbar.set('isVisible', NO);
       },
 
@@ -146,7 +146,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
       }
     })
   })
-  
-  
+
+
 
 });

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/states/library.js

@@ -5,7 +5,7 @@
 /*globals Greenhouse */
 /*jslint evil: true */
 
-/** @mixin
+/**
   @extends Greenhouse
   @author Mike Ball
   @author Evin Grano
@@ -13,10 +13,10 @@
   @since RC1
 */
 Greenhouse.mixin( /** @scope Greenhouse */{
-  
+
   libraryStates: SC.State.design({
     initialSubstate: 'libraryClosed',
-    
+
     libraryClosed: SC.State.design({
       parallelStatechart: 'library',
 
@@ -82,8 +82,8 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var content = ap.getPath('libraryContentView.content'),
             toolbar = ap.getPath('libraryContentView.toolbar');
 
-        content.adjust('top', 49);    
-        toolbar.set('isVisible', YES); 
+        content.adjust('top', 49);
+        toolbar.set('isVisible', YES);
       },
       exitState: function(){
         var ap = Greenhouse.appPage;
@@ -98,7 +98,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var content = ap.getPath('libraryContentView.content'),
             toolbar = ap.getPath('libraryContentView.toolbar');
 
-        content.adjust('top', 49);    
+        content.adjust('top', 49);
         toolbar.set('isVisible', NO);
       },
 
@@ -134,9 +134,9 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         this.gotoState('libraryClosed');
       }
     })
-    
-    
+
+
   })
-  
-  
+
+
 });

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/states/main.js

@@ -3,31 +3,32 @@
 // Copyright: ©2010 Mike Ball
 // ==========================================================================
 /*globals Greenhouse */
-/** @mixin
+/**
   @extends Greenhouse
   @author Mike Ball
   @author Evin Grano
   @version RC1
   @since RC1
 */
-Greenhouse.mixin( /** @scope Greenhouse */{
-  
-  rootState: SC.State.design({    
+Greenhouse.mixin(SC.StatechartManager, {
+  /** @scope Greenhouse */
+
+  rootState: SC.State.design({
     substatesAreConcurrent: YES,
-    
+
     mainStates: SC.State.plugin('Greenhouse.mainStates'),
-    
+
     modalStates: SC.State.plugin('Greenhouse.modalStates'),
-    
+
     libraryStates: SC.State.plugin('Greenhouse.libraryStates'),
-    
-    inspectorStates: SC.State.plugin('Greenhouse.inspectorStates')    
+
+    inspectorStates: SC.State.plugin('Greenhouse.inspectorStates')
   }),
-  
+
   mainStates: SC.State.design({
-    
+
     initialSubstate: 'loading',
-    
+
     loading: SC.State.design({
 
       enterState: function(){
@@ -79,10 +80,10 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         this.gotoState('loading');
       }
     }),
-    
+
     // ..........................................................
     // sub states
-    // 
+    //
     ready: SC.State.plugin('Greenhouse.readyStates'),
 
 
@@ -121,14 +122,14 @@ Greenhouse.mixin( /** @scope Greenhouse */{
 
       // ..........................................................
       // Monkey-Patch Run Loop
-      // 
+      //
       _setupRunLoops: function(){
         var iframe = Greenhouse.get('iframe'), innerBegin, outerBegin, innerEnd, outerEnd, outerSC = SC;
 
         // ..........................................................
         // run loop patches...
-        // 
-        outerBegin = function() {    
+        //
+        outerBegin = function() {
           var runLoop = outerSC.RunLoop.currentRunLoop;
           if (!runLoop) runLoop = outerSC.RunLoop.currentRunLoop = outerSC.RunLoop.runLoopClass.create();
           runLoop.beginRunLoop();
@@ -143,7 +144,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
           return outerSC.RunLoop ;
         };
 
-        innerBegin = function() {    
+        innerBegin = function() {
           var runLoop = iframe.SC.RunLoop.currentRunLoop;
           if (!runLoop) runLoop = iframe.SC.RunLoop.currentRunLoop = iframe.SC.RunLoop.runLoopClass.create();
           runLoop.beginRunLoop();
@@ -160,7 +161,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         };
 
         //outer begin
-        outerSC.RunLoop.begin = function() { 
+        outerSC.RunLoop.begin = function() {
           //console.log('outer begin');
           var outer = outerBegin();
           innerBegin();
@@ -191,7 +192,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
        },
 
       _grabDropTargets: function(){
-        var iframe = Greenhouse.get('iframe'), 
+        var iframe = Greenhouse.get('iframe'),
             innerTargets,
             webViewFrame,
             dropContainerLayout,
@@ -202,14 +203,14 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         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 
+        //assign this to
         Greenhouse._webViewFrame = webViewFrame;
-        
+
         //add existing targets
         innerTargets = iframe.SC.Drag._dropTargets;
 
@@ -230,7 +231,7 @@ 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);
@@ -263,7 +264,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
             // unless there is a drop target and the current one is not deeper.
             if(SC.pointInRect(loc, frame)) return target;
 
-          } 
+          }
           return null ;        };
         //all inner drags are actually outer drags
         iframe.SC.Drag.start = SC.Drag.start;

data/lib/frameworks/sproutcore/{frameworks/experimental/apps → apps}/greenhouse/states/modals.js

@@ -5,7 +5,7 @@
 /*globals Greenhouse */
 /*jslint evil: true */
 
-/** @mixin
+/**
   @extends Greenhouse
   @author Mike Ball
   @author Evin Grano
@@ -13,10 +13,10 @@
   @since RC1
 */
 Greenhouse.mixin( /** @scope Greenhouse */{
-  
+
   modalStates: SC.State.design({
     initialSubstate: 'modalReady',
-    
+
     modalReady: SC.State.design({
 
       parallelStatechart: 'modals',
@@ -96,7 +96,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var fromKey = Greenhouse.get("newBindingFromKey"),
             toKey = Greenhouse.get("newBindingToKey"),
             newItem = this.get('newItem'),
-            view = Greenhouse.designController.get('view'), 
+            view = Greenhouse.designController.get('view'),
             c = Greenhouse.designController.get('content');
 
         if(view && c){
@@ -144,8 +144,8 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         var viewConfig = Greenhouse.get('newDesignViewConfig');
         var array = viewConfig.get(Greenhouse.get('newDesignType'));
 
-        var newView = array.pushObject({name: Greenhouse.get('newDesignClass'), 
-                           scClass: Greenhouse.get('newDesignClass'), 
+        var newView = array.pushObject({name: Greenhouse.get('newDesignClass'),
+                           scClass: Greenhouse.get('newDesignClass'),
                            defaults: eval("("+Greenhouse.get('newDesignDefaults')+")")});
 
         viewConfig.commitRecord();
@@ -219,7 +219,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         picker.popup(list.itemViewForContentObject(content));
         picker.becomeFirstResponder();
 
-        //TODO: copy correct here? 
+        //TODO: copy correct here?
         Greenhouse.propertyEditorController.set('content', SC.copy(content));
       },
       exitState: function(){
@@ -233,7 +233,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
       },
 
       update: function(){
-        var val = Greenhouse.propertyEditorController.get('value'), 
+        var val = Greenhouse.propertyEditorController.get('value'),
             view = Greenhouse.propertyEditorController.get('view'),
             key = Greenhouse.propertyEditorController.get('key'),
             origKey = Greenhouse.propertyController.get('key'),
@@ -293,7 +293,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
         this.gotoState('modalReady');
       }
     })
-    
+
   })
-  
+
 });