sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_simple.js

@@ -6,33 +6,32 @@
 // ==========================================================================
 
 /*
-  This test evaluates a plain list with no custom row heights, outlines, 
+  This test evaluates a plain list with no custom row heights, outlines,
   group views or any other non-standard behavior.
 */
 
-module("SC.ListView - simple list");
 
 // create a fake content array.  Generates a list with whatever length you
 // want of objects with a title based on the index.  Cannot mutate.
 var ContentArray = SC.Object.extend(SC.Array, {
-  
+
   length: 0,
-  
+
   objectAt: function(idx) {
     if (idx >= this.get('length')) return undefined;
-    
+
     var content = this._content, ret ;
     if (!content) content = this._content = [];
-    
+
     ret = content[idx];
     if (!ret) {
-      ret = content[idx] = SC.Object.create({ 
+      ret = content[idx] = SC.Object.create({
         title: "ContentItem %@".fmt(idx),
         isDone: (idx % 3)===0,
         unread: (Math.random() > 0.5) ? Math.floor(Math.random() * 100) : 0
       });
     }
-    
+
     return ret ;
   }
 });
@@ -48,12 +47,9 @@ var pane = SC.ControlTestPane.design()
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
       rowHeight: 20
-      
+
     })
   }));
-  
-pane.show(); // add a test to show the test pane
-window.pane = pane ;
 
 function verifyChildViewsMatch(views, set) {
   var indexes = set.clone();
@@ -66,7 +62,7 @@ function verifyChildViewsMatch(views, set) {
     }
     indexes.remove(idx);
   }, this);
-  
+
   if (indexes.get('length') === 0) {
     ok(YES, "all nowShowing indexes should have matching child views");
   } else {
@@ -74,14 +70,16 @@ function verifyChildViewsMatch(views, set) {
   }
 }
 
+module("SC.ListView - simple list", pane.standardSetup());
+
 // ..........................................................
 // BASIC RENDER TESTS
