sproutcore 1.0.1046 → 1.0.1049.pre.1

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // SC.LOG_BINDINGS = YES ;

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 var view, del, content;

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 var content, delegate ;

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 var content, delegate ;

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*

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

@@ -2,11 +2,11 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*
-  This test evaluates a plain list with no custom row heights, outlines, 
+  This test evaluates a list with custom row heights, outlines, 
   group views or any other non-standard behavior.
 */
 
@@ -60,8 +60,34 @@ var pane = SC.ControlTestPane.design()
 
     })
   }));
-  
+
+var pane2 = SC.ControlTestPane.design()
+  .add("Custom Row Heights 2", SC.ScrollView.design({
+    layout: { left: 0, right: 0, top: 0, height: 200 },
+    hasHorizontalScroller: NO,
+    contentView: SC.ListView.design({
+      content: ContentArray.create({ length: 100 }),
+      customRowHeightIndexes: SC.IndexSet.create(0,1000),
+      
+      contentIndexRowHeight: function(view, content, index) {
+        if (index % 2 === 0) {
+          return 17;
+        }
+        else {
+          return 48;
+        }
+      },
+      
+      contentValueKey: "title",
+      contentCheckboxKey: "isDone",
+      contentUnreadCountKey: "unread",
+      rowHeight: 48
+
+    })
+  }));
+
 pane.show(); // add a test to show the test pane
+pane2.show();
 window.pane = pane ;
 
 function verifyChildViewsMatch(views, set) {
@@ -119,7 +145,7 @@ test("scrolling by small amount should update incremental rendering", function()
   });
   
   // top line should have scrolled out of view
-  exp = SC.IndexSet.create(6,8);
+  exp = SC.IndexSet.create(5,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
@@ -138,6 +164,19 @@ test("scrolling by small amount should update incremental rendering", function()
   
 });
 
+test("the 'nowShowing' property should be correct when scrolling", function() {
+  var scrollView = pane2.view('Custom Row Heights 2'),
+      listView   = scrollView.contentView,
+      correctSet = SC.IndexSet.create(1, 7);
+  
+  // Scroll to point 36, which demonstrates a problem with the older list view
+  // contentIndexesInRect code.
+  SC.run(function() {
+    scrollView.scrollTo(0,36);
+  });
+  same(listView.get("nowShowing"), correctSet, 'nowShowing should %@'.fmt(correctSet));
+});
+
 // ..........................................................
 // CHANGING ROW HEIGHTS
 // 
@@ -146,7 +185,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
   var scrollView = pane.view('Custom Row Heights'),
       listView   = scrollView.contentView,
       exp;
-  
+
   same(listView.get('nowShowing'), SC.IndexSet.create(0,10), 'precond - nowShowing has incremental range');
   
   // adjust row height and then invalidate a portion range
@@ -156,7 +195,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
   });
 
   // nowShowing should adjust
-  same(listView.get('nowShowing'), SC.IndexSet.create(0,5), 'visible range should decrease since row heights for some rows doubled');
+  same(listView.get('nowShowing'), SC.IndexSet.create(0,4), '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/ui_simple.js

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*
@@ -79,7 +79,7 @@ function verifyChildViewsMatch(views, set) {
 
 test("rendering only incremental portion", function() {
   var listView = pane.view("basic").contentView; 
-  same(listView.get("nowShowing"), SC.IndexSet.create(0, 16), 'nowShowing should be smaller IndexSet');
+  ok(listView.getPath("nowShowing.length") < listView.get('length'), 'nowShowing should be a subset of content items');
   equals(listView.get('childViews').length, listView.get('nowShowing').get('length'), 'should have same number of childViews as nowShowing length');  
 });
 
@@ -87,16 +87,16 @@ test("scrolling by small amount should update incremental rendering", function()
   var scrollView = pane.view('basic'),
       listView   = scrollView.contentView,
       exp;
-  
-  same(listView.get('nowShowing'), SC.IndexSet.create(0,16), 'precond - nowShowing has incremental range');
+
+  ok(listView.getPath('nowShowing.length') < listView.get('length'), 'precond - nowShowing has incremental range');
 
   // SCROLL DOWN ONE LINE
   SC.run(function() {
-    scrollView.scrollTo(0,21);
+    scrollView.scrollTo(0,20);
   });
   
   // top line should have scrolled out of view
-  exp = SC.IndexSet.create(1,16);
+  exp = SC.IndexSet.create(1,15);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
@@ -119,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(1,16);
+  exp = SC.IndexSet.create(1,15);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);

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

@@ -2,7 +2,7 @@
 // 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)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 /*global module test htmlbody ok equals same stop start */
@@ -28,7 +28,9 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     contentCheckboxKey: 'checkbox',
     contentIconKey:  "icon",
     contentUnreadCountKey: 'count',
-    contentIsBranchKey: 'branch'
+    contentIsBranchKey: 'branch',
+    
+    disclosureState: SC.BRANCH_OPEN
 
   }))
 
