sproutcore 1.10.0 → 1.10.1

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

@@ -0,0 +1,215 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            portions copyright @2011 Apple Inc.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+var view, content, contentController, pane, actionCalled = 0;
+
+module("SC.CollectionView Touch Events", {
+  setup: function() {
+
+    SC.platform.simulateTouchEvents();
+
+    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++;
+      }
+    });
+
+    pane = SC.MainPane.create();
+    pane.appendChild(view);
+    pane.append();
+
+    SC.RunLoop.end();
+  },
+
+  teardown: function() {
+    SC.RunLoop.begin();
+    pane.remove();
+    actionCalled = 0;
+    SC.RunLoop.end();
+  }
+});
+
+/*
+  Simulates touching 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 touch on
+  @param {SC.SelectionSet} expected expected selection
+  @param {Number} delay delay before running the test (optional)
+  @returns {void}
+*/
+function touchOn(view, index, expected, delay) {
+  var itemView = view.itemViewForContentIndex(index),
+      layer    = itemView.get('layer'),
+      opts     = {},
+      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');
+
+      ok(expected ? expected.isEqual(sel) : expected === sel, 'should have selection: %@ after touch on item[%@], actual: %@'.fmt(expected, 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 ;
+}
+
+/*
+  Creates an SC.SelectionSet from a given index.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+
+function selectionFromIndex(index) {
+  var ret = SC.SelectionSet.create();
+  ret.addObject(content.objectAt(index));
+
+  return ret;
+}
+
+/*
+  Creates an SC.SelectionSet from a given SC.IndexSet.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+function selectionFromIndexSet(indexSet) {
+  var ret = SC.SelectionSet.create();
+  ret.add(content, indexSet);
+
+  return ret;
+}
+
+// ..........................................................
+// basic touch
+//
+
+test("touching an item should select it", function() {
+  touchOn(view, 3, selectionFromIndex(3));
+});
+
+test("touching a selected item should maintain it selected", function() {
+  view.select(SC.IndexSet.create(1,3));
+  touchOn(view, 3, selectionFromIndex(3));
+});
+
+test("touching two times on an item should select it", function() {
+  touchOn(view, 3);
+  touchOn(view, 3);
+  itemView = view.itemViewForContentIndex(3);
+  equals(itemView.get('isSelected'), YES, 'itemView.isSelected should remain YES after touched two times');
+});
+
+test("touching unselected item should clear selection and select it", function() {
+  view.select(SC.IndexSet.create(1,5));
+  touchOn(view, 7, selectionFromIndex(7));
+});
+
+test("first responder", function() {
+  touchOn(view, 3);
+  equals(view.get('isFirstResponder'), YES, 'view.isFirstResponder should be YES after touch start');
+});
+
+test("touching a collection view with null content should not throw an error", function() {
+  var failed = NO;
+  view.set('content', null);
+  try {
+    var l = view.get('layer'),
+        evt = SC.Event.simulateEvent(l, 'mousedown');
+    SC.Event.trigger(l, 'mousedown', [evt]);
+  }
+  catch (e) { failed = YES; }
+  ok(!failed, "touching a collection view with null content should not throw an error");
+});
+
+test("touching an item should select it when useToggleSelection is true", function() {
+  view.set('useToggleSelection', YES);
+  touchOn(view, 3, selectionFromIndex(3));
+});
+
+test("touching an unselected item should select it when useToggleSelection is true", function() {
+  view.set('useToggleSelection', YES);
+  touchOn(view, 3, selectionFromIndex(3));
+});
+
+test("touching a selected item should deselect it when useToggleSelection is true", function() {
+  view.set('useToggleSelection', YES);
+  view.select(SC.IndexSet.create(3,1));
+  touchOn(view, 3, SC.SelectionSet.create());
+});
+
+test("touching 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));
+  touchOn(view, 5, selectionFromIndexSet(SC.IndexSet.create(1,4)));
+});
+
+test("touching an unselected item should select it and clear the previous selection when useToggleSelection is true and allowsMultipleSelection is not", function() {
+  view.set('useToggleSelection', YES);
+  contentController.set('allowsMultipleSelection', NO);
+  touchOn(view, 1, selectionFromIndex(1));
+  touchOn(view, 3, selectionFromIndex(3));
+});
+
+test("touching an unselected item should fire action when useToggleSelection is true and actOnSelect is true", function() {
+  view.set('useToggleSelection', YES);
+  view.set('actOnSelect', YES);
+
+  equals(actionCalled, 0, "precond - action hasn't been called");
+  touchOn(view, 1);
+  equals(actionCalled, 1, "Action called when item is selected");
+});
+
+test("touching an item when isSelectable is false doesn't do anything", function() {
+  view.set('isSelectable', NO);
+  touchOn(view, 1, null);
+});
+
+test("touching an item when isEnabled is false doesn't do anything", function() {
+  view.set('isEnabled', NO);
+  touchOn(view, 1, null);
+});

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

@@ -44,7 +44,12 @@ var pane = SC.ControlTestPane.design()
       contentValueKey: "title",
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
-      rowHeight: 20
+      rowHeight: 20,
+      _didCallDragEnded: false,
+      dragEnded: function() {
+        sc_super();
+        this._didCallDragEnded = true;
+      }
     })
   }));
 
@@ -200,7 +205,6 @@ test("insertion point when cancel drag on grid view", function() {
     layer,
     gridView = pane.view("basic").get('contentView');
 
-  // Configure the view to accept drop on.
   gridView.set('canReorderContent', YES);
 
   itemView = gridView.itemViewForContentIndex(0);
@@ -233,6 +237,7 @@ test("insertion point when cancel drag on grid view", function() {
     SC.Event.trigger(layer, 'keydown', [ev]);
 
     equals(gridView._insertionPointView, null, "The insertion point should have been destroyed");
+    equals(gridView._didCallDragEnded, true, "dragEnded should have been call");
 
     start();
   };

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

@@ -44,7 +44,12 @@ var pane = SC.ControlTestPane.design()
       contentValueKey: "title",
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
-      rowHeight: 20
+      rowHeight: 20,
+      _didCallDragEnded: false,
+      dragEnded: function() {
+        sc_super();
+        this._didCallDragEnded = true;
+      }
     })
   }));
 
@@ -225,6 +230,7 @@ test("insertion point when cancel drag on list view", function() {
     SC.Event.trigger(layer, 'keydown', [ev]);
 
     equals(listView._insertionPointView, null, "The insertion point should have been destroyed");
+    equals(listView._didCallDragEnded, true, "dragEnded should have been call");
 
     window.start();
   };

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/stacked/ui_comments.js

@@ -4,6 +4,7 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*global module, test, ok, equals, htmlbody, clearHtmlbody */
 
 /* Test SC.StackedView with a Comments example. */
 
@@ -27,7 +28,7 @@ var CommentView = SC.View.extend(SC.Control, {
 
   contentCommentKey: 'comment',
 
-  contentPropertyDidChange: function(target, key) {
+  contentPropertyDidChange: function (target, key) {
 
     // update everything!
     if (key === '*') {
@@ -41,16 +42,17 @@ var CommentView = SC.View.extend(SC.Control, {
     if (this.owner && this.owner.updateHeight) this.owner.updateHeight();
   },
 
-  updateFromLabel: function() {
+  updateFromLabel: function () {
     var content = this.get('content'),
         from    = content ? content.get('from') : 'Anonymous',
         date    = content ? content.get('date') : 'some date',
         str     = "%@ wrote %@: ".fmt(from, date);
     this.fromLabel.set('value', str);
-    return this ;
+
+    return this;
   },
 
-  updateCommentLabel: function() {
+  updateCommentLabel: function () {
     var content = this.get('content'),
         comment = content ? content.get('comment') : '(No Comment)';
     this.commentLabel.set('value', comment);
@@ -122,7 +124,7 @@ var extra = SC.Object.create({
 
 var pane = SC.ControlTestPane.design()
   .add("basic", SC.StackedView, {
-    layout: { top: 0, left: 0, right: 0, height: 600 },
+    layout: { top: 0, left: 0, right: 0 },
     content: content,
     exampleView: CommentView
   });
@@ -131,7 +133,7 @@ var pane = SC.ControlTestPane.design()
 // BASIC TESTS
 //
 module("Basic Tests", {
-  setup: function(){
+  setup: function () {
     htmlbody(["<style>",
       '.sc-stacked-view { border-bottom: 1px red solid; }',
       '.comment-view.sel { background-color: #ccc; }',
@@ -140,20 +142,20 @@ module("Basic Tests", {
     '</style>'].join("\n"));
     pane.standardSetup().setup();
   },
-  teardown: function(){
+  teardown: function () {
     pane.standardSetup().teardown();
     clearHtmlbody();
   }
 });
 
-test("removing an item should delete childView and adjust height", function() {
+test("removing an item should delete childView and adjust height", function () {
   var view = pane.view('basic'),
       item = content[0];
 
   equals(view.getPath('childViews.length'), content.length, 'precond - should have child views equal to current content');
   var oldHeight = view.get('frame').height; // save height.
 
-  SC.run(function() { content.removeAt(0); }); // remove first item
+  SC.run(function () { content.removeAt(0); }); // remove first item
 
 
   equals(view.getPath('childViews.length'), content.length, 'view should remove childView for removed content items');
@@ -161,20 +163,20 @@ test("removing an item should delete childView and adjust height", function() {
   ok(newHeight < oldHeight, 'view height should adjust to reflect new content. (old height: %@ current height: %@)'.fmt(oldHeight, newHeight));
 
   // restore old content
-  SC.run(function() { content.insertAt(0, item); });
+  SC.run(function () { content.insertAt(0, item); });
 
 });
 
-window.content = content ;
+window.content = content;
 
-test("inserting an item should add childView and adjust height", function() {
+test("inserting an item should add childView and adjust height", function () {
   var view = pane.view('basic'),
       item = extra; // we will insert another one
 
   equals(view.getPath('childViews.length'), content.length, 'precond - should have child views equal to current content');
   var oldHeight = view.get('frame').height; // save height.
 
-  SC.run(function() { content.pushObject(item); }); // add another item
+  SC.run(function () { content.pushObject(item); }); // add another item
 
 
   equals(view.getPath('childViews.length'), content.length, 'view should add childView for added content item');
@@ -182,11 +184,11 @@ test("inserting an item should add childView and adjust height", function() {
   ok(newHeight > oldHeight, 'view height should adjust to reflect new content. (old height: %@ current height: %@)'.fmt(oldHeight, newHeight));
 
   // restore
-  SC.run(function() { content.popObject(); });
+  SC.run(function () { content.popObject(); });
 });
 
 
-test("editing an item should automatically adjust the height", function() {
+test("editing an item should automatically adjust the height", function () {
   var view = pane.view('basic'),
       item = content[0],
       childView = view.childViews[0],
@@ -198,7 +200,7 @@ test("editing an item should automatically adjust the height", function() {
   var height = view.get('frame').height;  // save old height
 
   // change comment
-  SC.run(function() { item.set('comment', 'This is a new comment'); });
+  SC.run(function () { item.set('comment', 'This is a new comment'); });
 
   // should have updated UI and adjusted height of collection
   equals(childView.$().find('p').text(), 'This is a new comment', 'Item view should now contain comment');
@@ -207,7 +209,7 @@ test("editing an item should automatically adjust the height", function() {
   ok(newHeight < height, 'view height should adjust to reflect new content. (old height: %@ current height: %@)'.fmt(height, newHeight));
 
   // restore
-  SC.run(function() { item.set('comment', old); });
+  SC.run(function () { item.set('comment', old); });
 
   newHeight = view.get('frame').height;
   equals(newHeight, height, 'view height should restore to old height when content is edited again. (old height: %@ current height: %@)'.fmt(height, newHeight));
@@ -220,20 +222,20 @@ test("editing an item should automatically adjust the height", function() {
 
 // tests specific bug where a series of many edits strung together would
 // cause the height to get out of sync.
-test("adding, removing then editing items should still keep height the same", function() {
+test("adding, removing then editing items should still keep height the same", function () {
 
   var view = pane.view('basic'),
       item = content[0],
       old  = item.get('comment'),
       height = view.get('frame').height; // save old height
 
-  SC.run(function() { content.removeAt(0); });
-  SC.run(function() { content.insertAt(0, item); });
-  SC.run(function() { content.pushObject(extra); });
-  SC.run(function() { content.popObject(); });
+  SC.run(function () { content.removeAt(0); });
+  SC.run(function () { content.insertAt(0, item); });
+  SC.run(function () { content.pushObject(extra); });
+  SC.run(function () { content.popObject(); });
 
-  SC.run(function() { item.set('comment', 'Short comment'); });
-  SC.run(function() { item.set('comment', old); });
+  SC.run(function () { item.set('comment', 'Short comment'); });
+  SC.run(function () { item.set('comment', old); });
 
   var newHeight = view.get('frame').height;
   equals(newHeight, height, 'view height should restore to old height when content is edited again. (old height: %@ current height: %@)'.fmt(height, newHeight));

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

@@ -2291,26 +2291,26 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     // var itemView = this.itemViewForEvent(touch),
     var itemView = this._touchSelectedView,
         contentIndex = itemView ? itemView.get('contentIndex') : -1,
-        isSelected = NO, sel;
+        isSelected = NO, sel, shouldSelect;
 
     if (!this.get('isEnabledInPane')) return contentIndex > -1;
 
-    // Remove fake selection in case our contentIndex is -1, a select event will add it back
-    if (itemView) { itemView.set('isSelected', NO); }
-
     if (contentIndex > -1) {
       if (this.get('useToggleSelection')) {
         sel = this.get('selection');
         isSelected = sel && sel.containsObject(itemView.get('content'));
+        shouldSelect = !isSelected;
       }
+      else
+        shouldSelect = true;
 
-      if (isSelected) {
-        this.deselect(contentIndex);
-      } else {
+      if (shouldSelect) {
         this.select(contentIndex, NO);
 
         // If actOnSelect is implemented, the action will be fired.
         this._cv_performSelectAction(itemView, touch, 0);
+      } else {
+        this.deselect(contentIndex);
       }
     }
 
@@ -2779,15 +2779,6 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     return (dragOp & SC.DRAG_REORDER) ? SC.DRAG_MOVE : dragOp;
   },
 
-  /**
-    Implements the SC.DropTarget protocol.  Hides any visible insertion
-    point and clears some cached values.
-  */
-  dragExited: function () {
-    this.hideInsertionPoint();
-    this._lastInsertionIndex = this._lastDropOperation = null;
-  },
-
   /**
     Implements the SC.DropTarget protocol.  Hides any visible insertion
     point and clears some cached values.
@@ -2963,8 +2954,8 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     // in-scroll clipping frame when it does).
     // TODO: perform a raw update that doesn't require the run loop.
     SC.run(function () {
-      this.notifyPropertyChange('nowShowing');
-      this.invokeOnce('_cv_nowShowingDidChange');
+    this.notifyPropertyChange('nowShowing');
+    this.invokeOnce('_cv_nowShowingDidChange');
     }, this);
 
     // Track the last time we updated.