RubyGems - sproutcore - Versions diffs - 1.4.5 → 1.5.0.pre.3 - Mend

sproutcore 1.4.5 → 1.5.0.pre.3

Files changed (792) hide show

data/lib/buildtasks/target.rake CHANGED Viewed

@@ -43,6 +43,7 @@ namespace :target do
         (url_prefix || '').to_s.split('/'),
         target[:target_name].to_s.split('/')))
     target[:staging_root] = File.expand_path(config[:staging_root] ||
       File.join(project.project_root.to_s,
         (config[:staging_prefix] || '').to_s.split('/'),

data/lib/doc_templates/sproutcore/index.tmpl CHANGED Viewed

@@ -5,6 +5,15 @@ function keys(o) {
   return keys;
 }
+var version;
+for (var i=0, len=data.length; i < len; i++) {
+  var item = data[i];
+  if (item.alias === 'SC') {
+    version = item.version;
+    break;
+  }
+}
 !}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -14,7 +23,7 @@ function keys(o) {
 		<meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}" />
 		<meta name="generator" content="JsDoc Toolkit" />
 		{! Link.base = ""; /* all generated links will be relative to this */ !}
-		<title>JsDoc Reference</title>
+		<title>SproutCore Reference Index - v{+version+}</title>
 		<style type="text/css">
 			{+include("static/default.css")+}
@@ -23,9 +32,14 @@ function keys(o) {
 	<body class="sc-doc">
-		<h1>SproutCore Reference Index</h1>
-		<p id="warning">WARNING: This is draft reference documentation generated automatically from the <a href="http://github.com/sproutit/sproutcore">SproutCore source</a>.  It has not been fully vetted for accuracy or completeness.  Expect to find bugs here and there.  If you want to help make the docs better, please grab the source and make the docs better!</p>
+		<h1>SproutCore Reference Index - v{+version+}</h1>
+		<p id="warning">
+      WARNING: This is draft reference documentation generated automatically from the
+      <a href="http://github.com/sproutcore/sproutcore{+ version.match(/^1\.4/) ? '/tree/1-4-stable/' : '' +}">SproutCore source</a>.
+      It has not been fully vetted for accuracy or completeness.  Expect to find bugs here and there.
+      If you want to help make the docs better, please grab the source and make the docs better!
+    </p>
 		<div id="index">

data/lib/doc_templates/sproutcore/publish.js CHANGED Viewed

@@ -343,4 +343,4 @@ function resolveLinks(str, from) {
   );
   return str;
-}
+}

data/lib/frameworks/sproutcore/Buildfile CHANGED Viewed

@@ -12,7 +12,7 @@
 config :all,
   :layout         => 'sproutcore:lib/index.rhtml',
   :test_layout    => 'sproutcore:lib/index.rhtml',
-  :test_required  => ['sproutcore/testing', 'sproutcore/empty_theme'],
+  :test_required  => ['sproutcore/testing'],
   :debug_required => ['sproutcore/debug', 'sproutcore/testing']
 # in debug mode, combine the JS for SC by default.  This will improve perf
@@ -27,10 +27,12 @@ end
 # CORE FRAMEWORKS
 config :bootstrap,  :required => [], :use_modules => false
-config :runtime,    :required => []
-config :foundation, :required => [:runtime]
+config :jquery,     :required => []
+config :runtime,    :required => [:jquery]
+config :amber,      :required => [:runtime]
+config :foundation, :required => [:amber]
 config :datastore,  :required => [:foundation]
-config :statechart, :required => [:runtime]
+config :statechart, :required => [:amber]
 config :desktop,    :required => [:foundation]
 config :media,      :required => [:desktop]
@@ -44,10 +46,11 @@ config :mobile,
   :test_layout    => 'sproutcore/mobile:lib/index.rhtml'
 # WRAPPER FRAMEWORKS
-config :designer, :required => [:runtime, :foundation]
+config :designer, :required => [:runtime, :foundation, :desktop]
 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
