sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -9,10 +9,10 @@ var view, del, content ;
 
 module("SC.CollectionView.itemViewForContentIndex", {
   setup: function() {
-    content = "a b c".w().map(function(x) { 
+    content = "a b c".w().map(function(x) {
       return SC.Object.create({ title: x });
     });
-    
+
     del = {
       fixture: {
         isEnabled: YES,
@@ -20,19 +20,19 @@ module("SC.CollectionView.itemViewForContentIndex", {
         outlineLevel: 3,
         disclosureState: SC.LEAF_NODE
       },
-      
-      contentIndexIsEnabled: function() { 
-        return this.fixture.isEnabled; 
+
+      contentIndexIsEnabled: function() {
+        return this.fixture.isEnabled;
       },
-      
-      contentIndexIsSelected: function() { 
-        return this.fixture.isSelected; 
+
+      contentIndexIsSelected: function() {
+        return this.fixture.isSelected;
       },
 
-      contentIndexOutlineLevel: function() { 
-        return this.fixture.outlineLevel; 
+      contentIndexOutlineLevel: function() {
+        return this.fixture.outlineLevel;
       },
-      
+
       contentIndexDisclosureState: function() {
         return this.fixture.disclosureState ;
       }
@@ -41,37 +41,39 @@ module("SC.CollectionView.itemViewForContentIndex", {
     // NOTE: delegate methods above are added here.
     view = SC.CollectionView.create(del, {
       content: content,
-      
+
       layoutForContentIndex: function(contentIndex) {
         return this.fixtureLayout ;
       },
-      
+
       fixtureLayout: { left: 0, right: 0, top:0, bottom: 0 },
-      
+
       groupExampleView: SC.View.extend(), // custom for testing
-      
-      exampleView: SC.View.extend(), // custom for testing
-      
+
+      exampleView: SC.View.extend({
+        isReusable: false
+      }), // custom for testing
+
       testAsGroup: NO,
-      
+
       contentIndexIsGroup: function() { return this.testAsGroup; },
-      
+
       contentGroupIndexes: function() {
         if (this.testAsGroup) {
           return SC.IndexSet.create(0, this.get('length'));
         } else return null ;
       },
-      
+
       fixtureNowShowing: SC.IndexSet.create(0,3),
       computeNowShowing: function() {
         return this.fixtureNowShowing;
       }
-      
+
     });
-    
+
     // add in delegate mixin
     del = SC.mixin({}, SC.CollectionContent, del);
-    
+
   }
 });
 
@@ -85,27 +87,27 @@ function shouldMatchFixture(itemView, fixture) {
 
 test("creating basic item view", function() {
   var itemView = view.itemViewForContentIndex(1);
-  
+
   // should use exampleView
   ok(itemView, 'should return itemView');
   ok(itemView.kindOf(view.exampleView), 'itemView %@ should be kindOf %@'.fmt(itemView, view.exampleView));
-  
+
   // set added properties
   equals(itemView.get('content'), content.objectAt(1), 'itemView.content should be set to content item');
   equals(itemView.get('contentIndex'), 1, 'itemView.contentIndex should be set');
   equals(itemView.get('owner'), view, 'itemView.owner should be collection view');
   equals(itemView.get('displayDelegate'), view, 'itemView.displayDelegate should be collection view');
   equals(itemView.get('parentView'), view, 'itemView.parentView should be collection view');
-  
+
   // test data from delegate
   shouldMatchFixture(itemView, view.fixture);
 });
 
 test("returning item from cache", function() {
-  
+
   var itemView1 = view.itemViewForContentIndex(1);
   ok(itemView1, 'precond - first call returns an item view');
-  
+
   var itemView2 = view.itemViewForContentIndex(1);
   equals(itemView2, itemView1, 'retrieving multiple times should same instance');
 
@@ -115,12 +117,12 @@ test("returning item from cache", function() {
 
   var itemView4 = view.itemViewForContentIndex(1, NO);
   equals(itemView4, itemView3, 'itemViewForContentIndex(1) [no reload] should return newly cached item after recache');
-  
+
 });
 
 // ..........................................................
 // ALTERNATE WAYS TO GET AN EXAMPLE VIEW
-// 
+//
 
 test("contentExampleViewKey is set and content has property", function() {
   var CustomView = SC.View.extend();
@@ -156,7 +158,7 @@ test("contentExampleViewKey is set and content property is empty", function() {
 
 // ..........................................................
 // GROUP EXAMPLE VIEW
-// 
+//
 
 test("delegate says content is group", function() {
   view.testAsGroup = YES ;
@@ -168,7 +170,7 @@ test("delegate says content is group", function() {
 
 test("contentGroupExampleViewKey is set and content has property", function() {
   view.testAsGroup = YES ;
-  
+
   var CustomView = SC.View.extend();
   var obj = content.objectAt(1);
   obj.set('foo', CustomView);
@@ -209,12 +211,12 @@ test("contentGroupExampleViewKey is set and content property is empty", function
 
 test("_contentGroupIndexes's cache should be properly invalidated", function() {
   view.testAsGroup = YES;
-  
+
   // force setup of range observers
   view.updateContentRangeObserver();
-  
+
   ok(view.get('_contentGroupIndexes').isEqual(SC.IndexSet.create(0, 3)), "contentGroupIndexes should have correct initial value");
-    
+
   view.get('content').removeAt(2, 1);
   ok(view.get('_contentGroupIndexes').isEqual(SC.IndexSet.create(0, 2)), "contentGroupIndexes should have updated value after deletion");
 });
@@ -222,12 +224,12 @@ test("_contentGroupIndexes's cache should be properly invalidated", function() {
 
 // ..........................................................
 // DELEGATE SUPPORT
-// 
+//
 
 test("consults delegate if set", function() {
   view.fixture = null; //break to make sure this is not used
   view.delegate = del;
-  
+
   var itemView = view.itemViewForContentIndex(1);
   ok(itemView, 'returns item view');
   shouldMatchFixture(itemView, del.fixture);
@@ -236,9 +238,9 @@ test("consults delegate if set", function() {
 test("consults content if implements mixin and delegate not set", function() {
   view.fixture = null; //break to make sure this is not used
   view.delegate = null;
-  
+
   SC.mixin(content, del) ; // add delegate methods to content
-  
+
   var itemView = view.itemViewForContentIndex(1);
   ok(itemView, 'returns item view');
   shouldMatchFixture(itemView, content.fixture);
@@ -250,7 +252,7 @@ test("prefers delegate over content if both implement mixin", function() {
   view.delegate = del;
   SC.mixin(content, del) ; // add delegate methods to content
   content.fixture = null ; //break
-  
+
   var itemView = view.itemViewForContentIndex(1);
   ok(itemView, 'returns item view');
   shouldMatchFixture(itemView, del.fixture);
@@ -258,12 +260,12 @@ test("prefers delegate over content if both implement mixin", function() {
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("after making an item visible then invisible again", function() {
 
   view.isVisibleInWindow = YES ;
-  
+
   // STEP 1- setup with some nowShowing
   SC.run(function() {
     view.set('fixtureNowShowing', SC.IndexSet.create(1));
@@ -272,8 +274,8 @@ test("after making an item visible then invisible again", function() {
   equals(view.get('childViews').length, 1, 'precond - should have a child view');
 
   var itemView = view.itemViewForContentIndex(1);
-  equals(itemView.get('parentView'), view, 'itemView has parent view');
-  
+  equals(itemView.get('parentView'), view, 'itemView has parent view after some nowShowing');
+
   // STEP 2- setup with NONE visible
   SC.run(function() {
     view.set('fixtureNowShowing', SC.IndexSet.create());
@@ -282,7 +284,7 @@ test("after making an item visible then invisible again", function() {
   equals(view.get('childViews').length, 0, 'precond - should have no childview');
 
   itemView = view.itemViewForContentIndex(1);
-  equals(itemView.get('parentView'), view, 'itemView has parent view');
+  equals(itemView.get('parentView'), view, 'itemView has parent view after none visible');
 
 
   // STEP 3- go back to nowShowing
@@ -293,8 +295,60 @@ test("after making an item visible then invisible again", function() {
   equals(view.get('childViews').length, 1, 'precond - should have a child view');
 
   itemView = view.itemViewForContentIndex(1);
-  equals(itemView.get('parentView'), view, 'itemView has parent view');
-  
+  equals(itemView.get('parentView'), view, 'itemView has parent view after back to some nowShowing');
+
+});
+
+// Editable Item Views.
+
+test("canDeleteContent sets isDeletable on the item views so they can visually indicate it", function () {
+  var itemView;
+
+  view.set('canDeleteContent', true);
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isDeletable'), true, 'itemView has isDeletable');
+
+  view.isVisibleInWindow = YES;
+  SC.run(function () {
+    view.set('isEditable', false);
+  });
+
+  view.set('isEditable', false);
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isDeletable'), false, 'itemView has isDeletable');
+});
+
+
+test("canEditContent sets isEditable on the item views so they can visually indicate it", function () {
+  var itemView;
+
+  view.set('canEditContent', true);
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isEditable'), true, 'itemView has isEditable');
+
+  view.isVisibleInWindow = YES;
+  SC.run(function () {
+    view.set('isEditable', false);
+  });
+
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isEditable'), false, 'itemView has isEditable');
 });
 
 
+test("canReorderContent sets isReorderable on the item views so they can visually indicate it", function () {
+  var itemView;
+
+  view.set('canReorderContent', true);
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isReorderable'), true, 'itemView has isReorderable');
+
+  view.isVisibleInWindow = YES;
+  SC.run(function () {
+    view.set('isEditable', false);
+  });
+
+  view.set('isEditable', false);
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isReorderable'), false, 'itemView has isReorderable');
+});

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

@@ -9,13 +9,13 @@ var view, content, contentController, pane, actionCalled = 0;
 
 module("SC.CollectionView Mouse Events", {
   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 });
     });
-    
+
     contentController = SC.ArrayController.create({
       content: content,
       allowsMultipleSelection: YES
@@ -25,40 +25,38 @@ module("SC.CollectionView Mouse Events", {
       content: contentController,
 
       layout: { top: 0, left: 0, width: 300, height: 500 },
-      
+
       layoutForContentIndex: function(idx) {
         return { left: 0, right: 0, top: idx * 50, height: 50 };
       },
-      
+
       isVisibleInWindow: YES,
       acceptsFirstResponder: YES,
       action: function() {
         actionCalled++;
       }
     });
-    
+
     pane = SC.MainPane.create();
     pane.appendChild(view);
     pane.append();
 
     SC.RunLoop.end();
   },
-  
+
   teardown: function() {
-    SC.RunLoop.begin();
-    pane.remove();
+    pane.destroy();
     actionCalled = 0;
-    SC.RunLoop.end();
   }
 });
 
-/* 
+/*
   Simulates clicking on the specified index.  If you pass verify as YES or NO
   also verifies that the item view is subsequently selected or not.
-  
+
   @param {SC.CollectionView} view the view
   @param {Number} index the index to click on
-  @param {Boolean} shiftKey simulate shift key pressed 
+  @param {Boolean} shiftKey simulate shift key pressed
   @param {Boolean} ctrlKey simulate ctrlKey pressed
   @param {SC.SelectionSet} expected expected selection
   @param {Number} delay delay before running the test (optional)
@@ -66,39 +64,39 @@ module("SC.CollectionView Mouse Events", {
 */
 function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
   var itemView = view.itemViewForContentIndex(index),
-      layer    = itemView.get('layer'), 
-      opts     = { shiftKey: shiftKey, ctrlKey: ctrlKey }, 
+      layer    = itemView.get('layer'),
+      opts     = { shiftKey: shiftKey, ctrlKey: ctrlKey },
       sel, ev, modifiers;
-      
+
   ok(layer, 'precond - itemView[%@] should have layer'.fmt(index));
-  
+
   ev = SC.Event.simulateEvent(layer, 'mousedown', opts);
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   ev = SC.Event.simulateEvent(layer, 'mouseup', opts);
   SC.Event.trigger(layer, 'mouseup', [ev]);
-  
+
   if (expected !== undefined) {
     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';
-      
+
       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
     };
-    
+
     if (delay) {
       stop() ; // stops the test runner
       setTimeout(f, delay) ;
     } else f() ;
   }
-  
+
   layer = itemView = null ;
 }
 
@@ -131,7 +129,7 @@ function selectionFromIndexSet(indexSet) {
 
 // ..........................................................
 // basic click
-// 
+//
 
 test("clicking on an item should select it", function() {
   clickOn(view, 3, NO, NO, selectionFromIndex(3));
@@ -168,7 +166,7 @@ test("clicking on a collection view with null content should not throw an error"
 
 // ..........................................................
 // ctrl-click mouse down
-// 
+//
 
 test("ctrl-clicking on unselected item should add to selection", function() {
   clickOn(view,3, NO, YES, selectionFromIndex(3));
@@ -184,7 +182,7 @@ test("ctrl-clicking on selected item should remove from selection", function() {
 
 // ..........................................................
 // shift-click mouse down
-// 
+//
 
 test("shift-clicking on an item below should extend the selection", function() {
   clickOn(view, 3, NO, NO, selectionFromIndex(3));
@@ -270,6 +268,8 @@ test("click on an item when isSelectable is false doesn't do anything", function
 });
 
 test("click on an item when isEnabled is false doesn't do anything", function() {
-  view.set('isEnabled', NO);
+  SC.run(function () {
+    view.set('isEnabled', NO);
+  });
   clickOn(view, 1, NO, NO, null);
 });