-// 
+//
 
 test("rendering only incremental portion", function() {
-  var listView = pane.view("basic").contentView; 
+  var listView = pane.view("basic").contentView;
   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');  
+  equals(listView.get('childViews').length, listView.get('nowShowing').get('length'), 'should have same number of childViews as nowShowing length');
 });
 
 test("scrolling by small amount should update incremental rendering", function() {
@@ -98,7 +96,7 @@ test("scrolling by small amount should update incremental rendering", function()
   SC.run(function() {
     scrollView.scrollTo(0,20);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(1,15);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
@@ -109,7 +107,7 @@ test("scrolling by small amount should update incremental rendering", function()
   SC.run(function() {
     scrollView.scrollTo(0,42);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(2,16);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
@@ -121,11 +119,11 @@ test("scrolling by small amount should update incremental rendering", function()
   SC.run(function() {
     scrollView.scrollTo(0,21);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(1,16);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
-  
+
 });

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

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module, test, htmlbody, ok, equals, same, stop, start */
 
 var pane = SC.ControlTestPane.design({ height: 32 })
   .add("basic", SC.ListItemView.design({
@@ -15,6 +15,7 @@ var pane = SC.ControlTestPane.design({ height: 32 })
   .add("full", SC.ListItemView.design({
     content: SC.Object.create({
       icon: "sc-icon-folder-16",
+      rightIcon: "sc-icon-help-16",
       title: "List Item",
       checkbox: YES,
       count: 23,
@@ -22,11 +23,13 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     }),
 
     hasContentIcon:  YES,
+    hasContentRightIcon:  YES,
     hasContentBranch: YES,
 
     contentValueKey: "title",
     contentCheckboxKey: 'checkbox',
     contentIconKey:  "icon",
+    contentRightIconKey:  "rightIcon",
     contentUnreadCountKey: 'count',
     contentIsBranchKey: 'branch',
 
@@ -37,6 +40,7 @@ var pane = SC.ControlTestPane.design({ height: 32 })
   .add("full - sel", SC.ListItemView.design({
     content: SC.Object.create({
       icon: "sc-icon-folder-16",
+      rightIcon: "sc-icon-help-16",
       title: "List Item",
       checkbox: YES,
       count: 23,
@@ -46,6 +50,7 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     isSelected: YES,
 
     hasContentIcon:  YES,
+    hasContentRightIcon:  YES,
     hasContentBranch: YES,
 
     contentValueKey: "title",
@@ -56,6 +61,7 @@ var pane = SC.ControlTestPane.design({ height: 32 })
 
     contentCheckboxKey: 'checkbox',
     contentIconKey:  "icon",
+    contentRightIconKey:  "rightIcon",
     contentUnreadCountKey: 'count',
     contentIsBranchKey: 'branch',
 
@@ -110,6 +116,53 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     contentValueKey: "title"
   }))
 
+  .add("rightIcon", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item",
+      rightIcon: "sc-icon-help-16"
+    }),
+
+    contentValueKey: "title",
+
+    contentRightIconKey:  "rightIcon",
+    hasContentRightIcon:  YES
+
+  }))
+
+  .add("rightIcon - noRightIcon", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item"
+    }),
+    contentValueKey: "title",
+    contentRightIconKey:  "rightIcon",
+    hasContentRightIcon:  YES
+  }))
+
+  .add("rightIcon - contentAndView", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item",
+      rightIcon: "sc-icon-help-16"
+    }),
+
+    rightIcon: "sc-icon-favorite-16",
+
+    contentValueKey: "title",
+
+    contentRightIconKey:  "rightIcon",
+    hasContentRightIcon:  YES
+
+  }))
+
+  .add("rightIcon - view", SC.ListItemView.design({
+    content: SC.Object.create({
+      title: "List Item"
+    }),
+
+    rightIcon: "sc-icon-favorite-16",
+
+    contentValueKey: "title"
+  }))
+
   .add("disclosure - YES", SC.ListItemView.design({
     content: SC.Object.create({ title: "List Item" }),
     contentValueKey: "title",
@@ -158,11 +211,7 @@ var pane = SC.ControlTestPane.design({ height: 32 })
     contentValueKey: "title",
     contentUnreadCountKey:  "count",
     outlineLevel: 2
-  })) ;
-
-pane.show();
-
-window.pane = pane ;
+  }));
 
 // ..........................................................
 // DETECTORS
@@ -203,8 +252,21 @@ function icon(view, spriteName) {
   }
 }
 
+function rightIcon(view, spriteName) {
+  var cq = view.$(), iconCQ = cq.find('img.right-icon');
+  if (spriteName === null) {
+    ok(!cq.hasClass('has-right-icon'), "should not have has-right-icon class");
+    equals(iconCQ.size(), 0, 'should not have image');
+  } else {
+    ok(cq.hasClass('has-right-icon'), "should have has-right-icon class");
+    equals(iconCQ.size(), 1, 'should have right-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");
@@ -232,7 +294,7 @@ function count(view, cnt) {
   var cq = view.$(), countCQ = cq.find('.count');
   if (cnt === null) {
     ok(!cq.hasClass('has-count'), "should not have has-count class");
-    equals(countCQ.size(), 0, 'should not have count') ;
+    equals(countCQ.size(), 0, 'should not have count');
   } else {
     ok(cq.hasClass('has-count'), "should have has-count class");
     equals(countCQ.size(), 1, 'should have count');
@@ -244,7 +306,7 @@ function branch(view, visible) {
   var cq = view.$(), branchCQ = cq.find('.branch');
   if (visible === null) {
     ok(!cq.hasClass('has-branch'), "should not have has-branch class");
-    equals(branchCQ.size(), 0, 'should not have branch') ;
+    equals(branchCQ.size(), 0, 'should not have branch');
   } else {
     ok(cq.hasClass('has-branch'), "should have has-branch class");
     equals(branchCQ.size(), 1, 'should have branch');
@@ -258,11 +320,12 @@ function branch(view, visible) {
 
 module("SC.ListItemView UI", pane.standardSetup());
 
-test("basic", function() {
+test("basic", function () {
   var view = pane.view('basic');
 
   basic(view, NO, NO);
   icon(view, null);
+  rightIcon(view, null);
   label(view, 'List Item');
   disclosure(view, null);
   checkbox(view, null);
@@ -270,10 +333,11 @@ test("basic", function() {
   branch(view, null);
 });
 
-test("full", function() {
+test("full", function () {
   var view = pane.view('full');
   basic(view, NO, NO);
   icon(view, 'sc-icon-folder-16');
+  rightIcon(view, 'sc-icon-help-16');
   label(view, 'List Item');
   disclosure(view, YES);
   checkbox(view, YES);
@@ -281,10 +345,11 @@ test("full", function() {
   branch(view, YES);
 });
 
-test("full - sel", function() {
+test("full - sel", function () {
   var view = pane.view('full - sel');
   basic(view, YES, NO);
   icon(view, 'sc-icon-folder-16');
+  rightIcon(view, 'sc-icon-help-16');
   label(view, 'List Item');
   disclosure(view, YES);
   checkbox(view, YES);
@@ -292,56 +357,78 @@ test("full - sel", function() {
   branch(view, YES);
 });
 
-test("icon", function() {
+test("icon", function () {
   var view = pane.view('icon');
   icon(view, 'sc-icon-folder-16');
 });
 
-test("icon defined but not in view or content", function() {
+test("icon defined but not in view or content", function () {
   var view = pane.view('icon - noIcon');
   icon(view, null);
 });
 
-test("icon defined in view and in content", function() {
+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() {
+test("icon defined only in view", function () {
   var view = pane.view('icon - view');
   icon(view, 'sc-icon-info-16');
 });
 
-test('disclosure', function() {
+test("rightIcon", function () {
+  var view = pane.view('rightIcon');
+  rightIcon(view, 'sc-icon-help-16');
+});
+
+test("rightIcon defined but not in view or content", function () {
+  var view = pane.view('rightIcon - noRightIcon');
+  rightIcon(view, null);
+});
+
+test("rightIcon defined in view and in content", function () {
+  var view = pane.view('rightIcon - contentAndView');
+  rightIcon(view, 'sc-icon-help-16');
+});
+
+test("rightIcon defined only in view", function () {
+  var view = pane.view('rightIcon - view');
+  rightIcon(view, 'sc-icon-favorite-16');
+});
+
+test('disclosure', function () {
   disclosure(pane.view('disclosure - YES'), YES);
   disclosure(pane.view('disclosure - NO'), NO);
 });
 
-test('checkbox', function() {
+test('checkbox', function () {
   checkbox(pane.view('checkbox - YES'), YES);
   checkbox(pane.view('checkbox - NO'), NO);
 });
 
-test('count', function() {
+test('count', function () {
   // no count should show when count = 0;
   count(pane.view('count - 0'), null);
   count(pane.view('count - 10'), 10);
 });
 
-test("outline - 1", function() {
+test("outline - 1", function () {
   var v = pane.view('outline - 1'),
       indent = v.get('outlineIndent');
-  ok(indent>0, 'precond - outlineIndent property should be > 0 (actual: %@)'.fmt(indent));
 
-  equals(v.$('.sc-outline').css('left'), indent*1+16 + "px", 'sc-outline div should be offset by outline ammount');
+  ok(indent > 0, 'precond - outlineIndent property should be > 0 (actual: %@)'.fmt(indent));
+
+  equals(v.$('.sc-outline').css('left'), indent * 1 + 16 + "px", 'sc-outline div should be offset by outline ammount');
 });
 
-test("outline - 2", function() {
+test("outline - 2", function () {
   var v = pane.view('outline - 2'),
       indent = v.get('outlineIndent');
-  ok(indent>0, 'precond - outlineIndent property should be > 0 (actual: %@)'.fmt(indent));
 
-  equals(v.$('.sc-outline').css('left'), indent*2+16 + "px", 'sc-outline div should be offset by outline ammount');
+  ok(indent > 0, 'precond - outlineIndent property should be > 0 (actual: %@)'.fmt(indent));
+
+  equals(v.$('.sc-outline').css('left'), indent * 2 + 16 + "px", 'sc-outline div should be offset by outline ammount');
 });
 
 // ..........................................................
@@ -363,14 +450,14 @@ function adjustContent(view, key, value) {
   SC.RunLoop.end();
 }
 
-test("changing label should change display", function() {
+test("changing label should change display", function () {
   var view = pane.view('full');
   adjustContent(view, 'title', 'FOO');
   label(view, 'FOO'); // verify change
 });
 
 
-test("changing disclosure value should update display", function() {
+test("changing disclosure value should update display", function () {
   var view = pane.view('full');
   adjustView(view, 'disclosureState', SC.BRANCH_CLOSED);
   disclosure(view, NO);
@@ -384,7 +471,7 @@ test("changing disclosure value should update display", function() {
   disclosure(view, YES);
 });
 
-test("changing checkbox value should update display", function() {
+test("changing checkbox value should update display", function () {
   var view = pane.view('full');
   adjustContent(view, 'checkbox', NO);
   checkbox(view, NO); // verify change
@@ -398,7 +485,7 @@ test("changing checkbox value should update display", function() {
   checkbox(view, YES);
 });
 
-test("changing count value should update display", function() {
+test("changing count value should update display", function () {
   var view = pane.view('full');
 
   adjustContent(view, 'count', 100);

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js

@@ -42,8 +42,6 @@
       contentView: iv
     });
 
-    pane.show(); // add a test to show the test pane
-
   // ..........................................................
   // TEST VIEWS
   //

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js

@@ -7,7 +7,7 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-var iconURL= sc_static('sc-icon-info-16.png');
+var iconURL = sc_static("sproutcore-32.png");
 var pane, view;
 
 module("SC.SegmentedView", {
@@ -60,3 +60,39 @@ test("Check that properties are mapped correctly", function() {
   equals(childViews[0].index, 0, 'Computed properties should match');
 });
 
+
+test("Check the values of value", function() {
+  equals(SC.isArray(view.get('value')), true, "the value should initially be an array");
+  equals(view.getPath('value.length'), 2, "the value array should have 2 items in it");
+  view.triggerItemAtIndex(1);
+  equals(SC.isArray(view.get('value')), false, "the value should not be an array if allowsMultipleSelection is false");
+  equals(view.get('value'), "Item2", "the second item should be selected.");
+
+  view.set('allowsMultipleSelection', true);
+  view.triggerItemAtIndex(2);
+  equals(SC.isArray(view.get('value')), true, "the value should be an array if allowsMultipleSelection is true");
+  equals(view.getPath('value.length'), 2, "the value array should have 2 items in it");
+  view.triggerItemAtIndex(1);
+  equals(view.getPath('value.length'), 1, "the value array should have 1 item in it");
+  view.triggerItemAtIndex(2);
+  equals(view.getPath('value.length'), 1, "the value array should have 1 items in it, because allowsEmptySelection is false");
+
+  view.set('allowsEmptySelection', true);
+  view.triggerItemAtIndex(2);
+  equals(view.getPath('value.length'), 0, "the value array should have 0 items in it,  because allowsEmptySelection is true");
+
+  view.set('allowsMultipleSelection', false);
+  view.triggerItemAtIndex(1);
+  equals(SC.isArray(view.get('value')), false, "the value should not be an array if allowsMultipleSelection is false again");
+  equals(view.get('value'), "Item2", "the second item should be selected.");
+  view.triggerItemAtIndex(2);
+  equals(view.get('value'), "Item3", "the third item should be selected.");
+
+  view.set('allowsEmptySelection', false);
+  view.triggerItemAtIndex(2);
+  equals(view.get('value'), "Item3", "the third item should still be selected, because allowsEmptySelection is false");
+
+  view.set('allowsEmptySelection', true);
+  view.triggerItemAtIndex(2);
+  equals(view.get('value'), null, "the value should go to null if allowsMultipleSelection is false and allowsEmptySelection is true.");
+});