@@ -74,18 +77,27 @@ 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'],
+  :css_theme => 'ace'
 # CONFIGURE APPS
-config :core_tools, :required => [:desktop, :datastore]
+# CONFIGURE APPS
+config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
 # mode :debug do
 #   config :core_tools, :combine_javascript => false
 # end
-%w(tests docs welcome).each do |app_target|
+%w(tests test_controls docs welcome).each do |app_target|
   config app_target,
-    :required => [:desktop, :datastore, :core_tools],
-    :theme => :standard_theme
+    :required => [:desktop, :datastore, :core_tools],
+    :theme => :ace,
+    :html5_history => true
   # mode :debug do
   #   config app_target, :combine_javascript => false
@@ -93,9 +105,8 @@ config :core_tools, :required => [:desktop, :datastore]
 end
+config :test_controls, :css_theme => 'ace.test-controls'
 config :greenhouse,
   :required => [:sproutcore, :'sproutcore/designer', :statechart],
   :theme    => :standard_theme

data/lib/frameworks/sproutcore/{CHANGELOG-1.4.md → CHANGELOG.md} RENAMED Viewed

File without changes

data/lib/frameworks/sproutcore/apps/greenhouse/controllers/file.js CHANGED Viewed

@@ -10,8 +10,6 @@
   @extends SC.ObjectController
 */
-Greenhouse.PAGE_DESIGNER = "pageDesigner";
-Greenhouse.BESPIN = "bespin";
 Greenhouse.fileController = SC.ObjectController.create(
 /** @scope Greenhouse.fileController.prototype */ {
@@ -23,53 +21,15 @@ Greenhouse.fileController = SC.ObjectController.create(
   _content_statusDidChange: function(){
     var c = this.get('content');
     if(c && c.get('isPage') ) {
-      Greenhouse.sendAction('fileSelectedIsAPage');
-      Greenhouse.sendAction('cancel');
+      this.invokeOnce(function(){
+        Greenhouse.sendAction('fileSelectedIsAPage');
+        Greenhouse.sendAction('cancel');
+      });
     }
     else if (c && !c.get('isPage')){
-      Greenhouse.sendAction('fileSelectedIsNotAPage');
+      this.invokeOnce(function(){
+        Greenhouse.sendAction('fileSelectedIsNotAPage');
+      });
     }
-  }.observes('*content.body'),
-  state: null,
-  editorMode: '',
-  // ..........................................................
-  // State information
-  //
-  //TODO: Rip this crap out...
-  init: function(){
-    sc_super();
-    this.set('state', Greenhouse.PAGE_DESIGNER);
-    this.set('editorMode', "pageDesigner");
-  },
-  pageDesigner: function(){
-    var state = this.get('state');
-    switch(state){
-      case Greenhouse.BESPIN:
-        this.set('state', Greenhouse.PAGE_DESIGNER);
-        this.set('editorMode', "pageDesigner");
-        break;
-      default:
-        console.log("RedBull.fileController#pageDesigner not handled in current state %@".fmt(state));
-        break;
-    }
-  },
-  bespinEditor: function(){
-    var state = this.get('state');
-    switch(state){
-      case Greenhouse.PAGE_DESIGNER:
-        this.set('state', Greenhouse.BESPIN);
-        this.set('editorMode', "bespinEditor");
-        break;
-      default:
-        console.log("RedBull.fileController#bespinEditor not handled in current state %@".fmt(state));
-        break;
-    }
-  }
+  }.observes('*content.body')
 }) ;

data/lib/frameworks/sproutcore/apps/greenhouse/core.js CHANGED Viewed

@@ -13,7 +13,7 @@ SC.DEFAULT_TREE = 'main';
   @extends SC.Object
 */
