sproutcore 1.0.1009 → 1.0.1024

data/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js

@@ -37,7 +37,7 @@ var ContentArray = SC.Object.extend(SC.Array, {
 
 var pane = SC.ControlTestPane.design()
   .add("Custom Row Heights", SC.ScrollView.design({
-    layout: { left: 0, right: 0, top: 0, height: 500 },
+    layout: { left: 0, right: 0, top: 0, height: 200 },
     hasHorizontalScroller: NO,
     contentView: SC.ListView.design({
       content: ContentArray.create({ length: 100001 }),
@@ -45,7 +45,7 @@ var pane = SC.ControlTestPane.design()
       
       // used for testing
       adjustableRows: SC.IndexSet.create(0,5),
-      altRowHeight: 40,
+      altRowHeight: 10,
       
       contentIndexRowHeight: function(view, content, index) {
         var ret =this.get('rowHeight');
@@ -91,8 +91,7 @@ module("SC.ListView - ui_row_heights", pane.standardSetup());
 
 test("rendering only incremental portion", function() {
   var listView = pane.view("Custom Row Heights").contentView; 
-
-  same(listView.get("nowShowing"), SC.IndexSet.create(0, 21), 'nowShowing should be smaller IndexSet');
+  same(listView.get("nowShowing"), SC.IndexSet.create(0, 10), 'nowShowing should be smaller IndexSet');
   equals(listView.get('childViews').length, listView.get('nowShowing').get('length'), 'should have same number of childViews as nowShowing length');  
 });
 
@@ -101,7 +100,7 @@ test("scrolling by small amount should update incremental rendering", function()
       listView   = scrollView.contentView,
       exp;
   
-  same(listView.get('nowShowing'), SC.IndexSet.create(0,21), 'precond - nowShowing has incremental range');
+  same(listView.get('nowShowing'), SC.IndexSet.create(0,10), 'precond - nowShowing has incremental range');
 
   // SCROLL DOWN ONE LINE
   SC.run(function() {
@@ -109,7 +108,7 @@ test("scrolling by small amount should update incremental rendering", function()
   });
   
   // top line should have scrolled out of view
-  exp = SC.IndexSet.create(2,22);
+  exp = SC.IndexSet.create(4,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
@@ -120,7 +119,7 @@ test("scrolling by small amount should update incremental rendering", function()
   });
   
   // top line should have scrolled out of view
-  exp = SC.IndexSet.create(3,22);
+  exp = SC.IndexSet.create(6,8);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
@@ -132,7 +131,7 @@ test("scrolling by small amount should update incremental rendering", function()
   });
   
   // top line should have scrolled out of view
-  exp = SC.IndexSet.create(2,22);
+  exp = SC.IndexSet.create(4,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
@@ -148,7 +147,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
       listView   = scrollView.contentView,
       exp;
   
-  same(listView.get('nowShowing'), SC.IndexSet.create(0,21), 'precond - nowShowing has incremental range');
+  same(listView.get('nowShowing'), SC.IndexSet.create(0,10), 'precond - nowShowing has incremental range');
   
   // adjust row height and then invalidate a portion range
   SC.run(function() {
@@ -157,7 +156,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
   });
 
   // nowShowing should adjust
-  same(listView.get('nowShowing'), SC.IndexSet.create(0,15), 'visible range should decrease since row heights for some rows doubled');
+  same(listView.get('nowShowing'), SC.IndexSet.create(0,5), 'visible range should decrease since row heights for some rows doubled');
   
   // as well as offset and heights for rows - spot check
   var view = listView.itemViewForContentIndex(3);

data/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js

@@ -127,6 +127,10 @@ function basic(view, sel, disabled) {
   
   equals(cq.hasClass('sel'), !!sel, 'expect sel class');
   equals(cq.hasClass('disabled'), !!disabled, 'expect disabled class');
+  
+  var idx = view.get('contentIndex');
+  var evenOrOdd = (idx % 2 == 0) ? 'even' : 'odd';
+  ok(cq.hasClass(evenOrOdd), 'should have an %@ class'.fmt(evenOrOdd));
 }
 
 function label(view, labelText) {

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

@@ -12,27 +12,32 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 var pane = SC.ControlTestPane.design()
 
   .add("progress basic", SC.ProgressView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 25,
     minimum: 0,
     maximum: 100
   })
   .add("progress disabled", SC.ProgressView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 25,
     minimum: 0,
     maximum: 100,
     isEnabled: NO
   })
   .add("progress basic value 0", SC.ProgressView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 0,
     minimum: 0,
     maximum: 100
   })
   .add("progress basic value 100", SC.ProgressView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 100,
     minimum: 0,
     maximum: 100
   })
   .add("progress basic max 50", SC.ProgressView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 25,
     minimum: 0,
     maximum: 50
@@ -40,22 +45,26 @@ var pane = SC.ControlTestPane.design()
   
   // Slider View UI
   .add("slider basic", SC.SliderView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 50, 
     minimum: 0, 
     maximum: 100
   })
   .add("slider disabled", SC.SliderView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 50, 
     minimum: 0, 
     maximum: 100,
     isEnabled: NO
   })
   .add("slider value 100", SC.SliderView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 100, 
     minimum: 0, 
     maximum: 100
   })
   .add("slider basic step 20", SC.SliderView, {
+    layout: {top:0, bottom:0, left:0, width: 250},
     value: 50, 
     minimum: 0, 
     maximum: 100,
@@ -82,7 +91,7 @@ test("basic", function() {
   equals(view.$('.sc-inner').css("width"), "25%", 'width should be 25%');
   
   // browsers compute the width after % adjustment differently.  just be close
-  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 63 : 62;
   equals(view.$('.sc-inner').width(), v, 'pixel width ');
   
 });
@@ -116,7 +125,7 @@ test("basic value 100", function() {
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   equals(view.$('.sc-inner').css("width"), "100%", 'width should be 100%');
-  equals(view.$('.sc-inner').width(), 338, 'pixel width ');
+  equals(view.$('.sc-inner').width(), 250, 'pixel width ');
   
 });
 
@@ -127,7 +136,7 @@ test("basic max 50", function() {
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
   ok(view.$('.sc-inner'), 'should have sc-inner class');
   equals(view.$('.sc-inner').css("width"), "50%", 'width should be 50%');
-  equals(view.$('.sc-inner').width(), 169, 'pixel width ');
+  equals(view.$('.sc-inner').width(), 125, 'pixel width ');
   
 });
 
@@ -143,13 +152,13 @@ test("changing value from empty -> value", function() {
   view.set('value', 50);
   SC.RunLoop.end();
   equals(view.$('.sc-inner').css("width"), "50%", 'width should be 50%');
-  equals(view.$('.sc-inner').width(), 169, 'pixel width ');
+  equals(view.$('.sc-inner').width(), 125, 'pixel width ');
 });
 
 test("changing value from full -> empty", function() {
   var view = pane.view('progress basic value 100');
   
-  equals(view.$('.sc-inner').width(), 338, 'precon - pixel width should be 316');
+  equals(view.$('.sc-inner').width(), 250, 'precon - pixel width should be 316');
   SC.RunLoop.begin();
   view.set('value', 0);
   SC.RunLoop.end();
@@ -165,7 +174,7 @@ test("changing value from full -> negative number", function() {
   view.set('value', 100);
   SC.RunLoop.end();
   
-  equals(view.$('.sc-inner').width(), 338, 'precon - pixel width should be 338');
+  equals(view.$('.sc-inner').width(), 250, 'precon - pixel width should be 338');
   SC.RunLoop.begin();
   view.set('value', -10);
   SC.RunLoop.end();
@@ -177,13 +186,13 @@ test("changing value to over maximum", function() {
   var view = pane.view('progress basic');
   
   // browsers compute the width after % adjustment differently.  just be close
-  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 63 : 62;
   equals(view.$('.sc-inner').width(), v, 'precon - pixel width should be fixed');
   SC.RunLoop.begin();
   view.set('value', 110);
   SC.RunLoop.end();
   equals(view.$('.sc-inner').css("width"), "100%", 'width should be 100%');
-  equals(view.$('.sc-inner').width(), 338, 'pixel width ');
+  equals(view.$('.sc-inner').width(), 250, 'pixel width ');
 });
 
 test("changing value to a string", function() {
@@ -193,7 +202,7 @@ test("changing value to a string", function() {
   view.set('value', 25);
   SC.RunLoop.end();
 
-  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 63 : 62;
   equals(view.$('.sc-inner').width(), v, 'precon - pixel width should be fixed');
   SC.RunLoop.begin();
   view.set('value', 'aString');

data/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js

@@ -114,29 +114,30 @@ test("maximumHorizontalScrollOffset() returns the maximum horizontal scroll dime
 
   view2.set('horizontalScrollOffset',old_horizontalScrollOffset);
   view2.set('verticalScrollOffset',old_verticalScrollOffset);
-  view2.scrollRightPage(3);
+  view2.scrollBy(5000, 0);
+  view2.get('horizontalScrollOffset');
+
   equals(view2.get('horizontalScrollOffset'),1900, 'maximum y coordinate should be 1900');	
  
   view2.set('horizontalScrollOffset',old_horizontalScrollOffset);
   view2.set('verticalScrollOffset',old_verticalScrollOffset);
-  view2.scrollLeftPage(3);
+  view2.scrollBy(-5000,0);
   equals(view2.get('horizontalScrollOffset'),0, 'minimum y coordinate should be 0');	
   	
 });
 
-
 test("maximumVerticalScrollOffset() returns the maximum vertical scroll dimention", function() {
   var old_horizontalScrollOffset=2;
   var old_verticalScrollOffset=2;
 
   view2.set('horizontalScrollOffset',old_horizontalScrollOffset);
   view2.set('verticalScrollOffset',old_verticalScrollOffset);
-  view2.scrollDownPage(3);
+  view2.scrollBy(0, 5000);
+  view2.get('maximumVerticalScrollOffset');
   equals(view2.get('verticalScrollOffset'),1900, 'maximum coordinate should be 1900'); 
-
   view2.set('horizontalScrollOffset',old_horizontalScrollOffset);
   view2.set('verticalScrollOffset',old_verticalScrollOffset);
-  view2.scrollUpPage(3);
+  view2.scrollBy(0,-5000);
   equals(view2.get('verticalScrollOffset'),0, 'The minimum y coordinate should be 0');
  
 });

data/frameworks/sproutcore/frameworks/desktop/tests/views/well/ui.js

@@ -0,0 +1,54 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            portions copyright @2009 Apple Inc.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test htmlbody ok equals same stop start */
+
+var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
+var pane, view;
+module("SC.TabView", {
+  setup: function() {
+    SC.RunLoop.begin();
+    pane = SC.MainPane.create({
+      childViews: [
+        SC.TabView.extend({
+          nowShowing: 'tab2',
+
+          items: [
+            { title: "tab1", value: "tab1" , icon: iconURL},
+            { title: "tab2", value: "tab2" , icon: iconURL},
+            { title: "tab3", value: "tab3" , icon: iconURL}
+          ],
+
+          itemTitleKey: 'title',
+          itemValueKey: 'value',
+          itemIconKey: 'icon',
+          layout: { left:12, height: 200, right:12, top:12 }
+          
+        })]
+    });
+    pane.append(); // make sure there is a layer...
+    SC.RunLoop.end();
+    
+    view = pane.childViews[0];
+  }, 
+  
+  teardown: function() {
+    pane.remove();
+    pane = view = null ;
+  }
+});
+
+test("Check that all segmentedViews are visible", function() {
+   ok(true, 'hello');
+ });
+
+
+//_tab_nowShowingDidChange: function() {
+
+//_tab_saveUserDefault: function() {
+
+//_tab_itemsDidChange: function() {

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

@@ -165,14 +165,15 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
 
   render: function(context, firstTime) {
     // add href attr if tagName is anchor...
+    var href, toolTip, classes;
     if (this.get('tagName') === 'a') {
-      var href = this.get('href');
+      href = this.get('href');
       if (!href || (href.length === 0)) href = "javascript"+":;";
       context.attr('href', href);
     }
 
     // If there is a toolTip set, grab it and localize if necessary.
-    var toolTip = this.get('toolTip') ;
+    toolTip = this.get('toolTip') ;
     if (SC.typeOf(toolTip) === SC.T_STRING) {
       if (this.get('localize')) toolTip = toolTip.loc() ;
       context.attr('title', toolTip) ;
@@ -180,7 +181,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     }
     
     // add some standard attributes & classes.
-    var classes = this._TEMPORARY_CLASS_HASH;
+    classes = this._TEMPORARY_CLASS_HASH;
     classes.def = this.get('isDefault');
     classes.cancel = this.get('isCancel');
     classes.icon = !!this.get('icon');
@@ -188,8 +189,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
       .setClass(classes).addClass(this.get('theme'));
     // render inner html 
     if(firstTime){
-      context = context.push("<span class='sc-button-inner' style = 'min-width:%@px'>"
-          .fmt(this.get('titleMinWidth')));
+       context = context.push("<span class='sc-button-inner' style = 'min-width:%@px'>"
+            .fmt(this.get('titleMinWidth')));
       this.renderTitle(context, firstTime) ; // from button mixin
       context.push("</span>") ;
     }else{
@@ -204,8 +205,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     Whenever the isDefault or isCancel property changes, update the display and change the keyEquivalent.
   */  
   _isDefaultOrCancelDidChange: function() {
-    var isDef = !!this.get('isDefault') ;
-    var isCancel = !isDef && this.get('isCancel') ;
+    var isDef = !!this.get('isDefault'),
+        isCancel = !isDef && this.get('isCancel') ;
     
     if(this.didChangeFor('defaultCancelChanged','isDefault','isCancel')) {
       this.displayDidChange() ; // make sure to update the UI
@@ -317,8 +318,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     // otherwise, just trigger an action if there is one.
     default:
       //if (this.action) this.action(evt);
-      var action = this.get('action');
-      var target = this.get('target') || null;
+      var action = this.get('action'),
+          target = this.get('target') || null;
       if (action) {
         if (this._hasLegacyActionHandler()) {
           // old school... 
@@ -371,6 +372,17 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   
   willLoseKeyResponderTo: function(responder) {
     if (this._isFocused) this._isFocused = NO ;
+  },
+  
+  didCreateLayer: function() {
+    //Fix for IE7 min-with bug
+    if(SC.browser.msie<8) {
+      var buttonInner = this.$('.sc-button-inner')[0];
+      if (buttonInner){
+        var mL = buttonInner.style.marginLeft;
+        this.$('.sc-button-label')[0].style.minWidth=this.get('titleMinWidth')-mL;
+      }
+    }
   }
   
 }) ;

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

@@ -34,10 +34,11 @@ SC.CheckboxView = SC.FieldView.extend(SC.StaticLayout, SC.Button,
     if (firstTime) {
       dt = this._field_currentDisplayTitle = this.get('displayTitle');
 
-      var blank = sc_static('blank');
+      var blank = SC.BLANK_IMAGE_URL;
       var disabled = this.get('isEnabled') ? '' : 'disabled="disabled"';
+      if(SC.browser.msie) context.attr('for', SC.guidFor(this));
       context.push('<span class="button" ></span>');
-      context.push('<input type="checkbox" name="%@" %@ />'.fmt(SC.guidFor(this),disabled));
+      context.push('<input type="checkbox" id="%@" name="%@" %@ />'.fmt(SC.guidFor(this),SC.guidFor(this),disabled));
       if(this.get('needsEllipsis')){
         context.push('<span class="label ellipsis">', dt, '</span>');
       }else{
@@ -118,7 +119,7 @@ SC.CheckboxView = SC.FieldView.extend(SC.StaticLayout, SC.Button,
     SC.Event.remove(this.$input()[0], 'click', this, this._field_fieldValueDidChange); 
   },
   
-  mouseDown: function(evt) {  
+  mouseDown: function(evt) {
     this.set('isActive', YES);
     this._field_isMouseDown = YES;
     return YES;

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

@@ -1093,7 +1093,7 @@ SC.CollectionView = SC.View.extend(
     // walk up the element hierarchy until we find this or an element with an
     // id matching the base guid (i.e. a collection item)
     while (element && element !== document && element !== layer) {
-      id = element ? element.getAttribute('id') : null ;
+      id = element ? SC.$(element).attr('id') : null ;
       if (id && (contentIndex = this.contentIndexForLayerId(id)) !== null) {
           break;
       }

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

@@ -31,7 +31,7 @@ SC.GridView = SC.ListView.extend(
     width of each item will be this value.
   */
   columnWidth: 64,
-  
+
   /**
     The default example item view will render text-based items.
     
@@ -41,19 +41,13 @@ SC.GridView = SC.ListView.extend(
   
   insertionOrientation: SC.HORIZONTAL_ORIENTATION,
   
-  displayProperties: 'itemsPerRow'.w(),
-  
   /** @private */
   itemsPerRow: function() {
     var f = this.get('frame') ;
     var columnWidth = this.get('columnWidth') || 0 ;
+
     return (columnWidth <= 0) ? 1 : Math.floor(f.width / columnWidth) ;
-  }.property('frame', 'columnWidth').cacheable(),
-  
-  /** @private */
-  itemsPerRowDidChange: function() {
-    this.set('isDirty', YES) ;
-  }.observes('itemsPerRow'),
+  }.property('clippingFrame', 'columnWidth').cacheable(),
   
   /** @private
     Find the contentIndexes to display in the passed rect. Note that we 
@@ -66,14 +60,13 @@ SC.GridView = SC.ListView.extend(
     
     var min = Math.floor(SC.minY(rect) / rowHeight) * itemsPerRow  ;
     var max = Math.ceil(SC.maxY(rect) / rowHeight) * itemsPerRow ;
-    
     return SC.IndexSet.create(min, max-min);
   },
   
   /** @private */
-  layoutForContentIndex: function(contentIndex) {    
+  layoutForContentIndex: function(contentIndex) {
     var rowHeight = this.get('rowHeight') || 48 ;
-    var frameWidth = this.get('frame').width ;
+    var frameWidth = this.get('clippingFrame').width ;
     var itemsPerRow = this.get('itemsPerRow') ;
     var columnWidth = Math.floor(frameWidth/itemsPerRow);
     
@@ -197,6 +190,22 @@ SC.GridView = SC.ListView.extend(
     // convert to index
     var ret= (row*itemsPerRow) + col ;
     return [ret, retOp] ;
-  }
-  
+  },
+
+  /** @private
+    If the size of the clipping frame changes, all of the item views
+    on screen are potentially in the wrong position.  Update all of their
+    layouts if different.
+  */
+  _gv_clippingFrameDidChange: function() {
+    var nowShowing = this.get('nowShowing'), itemView, idx, len;
+    this.notifyPropertyChange('itemsPerRow');
+
+    len = nowShowing.get('length');
+
+    for (idx=0; idx < len; idx++) {
+      itemView = this.itemViewForContentIndex(idx);
+      itemView.adjust(this.layoutForContentIndex(idx));
+    }
+  }.observes('clippingFrame')
 }) ;