sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -29,6 +29,19 @@ test("10 index", function() {
   equals(view.contentIndexForLayerId(layerId), 10, 'should parse out idx');
 });
 
+test("with custom layerId", function () {
+  var layerId,
+      contentIndex;
+  view.set('layerId', 'my-custom-layer-id');
+  layerId = view.layerIdFor(10);
+  ok(layerId.indexOf('my-custom-layer-id') === 0, 'index layerId uses custom layerId prefix');
+  contentIndex = view.contentIndexForLayerId(layerId);
+  equals(contentIndex, 10, 'should parse out index from content index layerId');
+
+  contentIndex = view.contentIndexForLayerId('my-custom-layer-id-100');
+  equals(contentIndex, 100, 'should parse out index with custom layerId');
+});
+
 // ..........................................................
 // TEST SPECIAL PARSING CASES
 // 
@@ -62,4 +75,3 @@ test("parse empty string", function() {
 test("parse garbage", function() {
   equals(view.contentIndexForLayerId(234), null, 'should return null');
 });
-

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

@@ -9,19 +9,19 @@ var view, content1, content2 ;
 
 module("SC.CollectionView.length", {
   setup: function() {
-    
+
     // stub in collection view to verify that proper method are called
     view = SC.CollectionView.create({
-      
+
       observer: CoreTest.stub('observer(length)').observes('length'),
-      computeLayout: CoreTest.stub('computeLayout'),
-      
+      computeLayout: CoreTest.stub('computeLayout', SC.CollectionView.prototype.computeLayout),
+
       reset: function(){
         this.observer.reset();
         this.computeLayout.reset();
-      }    
+      }
     });
-    
+
     content1 = "a b c".w();
     content2 = "d e f g h".w();
   }
@@ -47,9 +47,9 @@ test("changing the content should update length & notify", function() {
   view.set('content', content1);
   view.reset(); // don't care.
   ok(content1.get('length') !== content2.get('length'), 'precond - content1.length should not equal content2.length');
-  
+
   view.set('content', content2);
-  
+
   equals(view.get('length'), content2.get('length'), 'view.length should equal new length');
   view.observer.expect(1);
 });
@@ -57,7 +57,7 @@ test("changing the content should update length & notify", function() {
 test("modifying content to make it shorter should update view length and notify",function() {
   view.set('content', content1);
   view.reset(); // don't care.
-  
+
   var len = content1.get('length');
   content1.removeAt(1);
 

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

@@ -253,6 +253,14 @@ test("clicking on an unselected item should select it and clear the previous sel
   clickOn(view, 3, NO, NO, selectionFromIndex(3));
 });
 
+test("clicking on an unselected item should fire action when actOnSelect is true", function() {
+  view.set('actOnSelect', YES);
+
+  equals(actionCalled, 0, "precond - action hasn't been called");
+  clickOn(view, 1, NO, NO);
+  equals(actionCalled, 1, "Action called when item is selected");
+});
+
 test("clicking on an unselected item should fire action when useToggleSelection is true and actOnSelect is true", function() {
   view.set('useToggleSelection', YES);
   view.set('actOnSelect', YES);
@@ -262,6 +270,16 @@ test("clicking on an unselected item should fire action when useToggleSelection
   equals(actionCalled, 1, "Action called when item is selected");
 });
 
+test("clicking on an unselected item should fire action when useToggleSelection is true and selectOnMouseDown is true and actOnSelect is true", function() {
+  view.set('actOnSelect', YES);
+  view.set('useToggleSelection', YES);
+  view.set('selectOnMouseDown', YES);
+
+  equals(actionCalled, 0, "precond - action hasn't been called");
+  clickOn(view, 1, NO, NO);
+  equals(actionCalled, 1, "Action called when item is selected");
+});
+
 test("click on an item when isSelectable is false doesn't do anything", function() {
   view.set('isSelectable', NO);
   clickOn(view, 1, NO, NO, null);

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

@@ -30,6 +30,11 @@ module("SC.DateFieldView", {
         value: SC.DateTime.create({ hour: 11, minute: 20 }),
         showDate: NO,
         showTime: YES
+      }),
+      SC.DateFieldView.extend({
+        formatDateTime: '%y-%m-%d %I:%M:%S',
+        value: SC.DateTime.create({ day: 1, month: 1, year: 2010, hour: 11, minute: 20, second: 10 }),
+        showTime: YES,
       })]
     });
     pane.append(); // make sure there is a layer...
@@ -38,6 +43,7 @@ module("SC.DateFieldView", {
     view0 = pane.childViews[0];
     view1 = pane.childViews[1];
     view2 = pane.childViews[2];
+    view3 = pane.childViews[3];
   },
 
   teardown: function() {
@@ -102,3 +108,101 @@ test("isEnabled=YES isEditable=YES should not add disable or readOnly attribute"
   ok(!view0.$input().attr('disabled'), 'should not have disabled attribute');
   ok(!view0.$input().attr('readOnly'), 'should not have readOnly attribute');
 });
+
+test("Verify the format property", function () {
+  SC.run(function () {
+    view0.set('showDate', true);
+    view0.set('showTime', true);
+    equals(view0.get('format'), view0.get('formatDateTime'), "The format should match");
+    view0.set('formatDateTime', '%d-%m-%Y @ %I:%M %p');
+    equals(view0.get('format'), '%d-%m-%Y @ %I:%M %p', "The format should match");
+
+    view0.set('showTime', false);
+    equals(view0.get('format'), view0.get('formatDate'), "The format should match");
+    view0.set('formatDate', '%d-%m-%Y');
+    equals(view0.get('format'), '%d-%m-%Y', "The format should match");
+
+    view0.set('showDate', false);
+    view0.set('showTime', true);
+    equals(view0.get('format'), view0.get('formatTime'), "The format should match");
+    view0.set('formatTime', '@ %I:%M %p');
+    equals(view0.get('format'), '@ %I:%M %p', "The format should match");
+  });
+});
+
+test("test insertText method", function() {
+  // view1: dd/mm/yyyy
+  view1.set('value', view1.get('value').adjust({ month: 2 }));
+  equals(view1.get('fieldValue'), '01/02/2010 11:20 AM', 'PRELIM: Field value should be equal');
+
+  view1.insertText('3');
+  view1.insertText('1');
+  equals(view1.get('fieldValue'), '13/02/2010 11:20 AM', 'Field value should be equal');
+
+  view1.insertText('2');
+  equals(view1.get('fieldValue'), '12/02/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('0');
+  view1.insertText('2');
+  equals(view1.get('fieldValue'), '02/02/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('5');
+  view1.insertText('2');
+  equals(view1.get('fieldValue'), '25/02/2010 11:20 AM', 'Field value should be equal');
+
+  view1.insertText('/');
+  view1.insertText('2');
+  equals(view1.get('fieldValue'), '25/02/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('0');
+  view1.insertText('3');
+  equals(view1.get('fieldValue'), '25/03/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('9');
+  equals(view1.get('fieldValue'), '25/03/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('/');
+  view1.insertText('0');
+  equals(view1.get('fieldValue'), '25/03/2010 11:20 AM', 'Field value should be equal');
+  view1.insertText('0');
+  equals(view1.get('fieldValue'), '25/03/1000 11:20 AM', 'Field value should be equal');
+  view1.insertText('2');
+  view1.insertText('0');
+  view1.insertText('1');
+  view1.insertText('2');
+  equals(view1.get('fieldValue'), '25/03/2012 11:20 AM', 'Field value should be equal');
+  view1.insertText('/');
+  view1.insertText('0');
+  equals(view1.get('fieldValue'), '25/03/2012 10:20 AM', 'Field value should be equal');
+  view1.insertText('9');
+  equals(view1.get('fieldValue'), '25/03/2012 09:20 AM', 'Field value should be equal');
+  view1.insertText('9');
+  view1.insertText('9');
+  equals(view1.get('fieldValue'), '25/03/2012 09:20 AM', 'Field value should be equal');
+  view1.insertText('/');
+  view1.insertText('9');
+  equals(view1.get('fieldValue'), '25/03/2012 09:09 AM', 'Field value should be equal');
+  view1.insertText('9');
+  equals(view1.get('fieldValue'), '25/03/2012 09:09 AM', 'Field value should be equal');
+
+  // view3 %y-%m-%d %I:%M:%S
+  view3.set('activeSelection', 5);
+  view3.insertText('9');
+  equals(view3.get('fieldValue'), '10-01-01 11:20:09', 'Field value should be equal');
+  view3.insertText('8');
+  equals(view3.get('fieldValue'), '10-01-01 11:20:09', 'Field value should be equal');
+  view3.insertText('5');
+  view3.insertText('5');
+  equals(view3.get('fieldValue'), '10-01-01 11:20:55', 'Field value should be equal');
+
+  view3.set('activeSelection', 0);
+  view3.insertText('2');
+  view3.insertText('5');
+  equals(view3.get('fieldValue'), '25-01-01 11:20:55', 'Field value should be equal');
+  view3.insertText('0');
+  view3.insertText('0');
+  equals(view3.get('fieldValue'), '00-01-01 11:20:55', 'Field value should be equal');
+  view3.insertText('9');
+  equals(view3.get('fieldValue'), '09-01-01 11:20:55', 'Field value should be equal');
+  view3.insertText('9');
+  equals(view3.get('fieldValue'), '99-01-01 11:20:55', 'Field value should be equal');
+  view3.insertText('1');
+  view3.insertText('0');
+  view3.insertText('0');
+  equals(view3.get('fieldValue'), '00-01-01 11:20:55', 'Field value should be equal');
+});

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

@@ -4,8 +4,7 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
-/*global module test htmlbody ok equals same stop start */
+/*globals module, test, ok, equals */
 
 (function() {
 	var pane = SC.ControlTestPane.design()
@@ -41,60 +40,60 @@
 	test("basic", function() {
 		var view = pane.view('diclosure');
 		ok(!view.$().hasClass('disabled'), 'should not have disabled class');
-	    ok(!view.$().hasClass('sel'), 'should not have sel class');
+	  ok(!view.$().hasClass('sel'), 'should not have sel class');
 		ok(!view.get('value'), 'should not be opened');
-	    // ok(!input.attr('checked'), 'input should not be opened');
-	    // ok(!input.attr('disabled'), 'input should not be disabled');
-	  });
+    // ok(!input.attr('checked'), 'input should not be opened');
+    // ok(!input.attr('disabled'), 'input should not be disabled');
+  });
 
-	  test("selected", function() {
-	    var view = pane.view('selected');
-	    ok(!view.$().hasClass('disabled'), 'should not have disabled class');
-	    ok(view.$().hasClass('sel'), 'should have sel class');
-		ok(view.get('value'), 'should be opened');
-	    // ok(input.attr('checked'), 'input should be opened');
-	    // ok(!input.attr('disabled'), 'input should not be disabled');
-	  });
+  test("selected", function() {
+    var view = pane.view('selected');
+    ok(!view.$().hasClass('disabled'), 'should not have disabled class');
+    ok(view.$().hasClass('sel'), 'should have sel class');
+	  ok(view.get('value'), 'should be opened');
+    // ok(input.attr('checked'), 'input should be opened');
+    // ok(!input.attr('disabled'), 'input should not be disabled');
+  });
 
-	  test("disabled", function() {
-	    var view = pane.view('disabled');
-	    ok(view.$().hasClass('disabled'), 'should have disabled class');
-	    ok(!view.$().hasClass('sel'), 'should not have sel class');
-		ok(!view.get('value'), 'should not be opened');
-	    // ok(!input.attr('checked'), 'input should not be opened');
-	    // ok(input.attr('disabled'), 'input should be disabled');
-	  });
+  test("disabled", function() {
+    var view = pane.view('disabled');
+    ok(view.$().hasClass('disabled'), 'should have disabled class');
+    ok(!view.$().hasClass('sel'), 'should not have sel class');
+	  ok(!view.get('value'), 'should not be opened');
+    // ok(!input.attr('checked'), 'input should not be opened');
+    // ok(input.attr('disabled'), 'input should be disabled');
+  });
 
-	  test("disabled - selected", function() {
-	    var view = pane.view('selected - disabled');
-	    ok(view.$().hasClass('disabled'), 'should have disabled class');
-	    ok(view.$().hasClass('sel'), 'should have sel class');
-		ok(view.get('value'), 'should be opened');
-	    // ok(input.attr('checked'), 'input should be opened');
-	    // ok(input.attr('disabled'), 'input should be disabled');
-	  });
+  test("disabled - selected", function() {
+    var view = pane.view('selected - disabled');
+    ok(view.$().hasClass('disabled'), 'should have disabled class');
+    ok(view.$().hasClass('sel'), 'should have sel class');
+	  ok(view.get('value'), 'should be opened');
+    // ok(input.attr('checked'), 'input should be opened');
+    // ok(input.attr('disabled'), 'input should be disabled');
+  });
 
-    test("aria role should be button for disclosure", function() {
-      var view = pane.view('aria-role');
-      equals(view.$().attr('role'), 'button', 'aria-role should be button');
-    });
+  test("aria role should be button for disclosure", function() {
+    var view = pane.view('aria-role');
+    equals(view.$().attr('role'), 'button', 'aria-role should be button');
+  });
 
-    test("aria label should be present", function() {
-      var view = pane.view('aria-label');
-      var labelled_by = document.getElementById(view.$().attr('aria-labelledby'));
-      equals(view.$('span.sc-button-label')[0], labelled_by, 'aria-labelledby should be the label element');
-    });
+  test("aria label should be present", function() {
+    var view = pane.view('aria-label');
+    var labelled_by = document.getElementById(view.$().attr('aria-labelledby'));
+    equals(view.$('span.sc-button-label')[0], labelled_by, 'aria-labelledby should be the label element');
+  });
 
-    test("aria pressed should be true if value is yes", function() {
-      var view = pane.view('aria-expanded');
-      equals(view.$().attr('aria-expanded'), 'true', 'aria-expanded should be true');
-    });
+  test("aria pressed should be true if value is yes", function() {
+    var view = pane.view('aria-expanded');
+    equals(view.$().attr('aria-expanded'), 'true', 'aria-expanded should be true');
+  });
 
-    test("aria pressed should be false if value is no while the disclosure is disabled", function() {
-      var view = pane.view('aria-expanded-disabled');
-      var labelled_by = document.getElementById(view.$().attr('aria-labelledby'));
-      equals(view.$('span.sc-button-label')[0], labelled_by, 'aria-labelledby should be the label element even if disabled');
-      equals(view.$().attr('aria-expanded'), 'false', 'aria-expanded should be false');
-    });
+  test("aria pressed should be false if value is no while the disclosure is disabled", function() {
+    var view = pane.view('aria-expanded-disabled');
+    var labelled_by = document.getElementById(view.$().attr('aria-labelledby'));
+    equals(view.$('span.sc-button-label')[0], labelled_by, 'aria-labelledby should be the label element even if disabled');
+    equals(view.$().attr('aria-expanded'), 'false', 'aria-expanded should be false');
+  });
 
 })();

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/drag_and_drop.js

@@ -4,7 +4,7 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
+/*globals module, test, ok, equals, start, stop */
 /*
   This test evaluates drag and drop support for SC.GridView
 */
@@ -65,7 +65,7 @@ test("drag on default grid view", function() {
   itemView = gridView.itemViewForContentIndex(0);
   frame = itemView.get('frame');
   layer = itemView.get('layer');
-  ev = SC.Event.simulateEvent(layer, 'mousedown', { clientX: frame.x, clientY: frame.y });
+  ev = SC.Event.simulateEvent(layer, 'mousedown', { pageX: frame.x, pageY: frame.y });
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   ev = SC.Event.simulateEvent(layer, 'mousemove');
@@ -87,19 +87,21 @@ test("drag on grid view with SC.DROP_ON support", function() {
     gridView = pane.view("basic").get('contentView');
 
   // Configure the view to accept drop on.
-  gridView.set('canReorderContent', YES);
-  gridView.set('isDropTarget', YES);
-  gridView.set('delegate', SC.Object.create(SC.CollectionViewDelegate, {
-     collectionViewValidateDragOperation: function(view, drag, op, proposedInsertionIndex, proposedDropOperation) {
-      return SC.DRAG_ANY;
-    }
-  }));
+  SC.run(function () {
+    gridView.set('canReorderContent', YES);
+    gridView.set('isDropTarget', YES);
+    gridView.set('delegate', SC.Object.create(SC.CollectionViewDelegate, {
+       collectionViewValidateDragOperation: function(view, drag, op, proposedInsertionIndex, proposedDropOperation) {
+        return SC.DRAG_ANY;
+      }
+      }));
+  });
 
   itemView = gridView.itemViewForContentIndex(0);
   frame = itemView.get('frame');
   layer = itemView.get('layer');
 
-  ev = SC.Event.simulateEvent(layer, 'mousedown', { clientX: frame.x, clientY: frame.y });
+  ev = SC.Event.simulateEvent(layer, 'mousedown', { pageX: frame.x, pageY: frame.y });
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   var f = function() {
@@ -158,18 +160,19 @@ test("insertion point when drag on grid view", function() {
     gridView = pane.view("basic").get('contentView');
 
   // Configure the view to accept drop on.
-  gridView.set('canReorderContent', YES);
+  SC.run(function () {
+    gridView.set('canReorderContent', YES);
+  });
 
   itemView = gridView.itemViewForContentIndex(0);
   frame = itemView.get('frame');
   layer = itemView.get('layer');
 
-  ev = SC.Event.simulateEvent(layer, 'mousedown', { clientX: frame.x, clientY: frame.y });
+  ev = SC.Event.simulateEvent(layer, 'mousedown', { pageX: frame.x, pageY: frame.y });
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   var f = function() {
-    var halfWidth,
-      itemView2,
+    var itemView2,
       point;
 
     ev = SC.Event.simulateEvent(layer, 'mousemove');
@@ -205,18 +208,19 @@ test("insertion point when cancel drag on grid view", function() {
     layer,
     gridView = pane.view("basic").get('contentView');
 
-  gridView.set('canReorderContent', YES);
+  SC.run(function () {
+    gridView.set('canReorderContent', YES);
+  });
 
   itemView = gridView.itemViewForContentIndex(0);
   frame = itemView.get('frame');
   layer = itemView.get('layer');
 
-  ev = SC.Event.simulateEvent(layer, 'mousedown', { clientX: frame.x, clientY: frame.y });
+  ev = SC.Event.simulateEvent(layer, 'mousedown', { pageX: frame.x, pageY: frame.y });
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   var f = function() {
-    var halfWidth,
-      itemView2,
+    var itemView2,
       point;
 
     ev = SC.Event.simulateEvent(layer, 'mousemove');

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

@@ -4,7 +4,7 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*global module, test, same, CoreTest */
+/*global module, test, same, ok, CoreTest */
 
 
 var scrollView, view;
@@ -147,23 +147,35 @@ test("Optimized re-position of item views when the frame changes.", function ()
   update to fit the new number of rows.
 */
 test("Adjusts layout when the itemsPerRow changes.", function () {
-  view.adjustLayout.expect(1);
+  // adjustLayout is called once on initialization so that the layout "style" that the view will be using
+  // is known.
+  view.adjustLayout.expect(2);
 
   SC.RunLoop.begin();
   view.notifyPropertyChange('frame');
   SC.RunLoop.end();
 
-  view.adjustLayout.expect(1);
+  view.adjustLayout.expect(2);
 
   SC.RunLoop.begin();
   view.adjust('height', 500);
   SC.RunLoop.end();
 
-  view.adjustLayout.expect(1);
+  view.adjustLayout.expect(2);
 
   SC.RunLoop.begin();
   view.adjust('width', 400);
   SC.RunLoop.end();
 
-  view.adjustLayout.expect(2);
+  view.adjustLayout.expect(3);
+});
+
+test("computeLayout gives back sane values when itemsPerRow is 0", function () {
+  SC.RunLoop.begin();
+  view.adjust('width', 0);
+  SC.RunLoop.end();
+
+  var layout = view.computeLayout();
+  var minHeightIsInfinity = layout.minHeight === Infinity;
+  ok(!minHeightIsInfinity, "SC.GridView#computeLayout should not have Infinity as value for layout.minHeight");
 });