sproutcore 1.5.0.rc.2 → 1.5.0

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js

@@ -437,7 +437,7 @@ SC.DateTime.mixin(SC.Comparable,
     @property
     @type {Array}
   */
-  _englishDayNames: 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday'.w(),
+  _englishDayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
   
   /**
     @property

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js

@@ -68,19 +68,19 @@ SC.DateTime.mixin(
   */
   _setup: function() {
     if (!SC.DateTime.dayNames) {
-      SC.DateTime.dayNames = '_SC.DateTime.dayNames'.loc().w();
+      SC.DateTime.dayNames = SC.String.w(SC.String.loc('_SC.DateTime.dayNames'));
     }
 
     if (!SC.DateTime.abbreviatedDayNames) {
-      SC.DateTime.abbreviatedDayNames = '_SC.DateTime.abbreviatedDayNames'.loc().w();
+      SC.DateTime.abbreviatedDayNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedDayNames'));
     }
 
     if (!SC.DateTime.monthNames) {
-      SC.DateTime.monthNames = '_SC.DateTime.monthNames'.loc().w();
+      SC.DateTime.monthNames = SC.String.w(SC.String.loc('_SC.DateTime.monthNames'));
     }
 
     if (!SC.DateTime.abbreviatedMonthNames) {
-      SC.DateTime.abbreviatedMonthNames = '_SC.DateTime.abbreviatedMonthNames'.loc().w();
+      SC.DateTime.abbreviatedMonthNames = SC.String.w(SC.String.loc('_SC.DateTime.abbreviatedMonthNames'));
     }
   }
 

data/lib/frameworks/sproutcore/frameworks/desktop/debug/drag.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require('system/drag') ;
+sc_require('system/drag') ;
 
 SC.Drag.mixin(
 /** @scope SC.Drag */ {
@@ -39,4 +39,4 @@ SC.Drag.mixin(
     return ret.join('|') ;
   }
 
-});
+});

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -5,8 +5,8 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require('panes/picker');
-require('views/menu_item');
+sc_require('panes/picker');
+sc_require('views/menu_item');
 
 /**
   @class
@@ -468,7 +468,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @isReadOnly
     @property Array
   */
-  menuItemKeys: 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemSeparatorKey itemActionKey itemCheckboxKey itemShortCutKey itemHeightKey itemSubMenuKey itemKeyEquivalentKey itemTargetKey'.w(),
+  menuItemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemSeparatorKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey', 'itemHeightKey', 'itemSubMenuKey', 'itemKeyEquivalentKey', 'itemTargetKey'],
 
   // ..........................................................
   // INTERNAL PROPERTIES

data/lib/frameworks/sproutcore/frameworks/desktop/panes/select_button.js

@@ -373,7 +373,7 @@ SC.SelectButtonView = 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 ?

data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_data_source.js

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

data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_source.js

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

data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drop_target.js

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

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/image_button.js

