sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js

@@ -108,7 +108,7 @@ SC.View.reopen(
     - `dataSource` --  Optional object that will provide the data for the drag to
       be consumed by the drop target.  If you do not pass this parameter or the
       data hash, then the source object will be used if it implements the
-      SC.DragDataSource protocol.
+      SC.DragDataSourceProtocol protocol.
 
     - `anchorView` -- if you pass this optional view, then the drag will only be
       allowed to happen within this view.  The ghostView will actually be added
@@ -294,7 +294,7 @@ SC.Drag = SC.Object.extend(
     a drag dynamically.  The data source can and often is the drag source
     object itself.
 
-    Data Source objects must comply with the `SC.DragDataSource` interface.  If
+    Data Source objects must comply with the `SC.DragDataSourceProtocol` interface.  If
     you do not want to implement this interface, you can provide the data
     directly with the data property.
 
@@ -303,7 +303,7 @@ SC.Drag = SC.Object.extend(
     these properties.
 
     @readOnly
-    @type SC.DragDataSource
+    @type SC.DragDataSourceProtocol
   */
   dataSource: null,
 
@@ -1054,7 +1054,7 @@ SC.Drag.mixin(
     isDropTarget property set to `YES`.  You generally will not need to call it
     yourself.
 
-    @param {SC.View} target a view implementing the SC.DropTarget protocol
+    @param {SC.View} target a view implementing the SC.DropTargetProtocol protocol
   */
   addDropTarget: function (target) {
     this._dropTargets[SC.guidFor(target)] = target;

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js

@@ -116,27 +116,43 @@ test("Verify SC.PanelPane#isModal", function() {
   SC.run(function () {
     pane.destroy();
   });
-
-  // Tests an edge case where isModal turns YES during a transition out.
-  pane = SC.PanelPane.create({
-    contentView: SC.View,
-    modalPane: SC.ModalPane.create(),
-    isModal: NO,
-    transitionOut: SC.View.FADE_OUT,
-    transitionOutOptions: { duration: 0.1 }
-  });
-
-  SC.run(function () {
-    pane.append();
-
-    pane.remove(); // trigger transition and then willRemoveFromDocument
-  });
-  pane.set('isModal', YES);
-  equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not add modal pane when isModal becomes YES while transitioning out");
-
-  SC.run(function () {
-    pane.destroy();
-
-    equals(pane.get('viewState'), SC.CoreView.UNRENDERED);
-  });
 });
+
+test("Should changing isModal when a pane is transitioning out not append the modal pane?");
+/*
+  Previously, if the panel pane was not shown it would simply not append the modal pane to it. Which
+  causes issues, because what if a pane is hidden and then isModal changes to true? When the view
+  becomes visible, isModal will still be true, but there won't be a modal view. This would need to
+  be more minutely handled in the pane (i.e. each time it re-shows it has to check if isModal is
+  true and if it does have a modal pane or not) or more minutely handled by the developer (i.e. when
+  they are transitioning views out they should take care not to change isModal until the view is
+  done transitioning). We should probably do the former, but it opens a bigger question, how should
+  all views respond when they are modified in transitioning out states?
+*/
+// , function () {
+
+//   // Tests an edge case where isModal turns YES during a transition out.
+//   pane = SC.PanelPane.create({
+//     contentView: SC.View,
+//     modalPane: SC.ModalPane.create(),
+//     isModal: NO,
+//     transitionOut: SC.View.FADE_OUT,
+//     transitionOutOptions: { duration: 0.1 }
+//   });
+
+//   SC.run(function () {
+//     pane.append();
+
+//     pane.remove(); // trigger transition and then willRemoveFromDocument
+//   });
+
+//   pane.set('isModal', YES);
+
+//   equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not add modal pane when isModal becomes YES while transitioning out");
+
+//   SC.run(function () {
+//     pane.destroy();
+
+//     equals(pane.get('viewState'), SC.CoreView.UNRENDERED);
+//   });
+// });

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

@@ -4,49 +4,49 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
+/* globals equals, ok, test, module, start, stop */
 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
-    });
-
-    view = SC.CollectionView.create({
-      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++;
-      }
+    SC.run(function () {
+      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
+      });
+
+      view = SC.CollectionView.create({
+        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();
     });
-
-    pane = SC.MainPane.create();
-    pane.appendChild(view);
-    pane.append();
-
-    SC.RunLoop.end();
   },
 
   teardown: function() {
-    pane.destroy();
-    actionCalled = 0;
+    SC.run(function () {
+      pane.destroy();
+      pane = view = content = contentController = null;
+      actionCalled = 0;
+    });
   }
 });
 
@@ -88,7 +88,7 @@ function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
 
       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) { start(); }// starts the test runner
     };
 
     if (delay) {
@@ -136,13 +136,16 @@ test("clicking on an item should select it", function() {
 });
 
 test("clicking on a selected item should clear selection after 300ms and reselect it", function() {
-  view.select(SC.IndexSet.create(1,5));
-  SC.RootResponder.responder._lastMouseUpAt = null ; // HACK: don't want a doubleClick from previous tests
+  SC.run(function () {
+    view.select(SC.IndexSet.create(1,5));
+  });
   clickOn(view, 3, NO, NO, selectionFromIndex(3), 500);
 });
 
 test("clicking on unselected item should clear selection and select it", function() {
-  view.select(SC.IndexSet.create(1,5));
+  SC.run(function () {
+    view.select(SC.IndexSet.create(1,5));
+  });
   clickOn(view, 7, NO, NO, selectionFromIndex(7));
 });
 
@@ -153,7 +156,10 @@ test("first responder", function() {
 
 test("clicking on a collection view with null content should not throw an error", function() {
   var failed = NO;
-  view.set('content', null);
+  SC.run(function () {
+    view.set('content', null);
+  });
+
   try {
     var l = view.get('layer'),
         evt = SC.Event.simulateEvent(l, 'mousedown');
@@ -163,61 +169,6 @@ test("clicking on a collection view with null content should not throw an error"
   ok(!failed, "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));
-  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
-});
-
-test("ctrl-clicking on selected item should remove from selection", function() {
-  clickOn(view,3, NO, YES, selectionFromIndex(3));
-  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
-  clickOn(view,3, NO, YES, selectionFromIndex(5));
-  clickOn(view,5, NO, YES, SC.SelectionSet.create());
-});
-
-// ..........................................................
-// shift-click mouse down
-//
-
-test("shift-clicking on an item below should extend the selection", function() {
-  clickOn(view, 3, NO, NO, selectionFromIndex(3));
-  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
-});
-
-
-test("shift-clicking on an item above should extend the selection", function() {
-  clickOn(view, 3, NO, NO, selectionFromIndex(3));
-  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
-});
-
-test("shift-clicking inside selection first time should reduce selection from top", function() {
-  view.select(SC.IndexSet.create(3,4));
-  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
-});
-
-test("shift-click below to extend selection down then shift-click inside selection should reduce selection", function() {
-  clickOn(view, 3, NO, NO, selectionFromIndex(3));
-  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
-  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
-});
-
-test("shift-click above to extend selection down then shift-click inside selection should reduce top of selection", function() {
-  clickOn(view, 3, NO, NO, selectionFromIndex(3));
-  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
-  clickOn(view,2, YES, NO, selectionFromIndexSet(SC.IndexSet.create(2,2)));
-});
-
-test("shift-click below bottom of selection then shift click on top of selection should select only top item", function() {
-  clickOn(view, 3, NO, NO, selectionFromIndex(3));
-  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
-  clickOn(view,3, YES, NO, selectionFromIndex(3));
-});
-
 test("clicking on an item should select it when useToggleSelection is true", function() {
   view.set('useToggleSelection', YES);
   clickOn(view, 3, NO, NO, selectionFromIndex(3));
@@ -230,7 +181,9 @@ test("clicking on an unselected item should select it when useToggleSelection is
 
 test("clicking on a selected item should deselect it when useToggleSelection is true", function() {
   view.set('useToggleSelection', YES);
-  view.select(SC.IndexSet.create(3,1));
+  SC.run(function () {
+    view.select(SC.IndexSet.create(3,1));
+  });
   clickOn(view, 3, NO, NO, SC.SelectionSet.create());
 });
 
@@ -242,7 +195,9 @@ test("clicking on an unselected item should select it and add it to the selectio
 
 test("clicking on a selected item should remove it from the selection when useToggleSelection is true", function() {
   view.set('useToggleSelection', YES);
-  view.select(SC.IndexSet.create(1,5));
+  SC.run(function () {
+    view.select(SC.IndexSet.create(1,5));
+  });
   clickOn(view, 5, NO, NO, selectionFromIndexSet(SC.IndexSet.create(1,4)));
 });
 
@@ -291,3 +246,71 @@ test("click on an item when isEnabled is false doesn't do anything", function()
   });
   clickOn(view, 1, NO, NO, null);
 });
+
+// ..........................................................
+// double click
+//
+
+test("double-clicking on an unselected item should fire action when actOnSelect is false", function() {
+  equals(actionCalled, 0, "precond - action hasn't been called");
+  clickOn(view, 1, NO, NO);
+  equals(actionCalled, 0, "No action is called on first click");
+  clickOn(view, 1, NO, NO);
+  equals(actionCalled, 1, "Action called when item receives second click");
+});
+
+// ..........................................................
+// ctrl-click mouse down
+//
+
+test("ctrl-clicking on unselected item should add to selection", function() {
+  clickOn(view,3, NO, YES, selectionFromIndex(3));
+  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
+});
+
+test("ctrl-clicking on selected item should remove from selection", function() {
+  clickOn(view,3, NO, YES, selectionFromIndex(3));
+  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
+  clickOn(view,3, NO, YES, selectionFromIndex(5));
+  clickOn(view,5, NO, YES, SC.SelectionSet.create());
+});
+
+// ..........................................................
+// shift-click mouse down
+//
+
+test("shift-clicking on an item below should extend the selection", function() {
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
+});
+
+
+test("shift-clicking on an item above should extend the selection", function() {
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
+});
+
+test("shift-clicking inside selection first time should reduce selection from top", function() {
+  SC.run(function () {
+    view.select(SC.IndexSet.create(3,4));
+  });
+  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
+});
+
+test("shift-click below to extend selection down then shift-click inside selection should reduce selection", function() {
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
+  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
+});
+
+test("shift-click above to extend selection down then shift-click inside selection should reduce top of selection", function() {
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
+  clickOn(view,2, YES, NO, selectionFromIndexSet(SC.IndexSet.create(2,2)));
+});
+
+test("shift-click below bottom of selection then shift click on top of selection should select only top item", function() {
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
+  clickOn(view,3, YES, NO, selectionFromIndex(3));
+});

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

@@ -4,13 +4,14 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/* globals module, test, equals, ok */
+var content, delegate;
 
-var content, delegate ;
 var Delegate = SC.Object.extend(SC.CollectionRowDelegate, {
-  rowHeight: 40,
-  customRowHeightIndexes: SC.IndexSet.create(3).add(5,2),
-  contentIndexRowHeight: function(view, content, index) {
-    return this.get('customRowHeightIndexes').contains(index) ? view.get('customRowHeight') : this.get('rowHeight');
+  rowSize: 40,
+  customRowSizeIndexes: SC.IndexSet.create(3).add(5,2),
+  contentIndexRowSize: function(view, content, index) {
+    return this.get('customRowSizeIndexes').contains(index) ? view.get('customRowSize') : this.get('rowSize');
   },
 
   expected: function(view) {
@@ -19,7 +20,7 @@ var Delegate = SC.Object.extend(SC.CollectionRowDelegate, {
         loc = view.get('length');
 
     while(--loc>=0) {
-      ret[loc] = this.contentIndexRowHeight(view,content,loc);
+      ret[loc] = this.contentIndexRowSize(view,content,loc);
     }
 
     return ret ;
@@ -28,7 +29,7 @@ var Delegate = SC.Object.extend(SC.CollectionRowDelegate, {
 
 module("SC.ListView.rowSizeForContentIndex", {
   setup: function() {
-    content = "1 2 3 4 5 6 7 8 9 0".w().map(function(x) {
+    content = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].map(function(x) {
       return SC.Object.create({ value: x });
     }, this);
 
@@ -38,12 +39,12 @@ module("SC.ListView.rowSizeForContentIndex", {
   }
 });
 
-function verifyRowHeights(view, rowHeight, expected) {
+function verifyRowHeights(view, rowSize, expected) {
   var loc = view.get('length'), actual, totalExpected = 0,
     rowSpacing = view.get('rowSpacing') || 0;
 
   ok(loc>0, 'content should have some length');
-  equals(view.rowSizeForContentIndex(loc+1), rowHeight, 'content.rowSizeForContentIndex(length+1) should be rowHeight');
+  equals(view.rowSizeForContentIndex(loc+1), rowSize, 'content.rowSizeForContentIndex(length+1) should be rowSize');
 
   while(--loc>=0) {
     actual = view.rowSizeForContentIndex(loc);
@@ -51,15 +52,15 @@ function verifyRowHeights(view, rowHeight, expected) {
       totalExpected += expected[loc];
       equals(actual, expected[loc], "content.rowSizeForContentIndex(%@) should be custom row height".fmt(loc));
     } else {
-      totalExpected += rowHeight;
-      equals(actual, rowHeight, 'content.rowSizeForContentIndex(%@) should be rowHeight'.fmt(loc));
+      totalExpected += rowSize;
+      equals(actual, rowSize, 'content.rowSizeForContentIndex(%@) should be rowSize'.fmt(loc));
     }
 
     totalExpected += rowSpacing;
   }
 
   // Don't include spacing after the last item.
-  equals(totalExpected - rowSpacing, view.get('layout').height, "The height of the list should match the total height of the rows including row spacing.")
+  equals(totalExpected - rowSpacing, view.get('layout').height, "The height of the list should match the total height of the rows including row spacing.");
 }
 
 // ..........................................................
@@ -69,7 +70,7 @@ function verifyRowHeights(view, rowHeight, expected) {
 test("constant row heights", function() {
   var view;
   SC.run(function() {
-    view = SC.ListView.create({ content: content, rowHeight: 40, customRowHeightIndexes: null });
+    view = SC.ListView.create({ content: content, rowSize: 40, customRowSizeIndexes: null });
   });
   verifyRowHeights(view, 40);
 });
@@ -77,7 +78,7 @@ test("constant row heights", function() {
 test("constant row heights with rowSpacing", function() {
   var view;
   SC.run(function() {
-    view = SC.ListView.create({ content: content, rowHeight: 40, rowSpacing: 2, customRowHeightIndexes: null });
+    view = SC.ListView.create({ content: content, rowSize: 40, rowSpacing: 2, customRowSizeIndexes: null });
   });
   verifyRowHeights(view, 40);
 });
@@ -87,7 +88,7 @@ test("custom row heights", function() {
   SC.run(function() {
     view = SC.ListView.create({
       content: content,
-      customRowHeight: 50,
+      customRowSize: 50,
       delegate: delegate
     });
   });
@@ -100,8 +101,8 @@ test("adding delegate should update calculation", function() {
   SC.run(function() {
     view = SC.ListView.create({
       content: content,
-      rowHeight: 30,
-      customRowHeight: 50
+      rowSize: 30,
+      customRowSize: 50
     });
   });
 
@@ -118,15 +119,15 @@ test("changing delegate from custom to not custom should update", function() {
   SC.run(function() {
     view = SC.ListView.create({
       content: content,
-      rowHeight: 30,
-      customRowHeight: 50,
+      rowSize: 30,
+      customRowSize: 50,
       delegate: delegate
     });
   });
   verifyRowHeights(view, 40, delegate.expected(view));
 
   SC.run(function() {
-    delegate.set('customRowHeightIndexes', null);
+    delegate.set('customRowSizeIndexes', null);
   });
   verifyRowHeights(view, 40);
 });
@@ -135,13 +136,13 @@ test("changing delegate from custom to not custom should update", function() {
 // SPECIAL CASES
 //
 
-test("computed custom row height indexes", function() {
+test("computed custom row size indexes", function() {
 
   delegate = Delegate.create({
-    indexes: Delegate.prototype.customRowHeightIndexes,
+    indexes: Delegate.prototype.customRowSizeIndexes,
     useIndexes: NO,
 
-    customRowHeightIndexes: function() {
+    customRowSizeIndexes: function() {
       return this.get('useIndexes') ? this.get('indexes') : null;
     }.property('useIndexes').cacheable()
   });
@@ -150,8 +151,8 @@ test("computed custom row height indexes", function() {
   SC.run(function() {
     view = SC.ListView.create({
       content: content,
-      rowHeight: 15,
-      customRowHeight: 50,
+      rowSize: 15,
+      customRowSize: 50,
       delegate: delegate
     });
   });