@@ -55,7 +57,9 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     contentCheckboxKey: 'checkbox',
     contentIconKey:  "icon",
     contentUnreadCountKey: 'count',
-    contentIsBranchKey: 'branch'
+    contentIsBranchKey: 'branch',
+    
+    disclosureState: SC.BRANCH_OPEN
 
   }))
   
@@ -71,6 +75,43 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     hasContentIcon:  YES
 
   }))
+  
+  .add("icon - contentandview", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item",
+      icon: "sc-icon-folder-16"
+    }),
+
+    icon: "sc-icon-info-16",
+
+    contentValueKey: "title",
+
+    contentIconKey:  "icon",
+    hasContentIcon:  YES
+
+  }))
+  
+  .add("icon - view", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item"
+    }),
+
+    icon: "sc-icon-info-16",
+
+    contentValueKey: "title"
+  }))
+  
+  .add("disclosure - YES", SC.ListItemView.design({ 
+    content: SC.Object.create({ title: "List Item" }),
+    contentValueKey: "title",
+    disclosureState: SC.BRANCH_OPEN
+  }))
+
+  .add("disclosure - NO", SC.ListItemView.design({ 
+    content: SC.Object.create({ title: "List Item" }),
+    contentValueKey: "title",
+    disclosureState: SC.BRANCH_CLOSED
+  }))
 
   .add("checkbox - YES", SC.ListItemView.design({ 
     content: SC.Object.create({ title: "List Item", checkbox: YES }),
@@ -129,7 +170,7 @@ function basic(view, sel, disabled) {
   equals(cq.hasClass('disabled'), !!disabled, 'expect disabled class');
   
   var idx = view.get('contentIndex');
-  var evenOrOdd = (idx % 2 == 0) ? 'even' : 'odd';
+  var evenOrOdd = (idx % 2 === 0) ? 'even' : 'odd';
   ok(cq.hasClass(evenOrOdd), 'should have an %@ class'.fmt(evenOrOdd));
 }
 
@@ -142,43 +183,63 @@ function label(view, labelText) {
 }
 
 function icon(view, spriteName) {
+  var cq = view.$(), iconCQ = cq.find('img.icon');
   if (spriteName === null) {
-    equals(view.$('img.icon').size(), 0, 'should not have image');
+    ok(!cq.hasClass('has-icon'), "should not have has-icon class");
+    equals(iconCQ.size(), 0, 'should not have image');
   } else {
-    var cq = view.$('img.icon');
-    equals(cq.size(), 1, 'should have icon');
-    ok(cq.hasClass(spriteName), 'icon should have class name %@'.fmt(spriteName));
+    ok(cq.hasClass('has-icon'), "should have has-icon class");
+    equals(iconCQ.size(), 1, 'should have icon');
+    ok(iconCQ.hasClass(spriteName), 'icon should have class name %@'.fmt(spriteName));
+  }
+}
+
+function disclosure(view, state) {
+  var cq = view.$(), disclosureCQ = cq.find('.sc-disclosure-view');
+  if (state === null) {
+    ok(!cq.hasClass('has-disclosure'), "should not have has-disclosure class");
+    equals(disclosureCQ.size(), 0, "should not have disclosure");
+  } else {
+    ok(cq.hasClass('has-disclosure'), "should have has-disclosure class");
+    equals(disclosureCQ.size(), 1, "should have disclosure element");
+    equals(disclosureCQ.hasClass('sel'), state === true, "disclosure expects sel class");
   }
 }
 
 function checkbox(view, state) {
+  var cq = view.$(), checkboxCQ = cq.find('.sc-checkbox-view');
   if (state === null) {
-    equals(view.$('.sc-checkbox-view').size(), 0, 'should not have checkbox');
+    ok(!cq.hasClass('has-checkbox'), "should not have has-checkbox class");
+    equals(checkboxCQ.size(), 0, 'should not have checkbox');
   } else {
-    var cq =view.$('.sc-checkbox-view');
-    equals(cq.size(), 1, 'should have checkbox element');
-    equals(cq.hasClass('sel'), state === true, 'expects sel class');
-    equals(cq.hasClass('mixed'), state === SC.MIXED_STATE, 'expects mixed class');
+    ok(cq.hasClass('has-checkbox'), "should have has-checkbox class");
+    equals(checkboxCQ.size(), 1, 'should have checkbox element');
+    equals(checkboxCQ.hasClass('sel'), state === true, 'expects sel class');
+    equals(checkboxCQ.hasClass('mixed'), state === SC.MIXED_STATE, 'expects mixed class');
   }
 }
 
 function count(view, cnt) {
+  var cq = view.$(), countCQ = cq.find('.count');
   if (cnt === null) {
-    equals(view.$('.count').size(), 0, 'should not have count') ;
+    ok(!cq.hasClass('has-count'), "should not have has-count class");
+    equals(countCQ.size(), 0, 'should not have count') ;
   } else {
-    var cq = view.$('.count');
-    equals(cq.size(), 1, 'should have count');
-    equals(cq.text(), cnt.toString(), 'should have count');
+    ok(cq.hasClass('has-count'), "should have has-count class");
+    equals(countCQ.size(), 1, 'should have count');
+    equals(countCQ.text(), cnt.toString(), 'should have count text');
   }
 }
 
 function branch(view, visible) {
+  var cq = view.$(), branchCQ = cq.find('.branch');
   if (visible === null) {
-    equals(view.$('.branch').size(), 0, 'should not have branch') ;
+    ok(!cq.hasClass('has-branch'), "should not have has-branch class");
+    equals(branchCQ.size(), 0, 'should not have branch') ;
   } else {
-    var cq = view.$('.branch');
-    equals(cq.size(), 1, 'should have branch');
-    equals(cq.hasClass('branch-visible'), visible, 'is visible');
+    ok(cq.hasClass('has-branch'), "should have has-branch class");
+    equals(branchCQ.size(), 1, 'should have branch');
+    equals(branchCQ.hasClass('branch-visible'), visible, 'is visible');
   }
 }
 
@@ -194,6 +255,7 @@ test("basic", function() {
   basic(view, NO, NO);
   icon(view, null);
   label(view, 'List Item');
+  disclosure(view, null);
   checkbox(view, null);
   count(view, null);
   branch(view, null);
@@ -204,6 +266,7 @@ test("full", function() {
   basic(view, NO, NO);
   icon(view, 'sc-icon-folder-16');
   label(view, 'List Item');
+  disclosure(view, YES);
   checkbox(view, YES);
   count(view, 23);
   branch(view, YES);
@@ -214,6 +277,7 @@ test("full - sel", function() {
   basic(view, YES, NO);
   icon(view, 'sc-icon-folder-16');
   label(view, 'List Item');
+  disclosure(view, YES);
   checkbox(view, YES);
   count(view, 23);
   branch(view, YES);
@@ -224,6 +288,21 @@ test("icon", function() {
   icon(view, 'sc-icon-folder-16');
 });
 
+test("icon defined in view and in content", function() {
+  var view = pane.view('icon - contentandview');
+  icon(view, 'sc-icon-folder-16');
+});
+
+test("icon defined only in view", function() {
+  var view = pane.view('icon - view');
+  icon(view, 'sc-icon-info-16');
+});
+
+test('disclosure', function() {
+  disclosure(pane.view('disclosure - YES'), YES);
+  disclosure(pane.view('disclosure - NO'), NO);
+});
+
 test('checkbox', function() {
   checkbox(pane.view('checkbox - YES'), YES);
   checkbox(pane.view('checkbox - NO'), NO);
@@ -255,6 +334,12 @@ test("outline - 2", function() {
 // EDITING CONTENT
 // 
 
+function adjustView(view, key, value) {
+  SC.RunLoop.begin();
+  view.set(key, value);
+  SC.RunLoop.end();
+}
+
 // gets the view content and adjusts the value inside of a runloop, ensuring
 // the UI gets an update also.
 function adjustContent(view, key, value) {
@@ -270,10 +355,33 @@ test("changing label should change display", function() {
   label(view, 'FOO'); // verify change
 });
 
+
+test("changing disclosure value should update display", function() {
+  var view = pane.view('full');
+  adjustView(view, 'disclosureState', SC.BRANCH_CLOSED);
+  disclosure(view, NO);
+  
+  // changing to leaf node should remove disclosure view
+  adjustView(view, 'disclosureState', SC.LEAF_NODE);
+  disclosure(view, null);
+  
+  // changing back to open/closed should add the disclosure back
+  adjustView(view, 'disclosureState', SC.BRANCH_OPEN);
+  disclosure(view, YES);
+});
+
 test("changing checkbox value should update display", function() {
   var view = pane.view('full');
   adjustContent(view, 'checkbox', NO);
   checkbox(view, NO); // verify change
+  
+  // changing to null should remove checkbox view
+  adjustContent(view, 'checkbox', null);
+  checkbox(view, null);
+
+  // changing back to YES should add the checkbox back
+  adjustContent(view, 'checkbox', YES);
+  checkbox(view, YES);
 });
 
 test("changing count value should update display", function() {