sproutcore 1.5.0.pre.5 → 1.5.0.rc.1

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/discardEditing.js

@@ -0,0 +1,152 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same */
+
+(function() {
+
+var fakeDelegate, fakeEditor, view;
+
+fakeDelegate = {
+  acquireEditor: function() {
+    return fakeEditor;
+  },
+
+  shouldDiscardCalled: NO,
+  shouldDiscardAllowed: YES,
+  inlineEditorShouldDiscardEditing: function() {
+    this.shouldDiscardCalled = YES;
+
+    return this.shouldDiscardAllowed;
+  },
+
+  willDiscardCalled: NO,
+  inlineEditorWillDiscardEditing: function() {
+    this.willDiscardCalled = YES;
+  },
+
+  didDiscardCalled: NO,
+  inlineEditorDidDiscardEditing: function() {
+    this.didDiscardCalled = YES;
+    ok(this.willDiscardCalled, "willDiscard called before didDiscard");
+  }
+};
+
+fakeEditor = SC.View.create(SC.InlineEditor, {
+  inlineEditorDelegate: fakeDelegate,
+
+  beginEditing: function(original, editable) {
+    return original(editable);
+  }.enhance(),
+
+  discardEditingCalled: NO,
+  discardEditingAllowed: YES,
+  discardEditing: function(original) {
+    this.discardEditingCalled = YES;
+
+    var ret = original();
+
+    return this.discardEditingAllowed ? ret : NO;
+  }.enhance()
+});
+
+view = SC.View.create(SC.InlineEditable, {
+  inlineEditorDelegate: fakeDelegate
+});
+
+function reset() {
+  fakeDelegate.shouldDiscardCalled = NO;
+  fakeEditor.discardEditingCalled = NO;
+
+  fakeDelegate.willDiscardCalled = NO;
+  fakeDelegate.didDiscardCalled = NO;
+
+  if(fakeEditor.isEditing) fakeEditor.commitEditing();
+}
+
+module('SC.InlineEditable.discardEditing');
+
+test("discardEditing should ask shouldDiscard and then call discardEditing", function() {
+  reset();
+
+  fakeDelegate.shouldDiscardAllowed = YES;
+  fakeEditor.discardEditingAllowed = YES;
+
+  ok(view.beginEditing(), "began editing");
+
+  ok(fakeEditor.discardEditing(), "discardEditing successful");
+
+  ok(fakeEditor.discardEditingCalled, "discardEditing called");
+
+  ok(fakeDelegate.shouldDiscardCalled, "shouldDiscard called");
+});
+
+test("discardEditing should fail if shouldDiscard returns false", function() {
+  reset();
+
+  fakeDelegate.shouldDiscardAllowed = NO;
+  fakeEditor.discardEditingAllowed = YES;
+
+  ok(view.beginEditing(), "began editing");
+
+  ok(!fakeEditor.discardEditing(), "discardEditing failed");
+
+  ok(fakeEditor.discardEditingCalled, "discardEditing called");
+
+  ok(fakeDelegate.shouldDiscardCalled, "shouldDiscard called");
+});
+
+test("discardEditing should cleanup properly on success", function() {
+  reset();
+
+  // test when successful
+  fakeDelegate.shouldDiscardAllowed = YES;
+  fakeEditor.discardEditingAllowed = YES;
+
+  ok(view.beginEditing(), "began editing");
+
+  ok(fakeEditor.discardEditing(), "discardted editing");
+
+  ok(view.beginEditing(), "cleaned up successfully on discard");
+});
+
+test("delegate methods are called in order by discardEditing", function() {
+  reset();
+
+  fakeDelegate.shouldDiscardAllowed = YES;
+  fakeEditor.discardEditingAllowed = YES;
+
+  ok(view.beginEditing(), "began editing");
+
+  SC.run(function() {
+    ok(fakeEditor.discardEditing(), "discardted editing");
+  }, undefined, YES);
+
+  ok(fakeDelegate.willDiscardCalled, "willDiscard was called");
+
+  ok(fakeDelegate.didDiscardCalled, "didDiscard was called");
+});
+
+test("delegate methods are not called when discardEditing fails", function() {
+  reset();
+
+  fakeDelegate.shouldDiscardAllowed = NO;
+  fakeEditor.discardEditingAllowed = YES;
+
+  ok(view.beginEditing(), "began editing");
+
+  SC.run(function() {
+    ok(!fakeEditor.discardEditing(), "discard failed");
+  }, undefined, YES);
+
+  ok(!fakeDelegate.willDiscardCalled, "willDiscard was not called");
+
+  ok(!fakeDelegate.didDiscardCalled, "didDiscard was not called");
+});
+
+})();
+
+

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
+//            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
+//            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*global module test htmlbody ok equals same stop start Q$ */
@@ -25,6 +25,8 @@ pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
     editor = pane._pane.childViews[length - 1];
 
     ok(!editor.get('isFirstResponder'), "should not be first responder yet");