-Greenhouse = SC.Object.create( SC.Statechart,
+Greenhouse = SC.Object.create( SC.StatechartManager,
   /** @scope Greenhouse.prototype */ {
   NAMESPACE: 'Greenhouse',
@@ -28,12 +28,10 @@ Greenhouse = SC.Object.create( SC.Statechart,
   store: SC.Store.create().from('Greenhouse.DataSource'),
   //statechart options
-  log: YES,
+  monitorIsActive: YES,
-  startOnInit: NO,
-  startStates: {'main': 'loading', 'modals': 'modalReady', 'projectPicker': 'projectPickerClosed', 'library': 'libraryClosed', 'inspector': 'inspectorClosed'},
   loadIframeWithPage: function(firstTime){
     var c = Greenhouse.fileController.get('content'), iframe = Greenhouse.get('iframe'), namespace, page;
     var r = c.get('pageRegex'), mainPane;

data/lib/frameworks/sproutcore/apps/greenhouse/data_source.js CHANGED Viewed

@@ -93,7 +93,7 @@ Greenhouse.DataSource = SC.DataSource.extend({
   fetchViewConfigs: function(store, query){
     if (!query.get('isRemote')) return NO ;
-    SC.Request.getUrl('/sc/greenhouse-config.json?app=%@'.fmt(query.get('app')))
+    SC.Request.getUrl('/sc/greenhouseconf.json?app=%@'.fmt(query.get('app')))
       .set('isJSON', YES)
       .notify(this, 'fetchViewConfigsDidComplete', { query: query, store: store })
       .send();

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

@@ -18,7 +18,7 @@ Greenhouse.appPage = SC.Page.design({
     mainContainer: SC.ContainerView.design({
       layout: { left: 0, top: 46, right: 0, bottom: 0 },
-      nowShowingBinding: 'Greenhouse.fileController.editorMode'
+      nowShowing: 'pageDesigner' //Hardcoded till we add another mode like bespin
     }),
     toolBar: SC.ToolbarView.design({
@@ -110,6 +110,18 @@ Greenhouse.appPage = SC.Page.design({
             {title: "_Reload App".loc(), action: 'reloadIframe', isEnabled: YES},
             {title: "_Dock Library".loc(), action: 'toggleDockedLibrary', isEnabled: YES},
             {title: "_Dock Inspector".loc(), action: 'toggleDockedInspector', isEnabled: YES},
+            { isSeparator: YES },
+            {title: "_Page Size".loc(),
+              subMenu:[
+              {title: "_iPhone Hrz".loc(), action: 'resizePage', isEnabled: YES, size: {width: 480, height: 320}},
+              {title: "_iPhone Vrt".loc(), action: 'resizePage', isEnabled: YES, size: {width: 320, height: 480}},
+              {title: "_iPad Hrz".loc(), action: 'resizePage', isEnabled: YES, size: {width: 1024, height: 768}},
+              {title: "_iPad Vrt".loc(), action: 'resizePage', isEnabled: YES, size: {height: 1024, width: 768}},
+              {title: "_Full".loc(), action: 'resizePage', isEnabled: YES}
+              ]
+            },
+            { isSeparator: YES },
             {title: "_Save".loc(), action: 'save', isEnabled: YES }
           ]
         })
@@ -247,7 +259,7 @@ Greenhouse.appPage = SC.Page.design({
     content: SC.View.design({
       classNames: ['content'],
       layout: { top: 49, bottom: 11, left: 8, right: 8 },
-      childViews: 'library addCustomView'.w(),
+      childViews: 'library addCustomView removeCustomView'.w(),
       library: SC.ScrollView.design({
         classNames: ['library-list'],
@@ -266,13 +278,23 @@ Greenhouse.appPage = SC.Page.design({
           }
         })
       }),
+      removeCustomView: SC.ButtonView.design({
+        classNames: ['dark'],
+        layout: { bottom: 1, right: 70, height: 24, width: 70 },
+        titleMinWidth: 0,
+        hasIcon: NO,
+        isEnabledBinding: 'Greenhouse.libraryController*selection.firstObject.canEdit',
+        title: "_Remove".loc(),
+        action: 'removeCustomView'
+      }),
       addCustomView: SC.ButtonView.design({
         classNames: ['dark'],
-        layout: { bottom: 1, right: 0, height: 24, width: 90 },
+        layout: { bottom: 1, right: 0, height: 24, width: 50 },
         titleMinWidth: 0,
         hasIcon: NO,
-        title: "_Add Design".loc(),
+        title: "_Add".loc(),
         action: 'newCustomView'
       })
     })

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

@@ -82,6 +82,12 @@ SC.stringsFor('English', {
   "_Reload App": "Reload App",
   "_Target:": "Target:",
   "_Design Type:": "Design Type:",
-  "_Add Design": "Add Design"
+  "_Remove": "Remove",
+  "_iPhone Hrz": "iPhone Hrz",
+  "_iPhone Vrt": "iPhone Vrt",
+  "_iPad Hrz": "iPad Hrz",
+  "_iPad Vrt": "iPad Vrt",
+  "_Page Size": "Page Size",
+  "_Full": "Full"
 }) ;

data/lib/frameworks/sproutcore/apps/greenhouse/main.js CHANGED Viewed

@@ -21,7 +21,7 @@ Greenhouse.main = function main() {
   //start the state machine
   Greenhouse.targetsController.reload();
-  Greenhouse.startupStatechart();
+  Greenhouse.initStatechart();
 } ;

data/lib/frameworks/sproutcore/apps/greenhouse/models/design.js CHANGED Viewed

@@ -13,10 +13,14 @@
 */
 Greenhouse.Design = SC.Record.extend(
 /** @scope Greenhouse.Design.prototype */ {
-  primaryKey: 'name',
+  primaryKey: 'scClass',
   name: SC.Record.attr(String),
   scClass: SC.Record.attr(String),
-  defaults: SC.Record.attr(Object)
+  defaults: SC.Record.attr(Object),
+  canEdit: function(){
+    return this._parentRecord.get('canEdit');
+  }.property().cacheable()
 }) ;

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

@@ -9,9 +9,9 @@ require('core');
 /** @class
   dir properties
-  @dir
-  @name
-  @contents
+  @property dir
+  @property name
+  @property contents
   @extends SC.ChildRecord
   @version 0.1
@@ -23,7 +23,7 @@ Greenhouse.Dir = SC.ChildRecord.extend(
   name: SC.Record.attr(String),
   dir: SC.Record.attr(String),
-  contents: SC.Record.toMany('SC.Record', {nested: YES}),
+  contents: SC.Record.toMany('Greenhouse.File', {nested: YES}),
   primaryKey: 'id',
@@ -42,7 +42,8 @@ Greenhouse.Dir = SC.ChildRecord.extend(
       body = eval(bodyText || "");
       body.set('needsDesigner', YES);
       body.set('isContainerView',YES);
-      this.set('currentDesign', body);
+      this.writeAttribute('currentDesign', body, YES);
+      this.notifyPropertyChange('currentDesign');
       for(var v in body){
         if(body.hasOwnProperty(v)){
           if(body[v] && body[v].kindOf){
@@ -58,11 +59,11 @@ Greenhouse.Dir = SC.ChildRecord.extend(
           }
         }
       }
-      this.set('designs', designs);
+      this.writeAttribute('designs', designs, YES);
+      this.notifyPropertyChange('designs');
     } catch (exception) {
       console.log("Couldn't eval body...");
-      this.set('designs', null);
     }
   },

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

@@ -9,8 +9,8 @@ require('core');
 /** @class
   file properties
-  @dir
-  @name
+  @property dir
+  @property name
   @extends SC.ChildRecord
   @version 0.1

data/lib/frameworks/sproutcore/apps/greenhouse/states/inspector.js CHANGED Viewed

@@ -13,132 +13,140 @@
   @since RC1
 */
 Greenhouse.mixin( /** @scope Greenhouse */{
-  inspectorClosed: SC.State.create({
-    parallelStatechart: 'inspector',
-    // ..........................................................
-    // Events
-    //
-    openInspector: function(anchor){
-      if(anchor) Greenhouse.openInspectorPicker.set('anchor', anchor);
-      this.goState('openInspectorPicker');
-    },
-    toggleDockedInspector: function(){
-      this.goState('dockedInspector');
-    },
-    floatInspector: function(){
-      this.goState('inspectorPalette');
-    }
-  }),
-  openInspectorPicker: SC.State.create({
-    parallelStatechart: 'inspector',
-    enterState: function(){
-      var ap = Greenhouse.appPage;
-      var picker = ap.get('inspectorPicker'),
-          pickerContentView = ap.get('inspectorPickerContentView');
-      var anchor = this.get('anchor') || ap.getPath('mainView.toolBar.inspector');
-      pickerContentView.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
-      picker.popup(anchor, SC.PICKER_POINTER);
-      picker.becomeFirstResponder();
-    },
-    exitState: function(){
-      var ap = Greenhouse.appPage;
-      var picker = ap.get('inspectorPicker'),
-          pickerContentView = ap.get('inspectorPickerContentView');
-      pickerContentView.setIfChanged('nowShowing', null);
-      picker.remove();
-      this.set('anchor', null);
-    },
-    // ..........................................................
-    // Events
-    //
-    cancel: function(){
-      this.goState('inspectorClosed');
-    },
+  inspectorStates: SC.State.design({
+    initialSubstate: 'inspectorClosed',
-    floatInspector: function(){
-      this.goState('inspectorPalette');
-    },
-    toggleDockedInspector: function(){
-      this.goState('dockedInspector');
-    }
-  }),
-  inspectorPalette: SC.State.create({
-    parallelStatechart: 'inspector',
-    enterState: function(){
-      var ap = Greenhouse.appPage;
-      var picker = ap.get('inspectorPicker'),
-          pickerContentView = ap.get('inspectorPickerContentView');
-      pickerContentView.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
-      picker.append();
-      picker.set('isModal', NO);
-      picker.set('isAnchored', NO);
-      picker.$().toggleClass('sc-picker', NO);
-      var content = ap.getPath('inspectorContentView.content'),
-          toolbar = ap.getPath('inspectorContentView.toolbar');
-      content.adjust('top', 28);
-      toolbar.set('isVisible', YES);
-    },
-    exitState: function(){
-      var ap = Greenhouse.appPage;
-      var picker = ap.get('inspectorPicker'),
-          pickerContentView = ap.get('inspectorPickerContentView');
-      pickerContentView.setIfChanged('nowShowing', null);
-      picker.set('isModal', YES);
-      picker.set('isAnchored', YES);
-      picker.remove();
-      var content = ap.getPath('inspectorContentView.content'),
-          toolbar = ap.getPath('inspectorContentView.toolbar');
-      content.adjust('top', 0);
-      toolbar.set('isVisible', NO);
-    },
-    // ..........................................................
-    // Events
-    //
-    closeInspector: function(){
-      this.goState('inspectorClosed');
-    },
-    toggleDockedInspector: function(){
-      this.goState('dockedInspector');
-    }
-  }),
-  dockedInspector: SC.State.create({
-    parallelStatechart: 'inspector',
-    enterState: function(){
-      var iDock = Greenhouse.appPage.get('inspectorDockView');
-      iDock.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
-    },
-    exitState: function(){
-      var iDock = Greenhouse.appPage.get('inspectorDockView');
-      iDock.setIfChanged('nowShowing', null);
-    },
-    // ..........................................................
-    // Events
-    //
-    toggleDockedInspector: function(){
-      var libState = Greenhouse.get('libraryClosed').state();
-      if (libState !== Greenhouse.get('dockedLibrary')) Greenhouse.sendEvent('undock');
-      this.goState('inspectorClosed');
-    }
+    inspectorClosed: SC.State.design({
+      parallelStatechart: 'inspector',
+      // ..........................................................
+      // Events
+      //
+      openInspector: function(anchor){
+        if(anchor) Greenhouse.setPath('inspectorStates.openInspectorPicker.anchor', anchor);
+        this.gotoState('openInspectorPicker');
+      },
+      toggleDockedInspector: function(){
+        this.gotoState('dockedInspector');
+      },
+      floatInspector: function(){
+        this.gotoState('inspectorPalette');
+      }
+    }),
+    openInspectorPicker: SC.State.design({
+      parallelStatechart: 'inspector',
+      enterState: function(){
+        var ap = Greenhouse.appPage;
+        var picker = ap.get('inspectorPicker'),
+            pickerContentView = ap.get('inspectorPickerContentView');
+        var anchor = this.get('anchor') || ap.getPath('mainView.toolBar.inspector');
+        pickerContentView.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
+        picker.popup(anchor, SC.PICKER_POINTER);
+        picker.becomeFirstResponder();
+      },
+      exitState: function(){
+        var ap = Greenhouse.appPage;
+        var picker = ap.get('inspectorPicker'),
+            pickerContentView = ap.get('inspectorPickerContentView');
+        pickerContentView.setIfChanged('nowShowing', null);
+        picker.remove();
+        this.set('anchor', null);
+      },
+      // ..........................................................
+      // Events
+      //
+      cancel: function(){
+        this.gotoState('inspectorClosed');
+      },
+      floatInspector: function(){
+        this.gotoState('inspectorPalette');
+      },
+      toggleDockedInspector: function(){
+        this.gotoState('dockedInspector');
+      }
+    }),
+    inspectorPalette: SC.State.design({
+      parallelStatechart: 'inspector',
+      enterState: function(){
+        var ap = Greenhouse.appPage;
+        var picker = ap.get('inspectorPicker'),
+            pickerContentView = ap.get('inspectorPickerContentView');
+        pickerContentView.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
+        picker.append();
+        picker.set('isModal', NO);
+        picker.set('isAnchored', NO);
+        picker.$().toggleClass('sc-picker', NO);
+        var content = ap.getPath('inspectorContentView.content'),
+            toolbar = ap.getPath('inspectorContentView.toolbar');
+        content.adjust('top', 28);
+        toolbar.set('isVisible', YES);
+      },
+      exitState: function(){
+        var ap = Greenhouse.appPage;
+        var picker = ap.get('inspectorPicker'),
+            pickerContentView = ap.get('inspectorPickerContentView');
+        pickerContentView.setIfChanged('nowShowing', null);
+        picker.set('isModal', YES);
+        picker.set('isAnchored', YES);
+        picker.remove();
+        var content = ap.getPath('inspectorContentView.content'),
+            toolbar = ap.getPath('inspectorContentView.toolbar');
+        content.adjust('top', 0);
+        toolbar.set('isVisible', NO);
+      },
+      // ..........................................................
+      // Events
+      //
+      closeInspector: function(){
+        this.gotoState('inspectorClosed');
+      },
+      toggleDockedInspector: function(){
+        this.gotoState('dockedInspector');
+      }
+    }),
+    dockedInspector: SC.State.design({
+      parallelStatechart: 'inspector',
+      enterState: function(){
+        var iDock = Greenhouse.appPage.get('inspectorDockView');
+        iDock.setIfChanged('nowShowing', 'Greenhouse.appPage.inspectorContentView');
+      },
+      exitState: function(){
+        var iDock = Greenhouse.appPage.get('inspectorDockView');
+        iDock.setIfChanged('nowShowing', null);
+      },
+      // ..........................................................
+      // Events
+      //
+      toggleDockedInspector: function(){
+        var states = Greenhouse.get('currentStates') || [];
+        if (states.indexOf(Greenhouse.getState('dockedLibrary'))) Greenhouse.sendEvent('undock');
+        this.gotoState('inspectorClosed');
+      }
+    })
   })
 });