sproutcore 1.8.1 → 1.8.2.1

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

@@ -390,7 +390,7 @@ SC.AlertPane = SC.PanelPane.extend(
       } else {
         rootResponder = this.getPath('pane.rootResponder');
         if(rootResponder) {
-          target = sender.get('target');
+          target = sender.get('customTarget');
           rootResponder.sendAction(action, target || del, this, this, null, this);
         }
       }
@@ -451,7 +451,7 @@ SC.AlertPane.mixin(
         
         buttonView.set('title'.fmt(idx), title);
         if(action) buttonView.set('customAction'.fmt(idx), action);
-        if(target) buttonView.set('target'.fmt(idx), target);
+        if(target) buttonView.set('customTarget'.fmt(idx), target);
         buttonView.set('isVisible', !!title);
         buttonView.set('themeName', themeName);
       });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js

@@ -212,16 +212,22 @@ test("AlertPane.info with individual actions and targets for three buttons", fun
     clickValue = null;
   }
   
+  function clickButton(button) {
+    var elem = button.$();
+    SC.Event.trigger(elem, 'mousedown');
+    SC.Event.trigger(elem, 'mouseup');
+  }
+  
   showPane();
-  pane.dismiss(pane.get('button1'));
+  clickButton(pane.get('button1'));
   equals(clickValue, 'OK', 'Action for the OK button was clicked');
 
   showPane();
-  pane.dismiss(pane.get('button2'));
+  clickButton(pane.get('button2'));
   equals(clickValue, 'Cancel', 'Action for the Cancel button was clicked');
   
   showPane();
-  pane.dismiss(pane.get('button3'));
+  clickButton(pane.get('button3'));
   equals(clickValue, 'Extra', 'Action for the Extra button was clicked');
   
 });

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

@@ -12,33 +12,33 @@
     var iv=SC.ImageView.design({value: appleURL, layout: {height:400, width:400}});
     var pane = SC.ControlTestPane.design({ height: 100 })
     .add("basic", SC.ScrollView, {
-  
+
     })
 
     .add("basic2", SC.ScrollView, {
         contentView: iv
     })
-    
+
     .add("basic3", SC.ScrollView, {
       contentView: iv,
       isHorizontalScrollerVisible: NO,
       autohidesHorizontalScroller: NO,
       autohidesVerticalScroller: NO
     })
-    
+
     .add("disabled", SC.ScrollView, {
       isEnabled: NO
     })
-    
+
     .add("verticalScrollerBottom",SC.ScrollView, {
       contentView: iv,
       hasHorizontalScroller : NO,
       verticalScrollerBottom: 16,
       isVerticalScrollerVisible: YES,
       autohidesVerticalScroller: NO
-      
+
     })
