sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -7,25 +7,75 @@
 
 var view, content ;
 
-module("SC.CollectionView.reload", {
-  setup: function() {
+module("SC.CollectionView#reload (unattached)", {
+  setup: function () {
     content = "1 2 3 4 5 6 7 8 9 10".w().map(function(x) {
       return SC.Object.create({ value: x });
     });
-    
+
     view = SC.CollectionView.create({
-      content: content, 
+      content: content
+    });
+  },
+
+  teardown: function () {
+    view.destroy();
+    view = content = null;
+  }
+});
+
+
+test("should only reload when isVisibleInWindow", function() {
+  var len = view.getPath('childViews.length');
 
-      isVisibleInWindow: YES
+  SC.run(function() {
+    view.reload();
+  });
+
+  equals(view.getPath('childViews.length'), len, 'view.childViews.length should not change while offscreen');
+
+  SC.run(function() {
+    view.createLayer();
+    view._doAttach(document.body);
+  });
+
+  equals(view.getPath('childViews.length'), content.get('length'), 'view.childViews.length should change when moved onscreen if reload is pending');
+});
+
+
+module("SC.CollectionView.reload (attached)", {
+  setup: function () {
+    content = "1 2 3 4 5 6 7 8 9 10".w().map(function(x) {
+      return SC.Object.create({ value: x });
+    });
+
+    view = SC.CollectionView.create({
+      content: content,
+      exampleView: SC.View.extend({
+        isReusable: false
+      }),
+
+      // STUB: reload
+      reload: CoreTest.stub('reload', SC.CollectionView.prototype.reload)
+    });
+
+    SC.run(function() {
+      view.createLayer();
+      view._doAttach(document.body);
     });
+  },
+
+  teardown: function () {
+    view.destroy();
+    view = content = null;
   }
 });
 
 /*
   Verifies that the item views for the passed collection view match exactly the
-  content array passed.  If shouldShowAllContent is also YES then verifies 
+  content array passed.  If shouldShowAllContent is also YES then verifies
   that the nowShowing range is showing the entire content range.
-  
+
   @param {SC.CollectionView} view the view to test
   @param {SC.Array} content the content array
   @param {Boolean} shouldShowAllContent
@@ -36,64 +86,52 @@ function verifyItemViews(view, content, shouldShowAllContent, testName) {
   var nowShowing = view.get('nowShowing'),
       childViews = view.get('childViews');
 
-  if (testName === undefined) testName='';
-  
+  if (testName === undefined) testName = '';
+
   if (shouldShowAllContent) {
     ok(nowShowing.isEqual(SC.IndexSet.create(0, content.get('length'))), '%@ nowShowing (%@) should equal (0..%@)'.fmt(testName, nowShowing, content.get('length')-1));
   }
-  
+
   equals(childViews.get('length'), nowShowing.get('length'), '%@ view.childViews.length should match nowShowing.length'.fmt(testName));
-  
-  // childViews should be in same order as nowShowing indexes at all times.
+
   var iter= 0;
   nowShowing.forEach(function(idx) {
-    var itemView = childViews.objectAt(iter),
+    var itemView = view.itemViewForContentIndex(idx),
         item     = content.objectAt(idx);
-    ok(itemView, 'childViews[%@] should have itemView'.fmt(iter));
+
     if (itemView) {
       equals(itemView.get('content'), item, '%@ childViews[%@].content should equal content[%@]'.fmt(testName, iter,idx));
     }
-    iter++;    
+    iter++;
   });
 }
 
 // ..........................................................
 // BASIC TESTS
-// 
-
-test("should only reload when isVisibleInWindow", function() {
+//
 
-  view.set('isVisibleInWindow', NO);
-  //view.isVisibleInWindow = NO ;
-  
-  var len = view.getPath('childViews.length');
-  
-  SC.run(function() {
-    view.reload();
-  });
-
-  equals(view.getPath('childViews.length'), len, 'view.childViews.length should not change while offscreen');
-  
-  SC.RunLoop.begin();
-  view.set('isVisibleInWindow', YES);
-  SC.RunLoop.end();
+test("should automatically reload if content is set when collection view is first created", function() {
+  ok(view.get('content'), 'precond - should have content');
 
-  equals(view.getPath('childViews.length'), content.get('length'), 'view.childViews.length should change when moved onscreen if reload is pending');
+  verifyItemViews(view, content, YES);
 });
 
-test("should automatically reload if content is set when collection view is first created", function() {
+test("should automatically reload if isEnabled changes", function() {
   ok(view.get('content'), 'precond - should have content');
-  SC.RunLoop.begin();
-  SC.RunLoop.end();
 
+  view.reload.reset();
+  view.set('isEnabled', false);
+  view.reload.expect(1);
+  view.set('isEnabled', true);
+  view.reload.expect(2);
   verifyItemViews(view, content, YES);
 });
 
 test("reload(null) should generate item views for all items", function() {
 
-  SC.RunLoop.begin();
-  view.reload();
-  SC.RunLoop.end(); // allow reload to run
+  SC.run(function() {
+    view.reload();
+  });
 
   verifyItemViews(view, content, YES);
 });
@@ -101,40 +139,40 @@ test("reload(null) should generate item views for all items", function() {
 test("reload(index set) should update item view for items in index only", function() {
 
   // make sure views are loaded first time
-  SC.run(function() { view.reload(); });
-  
+  SC.run(function() {
+    view.reload();
+  });
+
   // now get a couple of child views.
   var cv1 = view.childViews[1], cv2 = view.childViews[3];
-  
+
   // and then reload them
   SC.run(function() { view.reload(SC.IndexSet.create(1).add(3)); });
-  
+
   ok(cv1 !== view.childViews[1], 'view.childViews[1] should be new instance after view.reload(<1,3>) actual: %@ expected: %@'.fmt(view.childViews[1], cv1));
   ok(cv2 !== view.childViews[3], 'view.childViews[3] should be new instance after view.reload(<1,3>) actual: %@ expected: %@'.fmt(view.childViews[3], cv2));
-  
+
   // verify integrity
   verifyItemViews(view, content, YES);
 });
 
 test("adding items to content should reload item views at end", function() {
-
-  SC.run(function() { 
-    content.pushObject(SC.Object.create()); 
+  SC.run(function() {
+    content.pushObject(SC.Object.create());
   });
   verifyItemViews(view, content, YES);
 });
 
 test("removing items from content should remove item views", function() {
-
-  SC.run(function() { 
-    content.popObject(); 
+  SC.run(function() {
+    content.popObject();
   });
   verifyItemViews(view, content, YES);
 });
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("remove and readd item", function() {
   // first remove an item.
@@ -157,21 +195,3 @@ test("remove and readd item", function() {
 
 });
 
-test("reloading should only render nowShowing component", function() {
-  var expected = SC.IndexSet.create(0,2).add(6);
-
-  view = SC.CollectionView.create({
-    content: content, 
-    computeNowShowing: function() {
-      return expected;
-    },
-    isVisibleInWindow: YES
-  });
-  
-  SC.RunLoop.begin();
-  view.reload();
-  SC.RunLoop.end();
-  
-  same(view.get('nowShowing'), expected, 'precond - should have limited now showing');
-  equals(view.get('childViews').get('length'), expected.get('length'), 'should only render number of child views in IndexSet');
-});

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

@@ -20,9 +20,9 @@ module("SC.CollectionView.selection", {
 });
 
 /*
-  Helper method to validate that the item views in the view have the 
+  Helper method to validate that the item views in the view have the
   proper selection state.  Pass in the collection view and the selection.
-  
+
   @param {SC.CollectionView} view the view to test
   @param {SC.IndexSet} sel the index set
   @param {String} testName the name of the test
@@ -31,16 +31,16 @@ module("SC.CollectionView.selection", {
 function verifySelection(view, sel, testName) {
   var childViews = view.get('childViews'),
       len = childViews.get('length'),
-      idx, itemView, expected, actual ;  
+      idx, itemView, expected, actual ;
 
   if (!testName) testName = '';
-  
+
   equals(len, view.get('nowShowing').get('length'), '%@ precond - must have childViews for each nowShowing'.fmt(testName));
-  
+
   for(idx=0;idx<len;idx++) {
     itemView = childViews[idx];
     ok(!SC.none(itemView.contentIndex), '%@ precond - itemView[%@] must have contentIndex'.fmt(testName, idx));
-    
+
     expected = sel.contains(itemView.contentIndex);
     actual   = itemView.get('isSelected');
     equals(actual, expected, '%@ itemView[%@].isSelected should match selection(%@)'.fmt(testName, idx, sel));
@@ -49,7 +49,7 @@ function verifySelection(view, sel, testName) {
 
 // ..........................................................
 // SELECTION SYNCING WITH ITEM VIEWS
-// 
+//
 
 test("item views should have proper isSelected state on reload", function() {
   var sel = SC.IndexSet.create(3,2).add(8),
@@ -57,7 +57,7 @@ test("item views should have proper isSelected state on reload", function() {
 
   view.set('selection', set);
   SC.run(function() { view.reload(); }); // make sure it loads
-  
+
   verifySelection(view, sel);
 });
 
@@ -65,33 +65,33 @@ test("item views should update isSelected state when selection property changes"
 
   var sel1 = SC.IndexSet.create(3,2),
       sel2 = SC.IndexSet.create(8);
-      
+
   view.set('selection',SC.SelectionSet.create().add(view.content, sel1));
   SC.run(function() { view.reload(); });
   verifySelection(view, sel1, 'before');
 
-  SC.run(function() { 
-    view.set('selection',SC.SelectionSet.create().add(view.content, sel2)); 
+  SC.run(function() {
+    view.set('selection',SC.SelectionSet.create().add(view.content, sel2));
   });
   verifySelection(view, sel2, 'after');
-  
+
 });
 
 test("item views should not update isSelected state when old index set selection changes", function() {
 
   var sel1 = SC.IndexSet.create(3,2),
       sel2 = SC.IndexSet.create(8);
-      
+
   view.set('selection',SC.SelectionSet.create().add(view.content, sel1));
   SC.run(function() { view.reload(); });
-  SC.run(function() { 
-    view.set('selection', SC.SelectionSet.create().add(view.content, sel2)); 
+  SC.run(function() {
+    view.set('selection', SC.SelectionSet.create().add(view.content, sel2));
   });
   verifySelection(view, sel2, 'before');
 
   SC.run(function() { sel1.add(10).remove(8); });
   verifySelection(view, sel2, 'after');
-  
+
 });
 
 test("item views should update isSelected state when selection index set is modified", function() {
@@ -99,38 +99,40 @@ test("item views should update isSelected state when selection index set is modi
   var sel = SC.IndexSet.create(3,2),
       content = view.get('content'),
       set = SC.SelectionSet.create().add(content, sel);
-      
+
   view.set('selection',set);
   SC.run(function() { view.reload(); });
   verifySelection(view, sel, 'before');
 
   SC.run(function() { set.add(content, 8).remove(content, 4); });
   verifySelection(view, SC.IndexSet.create(3).add(8), 'after');
-  
+
 });
 
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("reloading some items should still update selection properly", function() {
   var sel1 = SC.IndexSet.create(3,2),
       sel2 = SC.IndexSet.create(4,2).add(8);
-      
-  view.set('selection',SC.SelectionSet.create().add(view.content, sel1));
+
+  view.set('selection', SC.SelectionSet.create().add(view.content, sel1));
   SC.run(function() { view.reload(); });
-  SC.run(function() { 
+
+  SC.run(function() {
     view.reload(SC.IndexSet.create(4).add(8));
-    view.set('selection', SC.SelectionSet.create().add(view.content, sel2)); 
+    view.set('selection', SC.SelectionSet.create().add(view.content, sel2));
   });
+
   verifySelection(view, sel2, 'after');
 });
 
 test("select() should round trip", function() {
-  
+
   var sel = SC.IndexSet.create(3,2);
-  
+
   SC.run(function() { view.reload(); }); // make sure view is all ready
   SC.run(function() { view.select(sel); });
   verifySelection(view, sel);

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

@@ -8,13 +8,13 @@
 /* Test SC.StackedView with a Comments example. */
 
 var ShapeView = SC.View.extend(SC.Control, {
-  
+
   content: null,
-  
+
   classNames: 'shape',
 
   DIMENSION_KEYS: 'x y width height'.w(),
-  
+
   contentPropertyDidChange: function(target, key) {
     if (key === '*') {
       this.recomputeLayout();
@@ -25,7 +25,7 @@ var ShapeView = SC.View.extend(SC.Control, {
       this.recomputeLayout();
     }
   },
-  
+
   recomputeLayout: function() {
     var content = this.get('content'), layout ;
     if (content) {
@@ -38,29 +38,29 @@ var ShapeView = SC.View.extend(SC.Control, {
     } else {
       layout = { top: 0, left: 0, height: 0, width: 0 };
     }
-    
+
     this.set('layout', layout);
   },
-  
+
   render: function(context, firstTime) {
     var label = this.getPath('content.label');
-    context.push('<label>', label, '</label>');  
+    context.push('<label>', label, '</label>');
   }
 });
 
 var content = [
-  SC.Object.create({ 
-    label: "Shape 1", 
+  SC.Object.create({
+    label: "Shape 1",
     x: 10, y: 10, width: 100, height: 50
   }),
 
-  SC.Object.create({ 
-    label: "Shape 2", 
+  SC.Object.create({
+    label: "Shape 2",
     x: 50, y: 50, width: 65, height: 200
   }),
 
-  SC.Object.create({ 
-    label: "Shape 3", 
+  SC.Object.create({
+    label: "Shape 3",
     x: 100, y: 80, width: 200, height: 72
   })
 
@@ -72,18 +72,18 @@ var extra = SC.Object.create({
 });
 
 var ShapeCanvasView = SC.CollectionView.extend({
-  
+
   // save position on screen at mouse down so that we can properly compute
   // you can save in mouseDownInfo, which will be cleared on mouseUp
   mouseDown: function(ev) {
     var ret = sc_super();
     if (ret) {
       var offset = { x: ev.pageX, y: ev.pageY };
-      this.mouseDownInfo.dragAnchor = this.convertFrameFromView(offset, null); 
+      this.mouseDownInfo.dragAnchor = this.convertFrameFromView(offset, null);
     }
     return ret ;
   },
-  
+
   // handle dragging of content around on the screen
   mouseDragged: function(ev) {
     var info   = this.mouseDownInfo,
@@ -93,13 +93,13 @@ var ShapeCanvasView = SC.CollectionView.extend({
         ypoints = info.ypoints,
         adjust, sel, item, content, idx;
 
-    // if no items have been collected yet, this is the first time drag is 
+    // if no items have been collected yet, this is the first time drag is
     // called.  collect content items to drag.  If there is no selection, etc
     // just clear the anchor prop so that we don't try to drag again
     if (!items) {
       sel = this.get('selection');
       content = this.get('content');
-    
+
       // collect info about items to drag.  save initial x/y coordinates so we
       // can edit them later
       if (content && sel && sel.get('length') > 0) {
@@ -107,29 +107,29 @@ var ShapeCanvasView = SC.CollectionView.extend({
         xpoints = info.xpoints = [];
         ypoints = info.ypoints = [];
         items   = info.dragContent = [];
-      
-        sel.forEach(function(idx) { 
+
+        sel.forEach(function(idx) {
           item = content.objectAt(idx);
           if (!item) return; // nothing to do here
           items.push(item);
           xpoints.push(item.get('x'));
           ypoints.push(item.get('y'));
-        }, this); 
-      
+        }, this);
+
         info.shouldReselect = NO; // once we drag, don't alter selection
-        
+
       // if no content or no selection or selection is empty, just disable
       } else anchor = info.dragAnchor = null ;
     }
-  
+
     // if anchor is empty, dragging is disabled for this mouse down.
     if (!anchor) return sc_super();
-  
-    // now figure the adjustment for content items.  
+
+    // now figure the adjustment for content items.
     adjust = this.convertFrameFromView({ x: ev.pageX, y: ev.pageY }, null);
     adjust.x -= anchor.x;
     adjust.y -= anchor.y;
-    
+
     // and move each
     idx = items.length;
     while(--idx >= 0) {
@@ -139,10 +139,10 @@ var ShapeCanvasView = SC.CollectionView.extend({
         .set('y', ypoints[idx] + adjust.y)
       .endPropertyChanges();
     }
-  
+
     return YES ;
   }
-  
+
 });
 
 var pane = SC.ControlTestPane.design()
@@ -152,13 +152,10 @@ var pane = SC.ControlTestPane.design()
     exampleView: ShapeView,
     allowDeselectAll: YES
   });
-  
-pane.show(); // add a test to show the test pane
-window.pane = pane ;
 
 // ..........................................................
 // BASIC TESTS
-// 
+//
 module("Basic Tests", {
   setup: function(){
     htmlbody(["<style>",
@@ -178,9 +175,9 @@ module("Basic Tests", {
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
-// tests specific bug where a series of many edits strung together would 
+// tests specific bug where a series of many edits strung together would
 // cause the height to get out of sync.