sproutcore 1.5.0.rc.2 → 1.5.0

data/lib/frameworks/sproutcore/frameworks/desktop/views/date_field.js

@@ -91,7 +91,7 @@ SC.DateFieldView = SC.TextFieldView.extend(
   // with 1..31 without zeros at start, but causes the lenght not to be fixed)
 
   /** @private*/
-  _dtConstants: '%a %b %d %H %I %j %m %M %p %S %U %W %y %Y'.w(),
+  _dtConstants: ['%a', '%b', '%d', '%H', '%I', '%j', '%m', '%M', '%p', '%S', '%U', '%W', '%y', '%Y'],
   // Width constants for each representation %@.
   
   /** @private */
@@ -187,7 +187,7 @@ SC.DateFieldView = SC.TextFieldView.extend(
   /** @private
     If the activeSelection changes or the value changes, update the "TextSelection" to show accordingly.
   */
-  updateTextSelecitonObserver: function() {
+  updateTextSelectionObserver: function() {
     var as = this.get('activeSelection');
     var ts = this.get('tabsSelections');
     if (this.get('isEditing')) {

data/lib/frameworks/sproutcore/frameworks/desktop/views/file.js

@@ -110,7 +110,7 @@ SC.FileView = SC.FieldView.extend(
       sc_super();
     },
     
-    childViews: 'input'.w(),
+    childViews: ['input'],
     
     input: SC.View.design({
       tagName: 'input',

data/lib/frameworks/sproutcore/frameworks/desktop/views/grid.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require('views/list') ;
+sc_require('views/list') ;
 
 /** @class
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/master_detail.js

@@ -5,8 +5,8 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require("views/workspace");
-require("views/toolbar");
+sc_require("views/workspace");
+sc_require("views/toolbar");
 
 
 /** @class
@@ -73,7 +73,7 @@ SC.MasterDetailView = SC.View.extend(
   */
   detailView: SC.WorkspaceView.extend({
     topToolbar: SC.ToolbarView.extend({
-      childViews: "showHidePicker".w(),
+      childViews: ["showHidePicker"],
       showHidePicker: SC.ButtonView.extend({
         layout: { left: 7, centerY: 0, height: 30, width: 100 },
         controlSize: SC.AUTO_CONTROL_SIZE,

data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js

@@ -301,7 +301,7 @@ SC.MenuItemView = SC.View.extend(SC.ContentDisplay,
     var ret = this.getContentProperty('itemTitleKey'),
         localize = this.getPath('parentMenu.localize');
 
-    if (localize && ret) ret = ret.loc();
+    if (localize && ret) ret = SC.String.loc(ret);
 
     return ret||'';
   }.property('content.title').cacheable(),

data/lib/frameworks/sproutcore/frameworks/desktop/views/progress.js

@@ -46,7 +46,7 @@ SC.ProgressView = SC.View.extend(SC.Control,
     @default 'displayValue ariaValue minimum maximum isRunning isEnabled isIndeterminate animatedBackgroundMatrix offsetRange'.w()
     @see SC.View#displayProperties
   */
-  displayProperties: 'displayValue ariaValue minimum maximum isRunning isEnabled isIndeterminate animatedBackgroundMatrix offsetRange'.w(),
+  displayProperties: ['displayValue', 'ariaValue', 'minimum', 'maximum', 'isRunning', 'isEnabled', 'isIndeterminate', 'animatedBackgroundMatrix', 'offsetRange'],
 
   /**
     @type String

data/lib/frameworks/sproutcore/frameworks/desktop/views/radio.js

@@ -68,8 +68,8 @@ SC.RadioView = SC.View.extend(SC.Control,
     @observes isEnabled
   */
   acceptsFirstResponder: function() {
-    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
-    else return NO;
+    if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
+    return NO;
   }.property('isEnabled'),
 
   /**
@@ -320,7 +320,7 @@ SC.RadioView = SC.View.extend(SC.Control,
       }
 
       // localize title if needed
-      if (loc) title = title.loc();
+      if (loc) title = SC.String.loc(title);
       ret.push(SC.Object.create({
         title: title,
         icon: icon,

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js

@@ -1936,13 +1936,13 @@ SC.ScrollView = SC.View.extend({
     // before we actually update the scrollTop/scrollLeft properties.
     // This gives views that use incremental rendering a chance to render
     // newly-appearing elements before they come into view.
-    if (content && content._viewFrameDidChange) {
-      content._viewFrameDidChange();
-
+    if (content) {
       // Use accelerated drawing if the browser supports it
       if (SC.platform.touch) {
         this._applyCSSTransforms(content.get('layer'));
       }
+
+      if (content._viewFrameDidChange) { content._viewFrameDidChange(); }
     }
 
     if (container && !SC.platform.touch) {

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js

@@ -46,7 +46,7 @@ SC.ScrollerView = SC.View.extend(
     @default 'thumbPosition thumbLength isEnabled controlsHidden'.w()
     @see SC.View#displayProperties
   */
-  displayProperties: 'thumbPosition thumbLength isEnabled controlsHidden'.w(),
+  displayProperties: ['thumbPosition', 'thumbLength', 'isEnabled', 'controlsHidden'],
 
   /**
     The WAI-ARIA role for scroller view.

data/lib/frameworks/sproutcore/frameworks/desktop/views/segment.js

@@ -145,7 +145,7 @@ SC.SegmentView = SC.View.extend(SC.Control,
   */
   displayTitle: function() {
     var ret = this.get('title');
-    if (this.get('localize')) ret = ret.loc();
+    if (this.get('localize')) ret = SC.String.loc(ret);
     return ret;
   }.property('title', 'localize').cacheable(),
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js

@@ -51,8 +51,8 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     @default YES
   */
   acceptsFirstResponder: function() {
-    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
-    else return NO;
+    if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
+    return NO;
   }.property('isEnabled').cacheable(),
 
   /**
@@ -282,7 +282,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   itemKeys: 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey itemToolTipKey itemKeyEquivalentKey'.w(),
   
   /** @private */
-  viewKeys: 'title value isEnabled icon width toolTip keyEquivalent'.w(),
+  viewKeys: ['title', 'value', 'isEnabled', 'icon', 'width', 'toolTip', 'keyEquivalent'],
 
   /** @private
     Call itemsDidChange once to initialize segment child views for the items that exist at

data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js

@@ -404,7 +404,7 @@ SC.SelectView = SC.ButtonView.extend(
         object.get(nameKey) : object[nameKey]) : object.toString() ;
 
       // localize name if specified.
-      name = shouldLocalize? name.loc() : name ;
+      name = shouldLocalize? SC.String.loc(name) : name ;
 
       //Get the icon value
       icon = iconKey ? (object.get ?
@@ -493,7 +493,7 @@ SC.SelectView = SC.ButtonView.extend(
     var buttonLabel, menuWidth, scrollWidth, lastMenuWidth, offsetWidth,
       items, elementOffsetWidth, largestMenuWidth, item, element, idx,
       value, itemList, menuControlSize, menuHeightPadding, customView,
-      customMenuView, menu, itemsLength;
+      menu, itemsLength, itemIdx;
     
     buttonLabel = this.$('.sc-button-label')[0] ;
     
@@ -572,8 +572,7 @@ SC.SelectView = SC.ButtonView.extend(
     menuHeightPadding = this.get('menuPaneHeightPadding') ;
 
     // get the user defined custom view
-    customView = this.get('exampleView') ;
-    customMenuView = customView ? customView : SC.MenuItemView ;
+    customView = this.get('exampleView') || SC.MenuItemView;
 
     menu  = SC.MenuPane.create({
 
@@ -595,7 +594,7 @@ SC.SelectView = SC.ButtonView.extend(
         @default SC.MenuItemView
         @type SC.View
       */
-      exampleView: customMenuView,
+      exampleView: customView,
 
       /**
         This property enables all the items and makes them selectable.
@@ -618,8 +617,11 @@ SC.SelectView = SC.ButtonView.extend(
     menu.popup(this, this.preferMatrix) ;
     this.set('menu', menu);
 
-    customView = menu.menuItemViewForContentIndex(this.get('_itemIdx'));
-    customView.becomeFirstResponder();
+    itemIdx = this._itemIdx;
+    if (itemIdx && itemIdx > -1) {
+      customView = menu.menuItemViewForContentIndex(itemIdx);
+      if (customView) { customView.becomeFirstResponder(); }
+    }
 
     this.set('isActive', YES);
     return YES ;

data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js

@@ -194,7 +194,7 @@ SC.SelectFieldView = SC.FieldView.extend(
       
         var emptyName = this.get('emptyName') ;
         if (emptyName) {
-          if (shouldLocalize) emptyName = emptyName.loc() ;
+          if (shouldLocalize) emptyName = SC.String.loc(emptyName);
           if(firstTime){
             context.push('<option value="***">'+emptyName+'</option>',
                           '<option disabled="disabled"></option>') ;
@@ -218,7 +218,7 @@ SC.SelectFieldView = SC.FieldView.extend(
           // localize name if specified.
           if(shouldLocalize)
           {
-            name = name.loc();
+            name = SC.String.loc(name);
           }
    
           // get the value using the valueKey or the object if no valueKey.

data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js

@@ -82,7 +82,7 @@ SC.SliderView = SC.View.extend(SC.Control,
   // INTERNAL PROPERTIES
   // 
   
-  displayProperties: 'displayValue ariaValue minimum maximum step frame'.w(),
+  displayProperties: ['displayValue', 'ariaValue', 'minimum', 'maximum', 'step', 'frame'],
 
   /**
    @property
@@ -211,8 +211,8 @@ SC.SliderView = SC.View.extend(SC.Control,
   
   /** tied to the isEnabled state */
   acceptsFirstResponder: function() {
-    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
-    else return NO;
+    if (SC.FOCUS_ALL_CONTROLS) { return this.get('isEnabled'); }
+    return NO;
   }.property('isEnabled'),
   
   willBecomeKeyResponderFrom: function(keyView) {

data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js

@@ -204,7 +204,7 @@ SC.TabView = SC.View.extend(
     } else if (tabLocation === SC.TOP_TOOLBAR_LOCATION) {
       layout = { top: tabHeight+1, left: 0, right: 0, bottom: 0, border: 1 };
     } else {
-      layout = { top: 0, left: 0, right: 0, bottom: tabHeight-1, border: 1 };
+      layout = { top: 0, left: 0, right: 0, bottom: (tabHeight/2) - 1, border: 1 };
     }
 
     containerView = this.containerView.extend({
@@ -283,4 +283,4 @@ SC.TabView = SC.View.extend(
   
 }) ;
 
-SC._TAB_ITEM_KEYS = 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey itemToolTipKey itemActionKey itemTargetKey'.w();
+SC._TAB_ITEM_KEYS = ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey', 'itemActionKey', 'itemTargetKey'];

data/lib/frameworks/sproutcore/frameworks/desktop/views/workspace.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require("views/toolbar");
+sc_require("views/toolbar");
 
 /** @class
   WorkspaceView manages a content view and two optional toolbars (top and bottom).
@@ -32,7 +32,7 @@ SC.WorkspaceView = SC.View.extend(
     @default "hasTopToolbar hasBottomToolbar".w()
     @see SC.View#displayProperties
   */
-  displayProperties: "hasTopToolbar hasBottomToolbar".w(),
+  displayProperties: ["hasTopToolbar", "hasBottomToolbar"],
   
   /**
     @type String

data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile

@@ -0,0 +1,6 @@
+config :designer, :required => [:runtime, :foundation, :desktop]
+
+config :greenhouse,
+  :required => [:sproutcore, :designer, :statechart],
+  :theme => :ace,
+  :css_theme => 'ace.greenhouse'

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

@@ -1,5 +1,5 @@
-require('core');
-require('models/file');
+sc_require('core');
+sc_require('models/file');
 /*
   
 THIS IS DEPRECATED...
@@ -121,4 +121,4 @@ Greenhouse.mixin({
     file.requestComplete();
     file.destroy();
   }
-});
+});

data/lib/frameworks/sproutcore/{apps → frameworks/experimental/apps}/greenhouse/english.lproj/app_page.js

@@ -3,11 +3,11 @@
 // Copyright: ©2010 Mike Ball
 // ==========================================================================
 /*globals Greenhouse */
-require('views/list_item');
-require('views/web');
-require('views/tear_off_picker');
-require('mixins/drop_down');
-require('views/simple_button');
+sc_require('views/list_item');
+sc_require('views/web');
+sc_require('views/tear_off_picker');
+sc_require('mixins/drop_down');
+sc_require('views/simple_button');
 // This page has the main UI layout
 Greenhouse.appPage = SC.Page.design({