-    .add("aria-controls_attribute", SC.ScrollView, {
+    .add("aria-attributes", SC.ScrollView, {
       contentView: iv
     });
 
@@ -46,14 +46,14 @@
 
   // ..........................................................
   // TEST VIEWS
-  // 
+  //
   module('SC.ScrollView UI', pane.standardSetup());
-  
+
   test("basic", function() {
     var view = pane.view('basic');
     ok(!view.$().hasClass('disabled'), 'should not have disabled class');
     ok(!view.$().hasClass('sel'), 'should not have sel class');
-    
+
     equals(view.getPath('childViews.length'), 3, 'scroll view should have only three child views');
 
     var containerView = view.get('containerView') ;
@@ -62,11 +62,11 @@
     ok(containerView.get('contentView') === null, 'default containerView should have a null contentView itself');
     ok(view.get('contentView') === null, 'scroll view should have no contentView by default');
     equals(containerView.getPath('childViews.length'), 0, 'containerView should have no child views');
-    
+
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    
+
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
@@ -74,43 +74,43 @@
 
   test("basic2", function() {
     var view = pane.view('basic2');
-    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');    
-        
+    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');
+
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');        
-	  var maxHScroll = view.maximumHorizontalScrollOffset();    
-	  ok((maxHScroll > 0), 'Max horizontal scroll should be greater than zero');
-    
+    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');
+    var maxHScroll = view.maximumHorizontalScrollOffset();
+    ok((maxHScroll > 0), 'Max horizontal scroll should be greater than zero');
+
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
-    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');    
-	  var maxVScroll = view.maximumVerticalScrollOffset();    
-	  ok((maxVScroll > 0), 'Max vertical scroll should be greater than zero');
+    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');
+    var maxVScroll = view.maximumVerticalScrollOffset();
+    ok((maxVScroll > 0), 'Max vertical scroll should be greater than zero');
 
     view.scrollTo(0,100);
     SC.RunLoop.begin().end();
     var elem = view.get('containerView').$()[0];
     equals(elem.scrollTop, 100, 'vertical scrolling should adjust scrollTop of container view');
-    
+
     view.scrollTo(50,0);
     SC.RunLoop.begin().end();
     elem = view.get('containerView').$()[0];
     equals(elem.scrollLeft, 50, 'horizontal scrolling should adjust scrollLeft of container view');
   });
-   
+
   test("basic3", function() {
     var view = pane.view('basic3');
     view.set('isHorizontalScrollerVisible',NO);
     ok(!view.get('canScrollHorizontal'),'cannot scroll in horizontal direction');
-    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');    
+    ok(view.$().hasClass('sc-scroll-view'), 'should have sc-scroll-view class');
     var horizontalScrollerView = view.get('horizontalScrollerView');
     ok(view.get('hasHorizontalScroller'), 'default scroll view wants a horizontal scroller');
     ok(horizontalScrollerView, 'default scroll view has a horizontal scroller');
-    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');        
-    var maxHScroll = view.maximumHorizontalScrollOffset();    
+    ok(horizontalScrollerView.$().hasClass('sc-horizontal'), 'should have sc-horizontal class');
+    var maxHScroll = view.maximumHorizontalScrollOffset();
     equals(maxHScroll , 0, 'Max horizontal scroll should be equal to zero');
 
     view.set('isVerticalScrollerVisible',NO);
@@ -118,26 +118,26 @@
     var verticalScrollerView = view.get('verticalScrollerView');
     ok(view.get('hasVerticalScroller'), 'default scroll view wants a vertical scroller');
     ok(verticalScrollerView, 'default scroll view has a vertical scroller');
-    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');    
-    var maxVScroll = view.maximumVerticalScrollOffset();    
+    ok(verticalScrollerView.$().hasClass('sc-vertical'), 'should have sc-vertical class');
+    var maxVScroll = view.maximumVerticalScrollOffset();
     equals(maxVScroll ,0, 'Max vertical scroll should be equal to zero');
   });
 
   test("disabled", function() {
-     var view = pane.view('disabled'); 
+     var view = pane.view('disabled');
      ok(view.$().hasClass('disabled'), 'should have disabled class');
      ok(!view.$().hasClass('sel'), 'should not have sel class');
    });
 
    test("non-zero bottom in vertical scrollbar", function() {
-      var view = pane.view('verticalScrollerBottom'); 
+      var view = pane.view('verticalScrollerBottom');
       equals(view.get('verticalScrollerBottom'),16, "should have verticalScrollerBottom as ");
       var scroller = view.get('verticalScrollerView') ;
       ok(scroller, 'should have vertical scroller view ');
       equals(scroller.get('layout').bottom,16, 'should have layout.bottom of scroller as ');
       equals(scroller.$()[0].style.bottom,'16px', 'should have style.bottom of scroller as ');
     });
-   
+
    test('ScrollView should readjust scrollTop/scrollLeft if layer changes', function() {
      var view = pane.view('basic2'), cv = view.get('contentView'), container = view.get('containerView') ;
      view.scrollTo(10, 10);
@@ -150,13 +150,23 @@
      equals(container.get('layer').scrollTop, 10, 'scrollTop should be readjust to 10');
    });
 
-   test('Scroller views of scroll view should have aria-controls set to its content', function() {
-     var view = pane.view("aria-controls_attribute"),
-         horizontalScrollerView = view.get('horizontalScrollerView'),
-         verticalScrollerView   = view.get('verticalScrollerView'),
-         contentView            = view.get('contentView').get('layerId');
+  test('Scroller views of scroll view should have aria attributes set', function() {
+    var view = pane.view("aria-attributes"),
+        horizontalScrollerView = view.get('horizontalScrollerView'),
+        verticalScrollerView   = view.get('verticalScrollerView'),
+        contentView            = view.get('contentView');
+
+    equals(horizontalScrollerView.$().attr('aria-controls'), contentView.get('layerId'), "horizontalScroller has aria-controls set");
+    equals(verticalScrollerView.$().attr('aria-controls'), contentView.get('layerId'), "verticalScroller has aria-controls set");
+    equals(horizontalScrollerView.$().attr('aria-orientation'), 'horizontal', "horizontalScroller has aria-orientation set");
+    equals(verticalScrollerView.$().attr('aria-orientation'), 'vertical', "verticalScroller has aria-orientation set");
+    equals(horizontalScrollerView.$().attr('aria-valuemin'), 0, "horizontalScroller has aria-valuemin set");
+    equals(verticalScrollerView.$().attr('aria-valuemin'), 0, "verticalScroller has aria-valuemin set");
+    equals(horizontalScrollerView.$().attr('aria-valuemax'), view.get('maximumHorizontalScrollOffset') - horizontalScrollerView.get('scrollbarThickness'), "horizontalScroller has aria-valuemax set");
+    equals(verticalScrollerView.$().attr('aria-valuemax'), view.get('maximumVerticalScrollOffset') - verticalScrollerView.get('scrollbarThickness'), "verticalScroller has aria-valuemax set");
+    equals(horizontalScrollerView.$().attr('aria-valuenow'), view.get('horizontalScrollOffset'), "horizontalScroller has aria-valuenow set");
+    equals(verticalScrollerView.$().attr('aria-valuenow'), view.get('horizontalScrollOffset'), "verticalScroller has aria-valuenow set");
+
+  });
 
-     equals(horizontalScrollerView.$().attr('aria-controls'), contentView, "horizontalScroller has aria-controls set");
-     equals(verticalScrollerView.$().attr('aria-controls'), contentView, "verticalScroller has aria-controls set");
-   });
 })();

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

@@ -24,7 +24,7 @@ SC.GridView = SC.ListView.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-grid-view'],
-  
+
   /**
     @type Hash
     @default { left:0, right:0, top:0, bottom:0 }
@@ -32,21 +32,21 @@ SC.GridView = SC.ListView.extend(
   */
   layout: { left:0, right:0, top:0, bottom:0 },
 
-  /** 
+  /**
     The common row height for grid items.
-    
+
     The value should be an integer expressed in pixels.
-    
+
     @type Number
     @default 48
   */
   rowHeight: 48,
-  
+
   /**
     The minimum column width for grid items.  Items will actually
     be laid out as needed to completely fill the space, but the minimum
     width of each item will be this value.
-    
+
     @type Number
     @default 64
   */
@@ -54,25 +54,25 @@ SC.GridView = SC.ListView.extend(
 
   /**
     The default example item view will render text-based items.
-    
+
     You can override this as you wish.
-    
+
     @type SC.View
     @default SC.LabelView
   */
   exampleView: SC.LabelView,
-  
+
   /**
     Possible values:
-    
+
       - SC.HORIZONTAL_ORIENTATION
       - SC.VERTICAL_ORIENTATION
-    
+
     @type String
     @default SC.HORIZONTAL_ORIENTATION
   */
   insertionOrientation: SC.HORIZONTAL_ORIENTATION,
-  
+
   /** @private */
   itemsPerRow: function() {
     var f = this.get('frame'),
@@ -80,9 +80,9 @@ SC.GridView = SC.ListView.extend(
 
     return (columnWidth <= 0) ? 1 : Math.floor(f.width / columnWidth) ;
   }.property('clippingFrame', 'columnWidth').cacheable(),
-  
+
   /** @private
-    Find the contentIndexes to display in the passed rect. Note that we 
+    Find the contentIndexes to display in the passed rect. Note that we
     ignore the width of the rect passed since we need to have a single
     contiguous range.
   */
@@ -93,7 +93,7 @@ SC.GridView = SC.ListView.extend(
         max = Math.ceil(SC.maxY(rect) / rowHeight) * itemsPerRow ;
     return SC.IndexSet.create(min, max-min);
   },
-  
+
   /** @private */
   layoutForContentIndex: function(contentIndex) {
     var rowHeight = this.get('rowHeight') || 48,
@@ -102,14 +102,14 @@ SC.GridView = SC.ListView.extend(
         columnWidth = Math.floor(frameWidth/itemsPerRow),
         row = Math.floor(contentIndex / itemsPerRow),
         col = contentIndex - (itemsPerRow*row) ;
-    return { 
+    return {
       left: col * columnWidth,
       top: row * rowHeight,
       height: rowHeight,
       width: columnWidth
     };
   },
-  
+
   /** @private
     Overrides default CollectionView method to compute the minimum height
     of the list view.
@@ -120,32 +120,32 @@ SC.GridView = SC.ListView.extend(
         rowHeight = this.get('rowHeight') || 48,
         itemsPerRow = this.get('itemsPerRow'),
         rows = Math.ceil(count / itemsPerRow) ;
-  
+
     // use this cached layout hash to avoid allocing memory...
     var ret = this._cachedLayoutHash ;
     if (!ret) ret = this._cachedLayoutHash = {};
-    
+
     // set minHeight
     ret.minHeight = rows * rowHeight ;
     this.calculatedHeight = ret.minHeight;
-    return ret; 
+    return ret;
   },
-  
+
   /**
     @type SC.View
   */
   insertionPointClass: SC.View.extend({
     classNames: ['grid-insertion-point'],
-    
+
     render: function(context, firstTime) {
       if (firstTime) context.push('<span class="anchor"></span>') ;
     }
   }),
-  
+
   /** @private */
   showInsertionPoint: function(itemView, dropOperation) {
     if (!itemView) return ;
-    
+
     // if drop on, then just add a class...
     if (dropOperation === SC.DROP_ON) {
       if (itemView !== this._dropOnInsertionPoint) {
@@ -153,24 +153,24 @@ SC.GridView = SC.ListView.extend(
         //itemView.addClassName('drop-target') ;
         this._dropOnInsertionPoint = itemView ;
       }
-      
+
     } else {
-      
+
       if (this._dropOnInsertionPoint) {
         //this._dropOnInsertionPoint.removeClassName('drop-target') ;
         this._dropOnInsertionPoint = null ;
       }
-    
+
       if (!this._insertionPointView) {
         this._insertionPointView = this.insertionPointClass.create() ;
       }
-    
+
       var insertionPoint = this._insertionPointView ;
       var itemViewFrame = itemView.get('frame') ;
-      var f = { height: itemViewFrame.height - 6, 
-            x: itemViewFrame.x, 
-            y: itemViewFrame.y + 6, 
-            width: 0 
+      var f = { height: itemViewFrame.height - 6,
+            x: itemViewFrame.x,
+            y: itemViewFrame.y + 6,
+            width: 0
           };
 
       if (!SC.rectsEqual(insertionPoint.get('frame'), f)) {
@@ -181,9 +181,9 @@ SC.GridView = SC.ListView.extend(
         itemView.parentNode.appendChild(insertionPoint) ;
       }
     }
-    
+
   },
-    
+
   /** @private */
   hideInsertionPoint: function() {
     var insertionPoint = this._insertionPointView ;
@@ -194,9 +194,9 @@ SC.GridView = SC.ListView.extend(
       this._dropOnInsertionPoint = null ;
     }
   },
-  
+
   /** @private */
-  insertionIndexForLocation: function(loc, dropOperation) {  
+  insertionIndexForLocation: function(loc, dropOperation) {
     var f = this.get('frame'),
         sf = this.get('clippingFrame'),
         itemsPerRow = this.get('itemsPerRow'),
@@ -207,7 +207,7 @@ SC.GridView = SC.ListView.extend(
         offset = (loc.x - f.x - sf.x),
         col = Math.floor(offset / columnWidth),
         percentage = (offset / columnWidth) - col ;
-    
+
     // if the dropOperation is SC.DROP_ON and we are in the center 60%
     // then return the current item.
     if (dropOperation === SC.DROP_ON) {
@@ -218,7 +218,7 @@ SC.GridView = SC.ListView.extend(
     } else {
       if (percentage > 0.45) col++ ;
     }
-    
+
     // convert to index
     var ret= (row*itemsPerRow) + col ;
     return [ret, retOp] ;
@@ -235,9 +235,11 @@ SC.GridView = SC.ListView.extend(
 
     len = nowShowing.get('length');
 
-    for (idx=0; idx < len; idx++) {
+    // Only loop through the now showing indexes, if the content is sparsely
+    // loaded we could inadvertently trigger reloading unneeded content.
+    nowShowing.forEach(function(idx) {
       itemView = this.itemViewForContentIndex(idx);
       itemView.adjust(this.layoutForContentIndex(idx));
-    }
+    }, this);
   }.observes('clippingFrame')
 }) ;