+
+    sc_super();
   },
 
   inlineEditorDidBeginEditing: function(inlineEditor) {
@@ -35,6 +37,8 @@ pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
     editor = pane._pane.childViews[length - 1];
 
     ok(editor.get('isFirstResponder'), "should be first responder now");
+
+    sc_super();
   }
 }).add("label2", SC.LabelView, {
   value: 'Can\'t Touch This',
@@ -53,7 +57,7 @@ pane.resetView = function(view) {
 
 optionsForLabelFromView = function(view) {
   var el = view.$(),
-  f = SC.viewportOffset(el[0]),
+  f = SC.offset(el[0]),
   frameTemp = view.convertFrameFromView(view.get('frame'), null);
 
   f.width = frameTemp.width;
@@ -116,24 +120,21 @@ test("fails when required options are missing",
 function() {
   try {
     optionsForLabel1["frame"] = null;
-    SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-    ok(NO, "should fail if frame missing");
+    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if frame missing");
   } catch(e1) {
     ok(YES, "should fail if frame missing: %@".fmt(e1));
   }
 
   try {
     optionsForLabel1["delegate"] = null;
-    SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-    ok(NO, "should fail if delegate missing");
+    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if delegate missing");
   } catch(e2) {
     ok(YES, "should fail if delegate missing: %@".fmt(e2));
   }
 
   try {
     optionsForLabel1["exampleElement"] = null;
-    SC.InlineTextFieldView.beginEditing(optionsForLabel1);
-    ok(NO, "should fail if exampleElement missing");
+    ok(SC.InlineTextFieldView.beginEditing(optionsForLabel1) === NO, "should fail if exampleElement missing");
   } catch(e3) {
     ok(YES, "should fail if exampleElement missing: %@".fmt(e3));
   }
@@ -220,7 +221,7 @@ function() {
 
 test("inline editor does not display the defaultValue if the label's value is the number 0",
 function() {
-  var view1 = pane.view('label1');;
+  var view1 = pane.view('label1');
   view1.set('value', 0);
   optionsForLabel1 = optionsForLabelFromView(view1);
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js

@@ -1,4 +1,9 @@
-
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
 
 
 // ========================================================================

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/string.js

@@ -1,3 +1,9 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
 test("Regular expression escaping a string", function() {
   same('\.+*?[^]$(){}=!<>|:'.escapeForRegExp(), '\\.\\+\\*\\?\\[\\^\\]\\$\\(\\)\\{\\}\\=\\!\\<\\>\\|\\:', "should be escaped");
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/flat_case.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -11,15 +11,15 @@ var root, content, flattened, delegate, obs, length, extra;
 
 // default delegate class.  Does the bare minimum for tree item to function
 var Delegate = SC.Object.extend(SC.TreeItemContent, {
-  
+
   treeItemChildrenKey: "children",
   treeItemIsExpandedKey: "isExpanded",
-  
+
   // This method is used to record range change info
-  
+
   rangeIndexes: null,
   rangeCallCount: 0,
-  
+
   rangeDidChange: function(array, objects, key, indexes) {
     this.rangeCallCount++;
     this.rangeIndexes = indexes.frozenCopy();
@@ -36,9 +36,9 @@ var TestObject = SC.Object.extend({
   Verifies that the passed observer object has the proper content.  This will
   iterate over the passed expected array, calling objectAt() on the observer
   to verify that it matches.  If you passed the expected index set, it will
-  also verify that the range observer on the observer was fire with the 
+  also verify that the range observer on the observer was fire with the
   matching set of indexes.
-  
+
   Finally, pass an optional description.
 */
 function verifyObjectAt(obs, expected, eindexes, desc) {
@@ -49,49 +49,49 @@ function verifyObjectAt(obs, expected, eindexes, desc) {
     desc = eindexes;
     eindexes = undefined;
   }
-  
+
   equals(obs.get('length'), len, "%@ - length should match".fmt(desc));
   for(idx=0;idx<len;idx++) {
     actual = obs.objectAt(idx);
     equals(actual, expected[idx], "%@ - observer.objectAt(%@) should match expected".fmt(desc, idx));
   }
-  
+
   if (eindexes !== undefined) {
     if (eindexes) {
       ok(delegate.rangeCallCount>0, 'range observer should be called (actual callCount=%@)'.fmt(delegate.rangeCallCount));
     } else {
       ok(delegate.rangeCallCount===0, 'range observer should NOT be called (actual callCount=%@)'.fmt(delegate.rangeCallCount));
     }
-    
+
     same(delegate.rangeIndexes, eindexes, 'range observer should be called with expected indexes');
   }
-  
+
 }
 
 
 module("SC.TreeItemObserver - Flat Array Use Case", {
   setup: function() {
-    content = "1 2 3 4 5".w().map(function(x) { 
+    content = "1 2 3 4 5".w().map(function(x) {
       return TestObject.create({ title: x });
     });
-    
+
     root = TestObject.create({
       title: "ROOT",
       children: content,
       isExpanded: YES
     });
-    
+
     flattened = content.slice();
-    
+
     delegate = Delegate.create();
 
     extra = TestObject.create({ title: "EXTRA" });
 
     obs = SC.TreeItemObserver.create({ delegate: delegate, item: root });
-    
+
     obs.addRangeObserver(null, delegate, delegate.rangeDidChange);
   },
-  
+
   teardown: function() {
     if (obs) obs.destroy(); // cleanup
     content = delegate = obs = null ;
@@ -101,7 +101,7 @@ module("SC.TreeItemObserver - Flat Array Use Case", {
 
 // ..........................................................
 // LENGTH
-// 
+//
 
 test("length on create", function() {
   equals(obs.get('length'), 5, 'should have length of array on create');
@@ -118,19 +118,19 @@ test("length after insert", function() {
   equals(obs.get('length'), 5, 'precond - should have length of array on create');
 
   SC.run(function() { content.insertAt(2, extra); });
-  equals(obs.get('length'), 6, 'length should change');  
+  equals(obs.get('length'), 6, 'length should change');
 });
 
 test("length after remove", function() {
   equals(obs.get('length'), 5, 'precond - should have length of array on create');
 
   SC.run(function() { content.removeAt(2); });
-  equals(obs.get('length'), 4, 'length should change');  
+  equals(obs.get('length'), 4, 'length should change');
 });
 
 // ..........................................................
 // OBJECT AT
-// 
+//
 
 test("objectAt on create", function() {
   verifyObjectAt(obs, flattened, "on create");
@@ -139,10 +139,10 @@ test("objectAt on create", function() {
 test("objectAt after replace", function() {
 
   verifyObjectAt(obs, flattened, "PRECOND"); // verify initial state
-  
+
   SC.run(function() { content.replace(2,1, [extra]); }); // replace
   flattened[2] = extra;
-  
+
   var change = SC.IndexSet.create(2);
   verifyObjectAt(obs, flattened, change, "on create");
 });
@@ -152,7 +152,7 @@ test("objectAt after insert", function() {
 
   SC.run(function() { content.insertAt(2,extra); }); // replace
   flattened.insertAt(2, extra);
-  
+
   var change = SC.IndexSet.create(2, flattened.length-2);
   verifyObjectAt(obs, flattened, change, "after insert");
 });
@@ -163,135 +163,135 @@ test("objectAt after remove", function() {
   SC.run(function() { content.removeAt(2); }); // replace
   flattened.removeAt(2);
 
-  
+
   var change = SC.IndexSet.create(2, flattened.length-1);
   verifyObjectAt(obs, flattened, change, "after remove");
 });
 
 // ..........................................................
 // MODIFYING OBSERVER -> MODEL
-// 
+//
 
 test("adding an object to end", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.pushObject(extra); });
   flattened.pushObject(extra);
   expected.pushObject(extra);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(flattened.length-1,1);
   verifyObjectAt(obs, flattened, change, 'after pushing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("removing object at end", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.popObject(); });
   flattened.popObject();
   expected.popObject();
-  
+
   // verify round trip
   var change = SC.IndexSet.create(flattened.length,1);
   verifyObjectAt(obs, flattened, change, 'after removing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("adding an object to start", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.insertAt(0, extra); });
   flattened.insertAt(0, extra);
   expected.insertAt(0, extra);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(0, flattened.length);
   verifyObjectAt(obs, flattened, change, 'after pushing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("remove an object to start", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.removeAt(0); });
   flattened.removeAt(0);
   expected.removeAt(0);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(0, flattened.length+1);
   verifyObjectAt(obs, flattened, change, 'after removing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("adding object in middle", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.insertAt(2, extra); });
   flattened.insertAt(2, extra);
   expected.insertAt(2, extra);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(2, flattened.length-2);
   verifyObjectAt(obs, flattened, change, 'after adding object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("removing object in middle", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.removeAt(2); });
   flattened.removeAt(2);
   expected.removeAt(2);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(2, flattened.length-1);
   verifyObjectAt(obs, flattened, change, 'after removing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 test("replace object in middle", function() {
-  
+
   var expected = content.slice();
-  
+
   SC.run(function() { obs.replace(2, 1, [extra]); });
   flattened.replace(2, 1, [extra]);
   expected.replace(2, 1, [extra]);
-  
+
   // verify round trip
   var change = SC.IndexSet.create(2, 1);
   verifyObjectAt(obs, flattened, change, 'after replacing object');
-  
+
   // verify content change
   same(content, expected, 'content should have new extra item');
 });
 
 // ..........................................................
 // SC.COLLECTION CONTENT SUPPORT
-// 
+//
 
 test("contentGroupIndexes - not grouped", function() {
   equals(delegate.get('treeItemIsGrouped'), NO, 'precond - delegate.treeItemIsGrouped == NO');
   equals(obs.contentGroupIndexes(null, obs), null, 'contentGroupIndexes should be null');
-  
+
   var idx, len = obs.get('length');
   for(idx=0;idx<len;idx++) {
     equals(obs.contentIndexIsGroup(null, obs, idx), NO, 'obs.contentIndexIsGroup(null, obs, %@) should be NO'.fmt(idx));
@@ -301,11 +301,11 @@ test("contentGroupIndexes - not grouped", function() {
 test("contentGroupIndexes - grouped", function() {
   delegate.set('treeItemIsGrouped', YES);
   equals(delegate.get('treeItemIsGrouped'), YES, 'precond - delegate.treeItemIsGrouped == YES');
-  same(obs.contentGroupIndexes(null, obs), SC.IndexSet.create(0, obs.get('length')), 'contentGroupIndexes should cover entire set');
-  
+  same(obs.contentGroupIndexes(null, obs), SC.IndexSet.EMPTY, 'contentGroupIndexes should be an empty set');
+
   var idx, len = obs.get('length');
   for(idx=0;idx<len;idx++) {
-    equals(obs.contentIndexIsGroup(null, obs, idx), YES, 'obs.contentIndexIsGroup(null, obs, %@) should be YES'.fmt(idx));
+    equals(obs.contentIndexIsGroup(null, obs, idx), NO, 'obs.contentIndexIsGroup(null, obs, %@) should be NO'.fmt(idx));
   }
 });