@@ -8,27 +8,42 @@
 
 SC.BaseTheme.imageButtonRenderDelegate = SC.RenderDelegate.create({
   name: 'image-button',
+
   render: function(dataSource, context) {
+    var image = dataSource.get('image'),
+        toolTip = dataSource.get('toolTip');
+
     // render controlSize
     this.addSizeClassName(dataSource, context);
 
-    var image = dataSource.get('image');
-
     context.addClass('no-min-width');
-    if (image) {
-      context.push("<div class='img "+image+"'></div>");
+
+    if (toolTip) {
+      context.attr('title', toolTip);
+      context.attr('alt', toolTip);
     }
 
-    else {
+    if (image) {
+      context.push("<div class='img "+image+"'></div>");
+    } else {
       context.push("<div class='img'></div>");
     }
   },
 
   update: function(dataSource, $) {
+    var image, toolTip;
+
     this.updateSizeClassName(dataSource, $);
 
+    if (dataSource.didChangeFor('imageButtonRenderDelegate', 'toolTip')) {
+      toolTip = dataSource.get('toolTip');
+
+      $.attr('title', toolTip);
+      $.attr('alt', toolTip);
+    }
+
     if (dataSource.didChangeFor('imageButtonRenderDelegate', 'image')) {
-      var image = dataSource.get('image');
+      image = dataSource.get('image');
 
       $.children()[0].className = 'img '+image;
     }

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-var view, content, contentController, pane ;
+var view, content, contentController, pane, actionCalled = 0;
 
 module("SC.CollectionView Mouse Events", {
   setup: function() {
@@ -31,7 +31,10 @@ module("SC.CollectionView Mouse Events", {
       },
       
       isVisibleInWindow: YES,
-      acceptsFirstResponder: YES
+      acceptsFirstResponder: YES,
+      action: function() {
+        actionCalled++;
+      }
     });
     
     pane = SC.MainPane.create();
@@ -44,6 +47,7 @@ module("SC.CollectionView Mouse Events", {
   teardown: function() {
     SC.RunLoop.begin();
     pane.remove();
+    actionCalled = 0;
     SC.RunLoop.end();
   }
 });
@@ -84,7 +88,7 @@ function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
       if (ctrlKey) modifiers.push('ctrl');
       modifiers = modifiers.length > 0 ? modifiers.join('+') : 'no modifiers';
       
-      ok(expected.isEqual(sel), 'should have selection: %@ after click with %@ on item[%@], actual: %@'.fmt(expected, modifiers, index, sel));
+      ok(expected ? expected.isEqual(sel) : expected === sel, 'should have selection: %@ after click with %@ on item[%@], actual: %@'.fmt(expected, modifiers, index, sel));
       SC.RunLoop.end();
       if (delay) window.start() ; // starts the test runner
     };
@@ -231,10 +235,28 @@ test("clicking on a selected item should remove it from the selection when useTo
   clickOn(view, 5, NO, NO, selectionFromIndexSet(SC.IndexSet.create(1,4)));
 });
 
-
 test("clicking on an unselected item should select it and clear the previous selection when useToggleSelection is true and allowsMultipleSelection is not", function() {
   view.set('useToggleSelection', YES);
   contentController.set('allowsMultipleSelection', NO);
   clickOn(view, 1, NO, NO, selectionFromIndex(1));
   clickOn(view, 3, NO, NO, selectionFromIndex(3));
 });
+
+test("clicking on an unselected item should fire action when useToggleSelection is true and actOnSelect is true", function() {
+  view.set('useToggleSelection', YES);
+  view.set('actOnSelect', YES);
+
+  equals(actionCalled, 0, "precond - action hasn't been called");
+  clickOn(view, 1, NO, NO);
+  equals(actionCalled, 1, "Action called when item is selected");
+});
+
+test("click on an item when isSelectable is false doesn't do anything", function() {
+  view.set('isSelectable', NO);
+  clickOn(view, 1, NO, NO, null);
+});
+
+test("click on an item when isEnabled is false doesn't do anything", function() {
+  view.set('isEnabled', NO);
+  clickOn(view, 1, NO, NO, null);
+});

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

@@ -70,7 +70,7 @@ pane.verifyEmpty = function verifyEmpty(view, expectedHint) {
   var layer = view.$();
   
   ok(!layer.hasClass('not-empty'), 'layer should not have not-empty class');
-  if(SC.browser.webkit) equals(input.val(), '', 'input should have empty value');
+  if(SC.browser.webkit || parseInt(SC.browser.mozilla) >= 2.0) equals(input.val(), '', 'input should have empty value');
   else equals(input.val(), expectedHint, 'input should have empty value');
   
   if (expectedHint) {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/image_button/ui.js

@@ -1,5 +1,11 @@
 
 var pane = SC.ControlTestPane.design({height:24})
+  .add('default', SC.ImageButtonView, {
+    layout: { left: 0, top: 2, right: 0, bottom: 2 },
+    image: 'start',
+    toolTip: 'OMGHI'
+  })
+
   .add("iconchange", SC.ImageButtonView, {
     layout: { left: 0, top: 2, right: 0, bottom: 2 },
     image: 'start'
@@ -9,12 +15,34 @@ pane.show();
 
 module('SC.ImageButtonView ui');
 
-test("Check if icon class is set properly on ImageButton",function(){
-  var viewElem=pane.view('iconchange').$('div');
+test("Check if image class is set properly on ImageButton", function() {
+  var viewElem = pane.view('default').$('div');
   ok(viewElem.hasClass('start'), 'Icon class set initially to "start"');
 });
 
-test("Check if icon class is set properly on ImageButton if changed", function(){
+test("toolTip support", function() {
+  var view = pane.view('default'),
+      viewElem = view.$();
+
+  equals(viewElem.attr('title'), 'OMGHI', 'title attribute is set correctly');
+  equals(viewElem.attr('alt'), 'OMGHI', 'alt attribute is set correctly');
+
+  SC.run(function() {
+    view.set('toolTip', 'ZOMG');
+  });
+
+  equals(viewElem.attr('title'), 'ZOMG', 'title attribute is updated correctly');
+  equals(viewElem.attr('alt'), 'ZOMG', 'alt attribute is updated correctly');
+
+  SC.run(function() {
+    view.set('toolTip', null);
+  });
+
+  equals(viewElem.attr('title'), "", 'title attribute is removed correctly');
+  equals(viewElem.attr('alt'), "", 'alt attribute is removed correctly');
+});
+
+test("Check if image class is set properly on ImageButton if changed", function() {
   SC.RunLoop.begin();
   var viewElem = pane.view('iconchange');
   viewElem.set('image','stop');

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

@@ -356,7 +356,7 @@ test("basic", function() {
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   ok(view.$('.sc-handle'), 'should have sc-handle class');
-  equals(view.$('.sc-handle').css('left'), '50%', 'left of sc-handle should be 50%');
+  equals(view.$('.sc-handle')[0].style.left, '50%', 'left of sc-handle should be 50%');
 });
 
 test("disabled", function() {
@@ -365,7 +365,7 @@ test("disabled", function() {
   ok(view.$().hasClass('disabled'), 'should have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   ok(view.$('.sc-handle'), 'should have sc-handle class');
-  equals(view.$('.sc-handle').css('left'), '50%', 'left of sc-handle should be 50%');
+  equals(view.$('.sc-handle')[0].style.left, '50%', 'left of sc-handle should be 50%');
 });
 
 test("basic value 100", function() {
@@ -374,7 +374,7 @@ test("basic value 100", function() {
   ok(!view.$().hasClass('disabled'), 'should have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   ok(view.$('.sc-handle'), 'should have sc-handle class');
-  equals(view.$('.sc-handle').css('left'), '100%', 'left of sc-handle should be 100%');
+  equals(view.$('.sc-handle')[0].style.left, '100%', 'left of sc-handle should be 100%');
 });
 
 test("basic step 20", function() {
@@ -383,7 +383,7 @@ test("basic step 20", function() {
   ok(!view.$().hasClass('disabled'), 'should have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   ok(view.$('.sc-handle'), 'should have sc-handle class');
-  equals(view.$('.sc-handle').css('left'), '60%', 'left of sc-handle should be 60%');
+  equals(view.$('.sc-handle')[0].style.left, '60%', 'left of sc-handle should be 60%');
 });
 
 test("Check if aria role is set to slider view", function() {

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

@@ -66,8 +66,8 @@ SC.ButtonView = 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'),
 
   /**
@@ -210,7 +210,7 @@ SC.ButtonView = SC.View.extend(SC.Control,
   */
   displayTitle: function() {
     var ret = this.get('title');
-    return (ret && this.get('localize')) ? ret.loc() : (ret || '');
+    return (ret && this.get('localize')) ? SC.String.loc(ret) : (ret || '');
   }.property('title','localize').cacheable(),
   
   /**

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

@@ -71,8 +71,8 @@ SC.CheckboxView = SC.ButtonView.extend(SC.StaticLayout,
     @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'),
   
   

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

@@ -1056,10 +1056,10 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
   _TMP_ATTRS: {},
 
   /** @private */
-  _COLLECTION_CLASS_NAMES: 'sc-collection-item'.w(),
+  _COLLECTION_CLASS_NAMES: ['sc-collection-item'],
 
   /** @private */
-  _GROUP_COLLECTION_CLASS_NAMES: 'sc-collection-item sc-group-item'.w(),
+  _GROUP_COLLECTION_CLASS_NAMES: ['sc-collection-item', 'sc-group-item'],
 
   /** @private */
   _VIEW_POOL: null,
@@ -1513,7 +1513,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
         groupIndexes = this.get('_contentGroupIndexes'),
         sel;
         
-    if(!this.get('isSelectable')) return this;
+    if(!this.get('isSelectable') || !this.get('isEnabled')) return this;
 
     // normalize
     if (SC.typeOf(indexes) === SC.T_NUMBER) {
@@ -1566,12 +1566,11 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     @returns {SC.CollectionView} receiver
   */
   deselect: function(indexes) {
-
     var sel     = this.get('selection'),
         content = this.get('content'),
         del     = this.get('selectionDelegate');
         
-    if(!this.get('isSelectable')) return this;
+    if(!this.get('isSelectable') || !this.get('isEnabled')) return this;
     if (!sel || sel.get('length')===0) return this; // nothing to do
         
     // normalize
@@ -2124,20 +2123,14 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     @returns {Boolean} Usually YES.
   */
   mouseDown: function(ev) {
-    // When the user presses the mouse down, we don't do much just yet.
-    // Instead, we just need to save a bunch of state about the mouse down
-    // so we can choose the right thing to do later.
-    
-    
-    // find the actual view the mouse was pressed down on.  This will call
-    // hitTest() on item views so they can implement non-square detection
-    // modes. -- once we have an item view, get its content object as well.
     var itemView      = this.itemViewForEvent(ev),
         content       = this.get('content'),
         contentIndex  = itemView ? itemView.get('contentIndex') : -1, 
-        info, anchor, sel, isSelected, modifierKeyPressed,
+        info, anchor, sel, isSelected, modifierKeyPressed, didSelect = NO,
         allowsMultipleSel = content.get('allowsMultipleSelection');
-        
+
+    if (!this.get('isEnabled')) return contentIndex > -1;
+
     info = this.mouseDownInfo = {
       event:        ev,  
       itemView:     itemView,
@@ -2158,11 +2151,18 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
         isSelected = sel && sel.containsObject(itemView.get('content')) ;
 
         if (isSelected) {
-          this.deselect(contentIndex) ;
+          this.deselect(contentIndex);
         } else if (!allowsMultipleSel) {
-          this.select(contentIndex, NO) ;
+          this.select(contentIndex, NO);
+          didSelect = YES;
         } else {
-          this.select(contentIndex, YES) ;
+          this.select(contentIndex, YES);
+          didSelect = YES;
+        }
+        
+        if (didSelect && this.get('actOnSelect')) {
+          // handle actions on editing
+          this._cv_performSelectAction(itemView, ev);
         }
       }
       
@@ -2225,20 +2225,21 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
   
   /** @private */
   mouseUp: function(ev) {
-    
-    var view   = this.itemViewForEvent(ev),
-        info   = this.mouseDownInfo,
-        content       = this.get('content'),
-        contentIndex, sel, isSelected, canEdit, itemView, idx,
+    var view = this.itemViewForEvent(ev),
+        info = this.mouseDownInfo,
+        content = this.get('content'),
+        contentIndex = view ? view.get('contentIndex') : -1,
+        sel, isSelected, canEdit, itemView, idx,
         allowsMultipleSel = content.get('allowsMultipleSelection');
-        
+
+    if (!this.get('isEnabled')) return contentIndex > -1;
+
     if (this.get('useToggleSelection')) {
       // Return if clicked outside of elements or if toggle was handled by mouseDown
       if (!view || this.get('selectOnMouseDown')) return NO;
       
       // determine if item is selected. If so, then go on.
       sel = this.get('selection') ;
-      contentIndex = (view) ? view.get('contentIndex') : -1 ;
       isSelected = sel && sel.containsObject(view.get('content')) ;
       
       if (isSelected) {
@@ -2347,12 +2348,15 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
   
   /** @private */
   touchStart: function(touch, evt) {
+    var itemView = this.itemViewForEvent(touch),
+        contentIndex = itemView ? itemView.get('contentIndex') : -1;
+
+    if (!this.get('isEnabled')) return contentIndex > -1;
+
     // become first responder if possible.
     this.becomeFirstResponder() ;
 
     if (!this.get('useToggleSelection')) {
-      var itemView = this.itemViewForEvent(touch);
-
       // We're faking the selection visually here
       // Only track this if we added a selection so we can remove it later
       if (itemView && !itemView.get('isSelected')) {
@@ -2382,32 +2386,49 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
 
   /** @private */
   touchEnd: function(touch) {
-    var itemView = this.itemViewForEvent(touch),
+    /*
+      TODO [CC] We should be using itemViewForEvent here, but because
+            ListItemView re-renders itself once isSelected is called
+            in touchStart, the elements attached to this event are
+            getting orphaned and this event is basically a complete
+            fail when using touch events.
+    */
+    // var itemView = this.itemViewForEvent(touch),
+    var itemView = this._touchSelectedView,
         contentIndex = itemView ? itemView.get('contentIndex') : -1,
-        isSelected = NO;
+        isSelected = NO, sel;
+
+    if (!this.get('isEnabled')) return contentIndex > -1;
 
     // Remove fake selection in case our contentIndex is -1, a select event will add it back
-    if (this._touchSelectedView) { this._touchSelectedView.set('isSelected', NO); }
+    if (itemView) { itemView.set('isSelected', NO); }
 
-    if (this.get('useToggleSelection')) {
-      var sel = this.get('selection');
-      isSelected = sel && sel.containsObject(itemView.get('content'));
-    }
+    if (contentIndex > -1) {
+      if (this.get('useToggleSelection')) {
+        sel = this.get('selection');
+        isSelected = sel && sel.containsObject(itemView.get('content'));
+      }
 
-    if (isSelected) {
-      this.deselect(contentIndex);
-    } else {
-      this.select(contentIndex, NO);
+      if (isSelected) {
+        this.deselect(contentIndex);
+      } else {
+        this.select(contentIndex, NO);
 
-      // If actOnSelect is implemented, the action will be fired.
-      this._cv_performSelectAction(itemView, touch, 0);
+        // If actOnSelect is implemented, the action will be fired.
+        this._cv_performSelectAction(itemView, touch, 0);
+      }
     }
+
+    this._touchSelectedView = null;
   },
 
   /** @private */
   touchCancelled: function(evt) {
     // Remove fake selection
-    if (this._touchSelectedView) { this._touchSelectedView.set('isSelected', NO); }
+    if (this._touchSelectedView) {
+      this._touchSelectedView.set('isSelected', NO);
+      this._touchSelectedView = null;
+    }
   },
 
   /** @private */