sproutit-sproutcore 1.0.20090721145281 → 1.0.20090721145282

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

@@ -54,7 +54,7 @@ module("SC.CollectionView Mouse Events", {
   @param {IndexSet} expected expected selection
   @returns {void}
 */
-function clickOn(view, index, shiftKey, ctrlKey, expected) {
+function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
   var itemView = view.getPath('childViews.%@'.fmt(index)),
       layer    = itemView.get('layer'), 
       opts     = { shiftKey: shiftKey, ctrlKey: ctrlKey }, 
@@ -69,15 +69,26 @@ function clickOn(view, index, shiftKey, ctrlKey, expected) {
   SC.Event.trigger(layer, 'mouseup', [ev]);
   
   if (expected !== undefined) {
-    sel = view.get('selection');
-    
-    modifiers = [];
-    if (shiftKey) modifiers.push('shift');
-    if (ctrlKey) modifiers.push('ctrl');
-    modifiers = modifiers.length > 0 ? modifiers.join('+') : 'no modifiers';
+    var f = function() {
+      SC.RunLoop.begin();
+      sel = view.get('selection');
+      
+      modifiers = [];
+      if (shiftKey) modifiers.push('shift');
+      if (ctrlKey) modifiers.push('ctrl');
+      modifiers = modifiers.length > 0 ? modifiers.join('+') : 'no modifiers';
+      
+      expected = SC.SelectionSet.create().add(view.get('content'), expected);
+      
+      ok(expected.isEqual(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
+    };
     
-    expected = SC.SelectionSet.create().add(view.get('content'), expected);
-    ok(expected.isEqual(sel), 'should have selection: %@ after click with %@ on item[%@], actual: %@'.fmt(expected, modifiers, index, sel));
+    if (delay) {
+      stop() ; // stops the test runner
+      setTimeout(f, delay) ;
+    } else f() ;
   }
   
   layer = itemView = null ;
@@ -91,11 +102,11 @@ test("clicking on an item should select it", function() {
   clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
 });
 
-test("clicking on a selected item should clear selection and reselect it it", function() {
-
+test("clicking on a selected item should clear selection after 301ms and reselect it", function() {
   view.select(SC.IndexSet.create(1,5));
   SC.stopIt = YES ;
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
+  SC.RootResponder.responder._lastMouseUpAt = null ; // HACK: don't want a doubleClick from previous tests
+  clickOn(view, 3, NO, NO, SC.IndexSet.create(3), 301);
   SC.stopIt = NO ;
 });
 

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

@@ -0,0 +1,92 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+// SC.LOG_BINDINGS = YES ;
+
+var view, content, pane ;
+
+var renderFunc = CoreTest.stub("render", function() {
+  SC.ListItemView.prototype.render.apply(this, arguments) ;
+});
+
+module("SC.ListView.render", {
+  
+  setup: function() {
+    SC.RunLoop.begin();
+    
+    content = "1 2 3 4 5 6 7 8 9 10".w().map(function(x) {
+      return SC.Object.create({ value: x });
+    });
+    
+    view = SC.ListView.create({
+      content: content, 
+      
+      layout: { top: 0, left: 0, width: 300, height: 500 },
+      
+      layoutForContentIndex: function(idx) {
+        return { left: 0, right: 0, top: idx * 50, height: 50 };
+      },
+      
+      didReload: CoreTest.stub("didReload"),
+      
+      _cv_isVisibleInWindowDidChange: CoreTest.stub("_cv_isVisibleInWindowDidChange", function() {
+        SC.ListView.prototype._cv_isVisibleInWindowDidChange.apply(this, arguments) ;
+      }),
+      
+      _cv_nowShowingDidChange: CoreTest.stub("_cv_nowShowingDidChange", function() {
+        SC.ListView.prototype._cv_nowShowingDidChange.apply(this, arguments) ;
+      }),
+      
+      exampleView: SC.ListItemView.extend({
+        render: renderFunc
+      }),
+      
+      // reset stubs
+      reset: function() {
+        this.didReload.reset();
+        this._cv_isVisibleInWindowDidChange.reset();
+        this._cv_nowShowingDidChange.reset();
+        renderFunc.reset();
+      }
+      
+    });
+    
+    pane = SC.MainPane.create();
+    pane.appendChild(view);
+    pane.append();
+    
+    SC.RunLoop.end();
+  },
+  
+  teardown: function() {
+    SC.RunLoop.begin();
+    pane.remove();
+    SC.RunLoop.end();
+    view.reset();
+  }
+  
+});
+
+// ..........................................................
+// BASIC TESTS
+// 
+
+test("didReload() should only be called once with a static content array", function() {
+  view.didReload.expect(1);
+});
+
+test("_cv_isVisibleInWindowDidChange() should only be called once with a static content array", function() {
+  view._cv_isVisibleInWindowDidChange.expect(1);
+});
+
+test("list item render() should only be called once per item view a static content array", function() {
+  renderFunc.expect(10);
+});
+
+// test("_cv_nowShowingDidChange() should only be called once with a static content array", function() {
+//   view._cv_nowShowingDidChange.expect(1); // currently is 3...
+// });

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

@@ -7,75 +7,126 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-var pane, view ;
+var pane, view , view1, view2, view3;
 module("SC.SelectFieldView",{
-	setup: function() {
-	    SC.RunLoop.begin();
-	    pane = SC.MainPane.create({
-		  childViews: [
-		   SC.SelectFieldView.extend({
-			objects:[1,6,11,2,8]
-		   }),
-		   SC.SelectFieldView.extend({
-			objects:["Apple","Sproutcore 1.0","Development","Charles"]// ,
-			// sortObjects:function(objects){
-			// 				console.log('Displaying the options without sorting');
-			// 			}
-		   })]	
-		});
-		pane.append(); // make sure there is a layer...
-	    SC.RunLoop.end();
-	
-		view = pane.childViews[0];
-		view1= pane.childViews[1];
-		
-	},
-	
-	teardown: function() {
-    	pane.remove();
-    	pane = view = null ;
-  	}
+  setup: function() {
+    SC.RunLoop.begin();
+    pane = SC.MainPane.create({
+      objs : ["Apple","Sproutcore 1.0","Development","Charles"],
+      selectedValue: "Apple",
+      childViews: [
+        SC.SelectFieldView.extend({
+          objects: [1,6,11,2,8]
+        }),
+        SC.SelectFieldView.extend({
+          objects: ["Apple","Sproutcore 1.0","Development","Charles"]
+        }),
+        SC.SelectFieldView.extend({
+          objectsBinding: '*owner.objs',
+          valueBinding: '*owner.selectedValue' 
+        }),
+        SC.SelectFieldView.extend({
+          objectsBinding: '*owner.objs',
+          valueBinding: '*owner.selectedValue',
+          valueKey: 'title',
+          nameKey: 'title',
+          sortKey: 'pos' 
+        })
+        
+        
+      ]  
+    });
+    pane.append(); // make sure there is a layer...
+    SC.RunLoop.end();
+  
+    view = pane.childViews[0] ;
+    view1 = pane.childViews[1] ;
+    view2 = pane.childViews[2] ;
+    view3 = pane.childViews[3] ;
+  },
+  
+  teardown: function() {
+    pane.remove();
+    pane = view = null ;
+  }
 });
 
 test("renders a select field input tag with appropriate attributes", function() {
-	equals(view.get('tagName'), 'select', 'should have type as text');	
-	var q = Q$('select', view.get('layer'));
-	equals(view.$().attr('id'), SC.guidFor(view), 'should have id as view_guid');
+  equals(view.get('tagName'), 'select', 'should have type as text');  
+  var q = Q$('select', view.get('layer'));
+  equals(view.$().attr('id'), SC.guidFor(view), 'should have id as view_guid');
 });
 
 test("select component with options", function() {
- 	equals(5,view.objects.length,'The select component should have 5 options');
-	equals(null,view.nameKey,'the select should not have any name key');
-	equals(null,view.valueKey,'the select should not have any value key');
+   equals(5,view.objects.length,'The select component should have 5 options');
+  equals(null,view.nameKey,'the select should not have any name key');
+  equals(null,view.valueKey,'the select should not have any value key');
 });
 
-test("sortObjects() sorts the options of the select component", function() {	
-	var obj = view.objects;
-	view.objects = view.sortObjects(obj);
+test("sortObjects() sorts the options of the select component", function() {  
+  var obj = view.objects;
+  view.objects = view.sortObjects(obj);
 
-	equals(1,obj.get(0),'should be the first element');
-	equals(2,obj.get(1),'should be the second element');
-	equals(6,obj.get(2),'should be the third element');
-	equals(8,obj.get(3),'should be the forth element');
-	equals(11,obj.get(4),'should be the fifth element');
+  equals(1,obj.get(0),'should be the first element');
+  equals(2,obj.get(1),'should be the second element');
+  equals(6,obj.get(2),'should be the third element');
+  equals(8,obj.get(3),'should be the forth element');
+  equals(11,obj.get(4),'should be the fifth element');
 });
 
-test("rebuildMenu() populates the select component with new data", function() {	
-	var newObj = ['Hai,','how','are','you?'];
-	view1.objects = newObj;
-	var obj = view1.objects;
-	equals('Hai,',obj.get(0),'should be the first element');
-	equals('how',obj.get(1),'should be the second element');
-	equals('are',obj.get(2),'should be the third element');
-	equals('you?',obj.get(3),'should be the forth element');
+test("rebuildMenu() populates the select component with new data", function() {  
+  var newObj = ['Hai,','how','are','you?'];
+  view1.objects = newObj;
+  var obj = view1.objects;
+  equals('Hai,',obj.get(0),'should be the first element');
+  equals('how',obj.get(1),'should be the second element');
+  equals('are',obj.get(2),'should be the third element');
+  equals('you?',obj.get(3),'should be the forth element');
 });
 
 test("isEnabled=NO should add disabled class", function() {
-    SC.RunLoop.begin();
-    view.set('isEnabled', NO);
-    SC.RunLoop.end();  
-    ok(view.$().hasClass('disabled'), 'should have disabled class');
+  SC.RunLoop.begin();
+  view.set('isEnabled', NO);
+  SC.RunLoop.end();  
+  ok(view.$().hasClass('disabled'), 'should have disabled class');
+});
+
+test("objects should change on changing the binding", function() {
+  SC.RunLoop.begin();
+  var newObjects = ['Test1','Test2'] ;
+  pane.set('objs', newObjects);
+  SC.RunLoop.end();  
+  var objects = view2.objects ;
+  newObjects = pane.objs ;
+  ok(objects===newObjects, 'the objects should be same');
 });
 
 
+test("selectedValue shouldn't have st string attached to it", function() {
+  SC.RunLoop.begin();
+  var newObjects = ['Test1','Test2'] ;
+  pane.set('objs', newObjects);
+  SC.RunLoop.end();  
+  SC.RunLoop.begin();
+  pane.set('selectedValue', 'Test1');
+  SC.RunLoop.end();  
+  var selectedValue = view2.getFieldValue() ;
+  equals(selectedValue,'Test1', 'the new Value is ');
+  
+  
+  SC.RunLoop.begin();
+  var newObjects2 =[{pos: 1,title:'US/Pacific'}, 
+  {pos: 2, title:'America/Vancouver'}, 
+  {pos: 3, title:'Canada/Mountain'},
+  {pos: 4, title:'Other...'}];
+  pane.set('objs', newObjects2);
+  SC.RunLoop.end();  
+  SC.RunLoop.begin();
+  pane.set('selectedValue', 'America/Vancouver');
+  SC.RunLoop.end();  
+  selectedValue = view3.getFieldValue() ;
+  equals(selectedValue,'America/Vancouver', 'the new Value is ');
+  
+});
+
 

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

@@ -41,6 +41,8 @@ var pane = SC.ControlTestPane.design()
     useStaticLayout: YES, 
     layout: { width: '150', right: '0' }
   });
+  
+    pane.show();
 
 // ..........................................................
 // TEST VIEWS

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

@@ -172,9 +172,10 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
 
     // If there is a toolTip set, grab it and localize if necessary.
     var toolTip = this.get('toolTip') ;
-    if(SC.typeOf(toolTip) === SC.T_STRING) {
-        context.attr('title', this.get('localize') ? toolTip.loc() : toolTip) ;
-        context.attr('alt', this.get('localize') ? toolTip.loc() : toolTip) ;
+    if (SC.typeOf(toolTip) === SC.T_STRING) {
+      if (this.get('localize')) toolTip = toolTip.loc() ;
+      context.attr('title', toolTip) ;
+      context.attr('alt', toolTip) ;
     }
     
     // add some standard attributes & classes.

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

@@ -1959,8 +1959,11 @@ SC.CollectionView = SC.View.extend(
           canEdit = (canEdit && itemView.beginEditing) ? itemView.beginEditing() : NO ;
         }
         
-        // if cannot edit, just reselect
-        if (!canEdit) this.select(idx, false) ;
+        // if cannot edit, schedule a reselect (but give doubleClick a chance)
+        if (!canEdit) {
+          if (this._cv_reselectTimer) this._cv_reselectTimer.invalidate() ;
+          this._cv_reselectTimer = this.invokeLater(this.select, 300, idx, false) ;
+        }
       }
       
       this._cleanupMouseDown() ;
@@ -2710,6 +2713,7 @@ SC.CollectionView = SC.View.extend(
     if (delay === undefined) delay = 0 ;
     if (clickCount === undefined) clickCount = 1;
     if ((clickCount>1) || this.get('actOnSelect')) {
+      if (this._cv_reselectTimer) this._cv_reselectTimer.invalidate() ;
       sel = this.get('selection');
       sel = sel ? sel.toArray() : [];
       if (this._cv_actionTimer) this._cv_actionTimer.invalidate();

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

@@ -370,6 +370,15 @@ SC.ListView = SC.CollectionView.extend(
     }
     
     end++; // end should be after start
+    
+    // if height is greater than 0, on some platforms we should just render
+    // to specific windows in order to minimize render time.
+    if (height > 0 && !SC.browser.msie) {
+      start = start - (start % 50);
+      if (start < 0) start = 0 ;
+      end   = end - (end % 50) + 50;
+    }
+    
     if (end<start) end = start;
     if (end>len) end = len ;
     

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

@@ -400,7 +400,7 @@ SC.ListItemView = SC.View.extend(
     occurred inside of it.
   */
   _isInsideDisclosure: function(evt) {
-    if (this.get('disclosureSate')===SC.LEAF_NODE) return NO;
+    if (this.get('disclosureState')===SC.LEAF_NODE) return NO;
     return this._isInsideElementWithClassName('disclosure', evt);
   },
   
@@ -574,7 +574,7 @@ SC.ListItemView = SC.View.extend(
    var oldLineHeight = el.css('lineHeight');
    var fontSize = el.css('fontSize');
    var top = this.$().css('top');
-   if(top) top = parseInt(top.substring(0,top.length-2),00);
+   if(top) top = parseInt(top.substring(0,top.length-2),0);
    else top =0;
    var lineHeight = oldLineHeight;
    var lineHeightShift = 0;

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

@@ -204,8 +204,8 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
     key = this.getDelegateProperty('isSeparatorKey', del) ;
     val = (key && content) ? (content.get ? content.get(key) : content[key]) : null ;
     if (val) {
-      //ic.begin('span').addClass('separator').end() ;
       ic.push("<span class='separator'></span>") ;
+      context.addClass('disabled') ;
     } else {
       // handle checkbox
       key = this.getDelegateProperty('contentCheckboxKey', del) ;
@@ -333,7 +333,7 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
   */
   getAnchor: function() {
     var anchor = this.get('anchor') ;
-    if(anchor && anchor.kindOf(SC.MenuItemView)) return anchor ;
+    if(anchor && anchor.kindOf && anchor.kindOf(SC.MenuItemView)) return anchor ;
     return null ;
   },
   
@@ -437,7 +437,7 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
       if (content && content.get(key)) {
         this.$('.checkbox').setClass('inactive', YES) ;
         content.set(key, NO) ;
-      } else {
+      } else if( content.get(key)!== undefined ) {
         this.$('.checkbox').removeClass('inactive') ;
         content.set(key, YES) ;
       }

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

@@ -13,6 +13,14 @@ SC.PopupButtonView = SC.ButtonView.extend({
   */
   keyEquivalent: null,
   classNames: ['sc-popup-button'],
+  
+  /**
+    Prefer matrix to pass the offsets to position the pane popped up by this 
+    button.
+    
+    @property
+  */
+  preferMatrix: null,
     
   /**private */
   acceptsFirstResponder: YES,
@@ -61,7 +69,7 @@ SC.PopupButtonView = SC.ButtonView.extend({
     var menu = this.get('menu') ;
     // no menu to toggle... bail...
     if (!menu) return NO ;
-    menu.popup(this) ;
+    menu.popup(this, this.preferMatrix) ;
     return YES;
   }