sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js

@@ -20,14 +20,16 @@ SC.platform = SC.Object.create({
     @property
   */
   scrollbarSize: function() {
-    var tester = document.createElement("DIV");
+    var tester = document.createElement("DIV"),
+        child;
     tester.innerHTML = "<div style='height:1px;'></div>";
     tester.style.cssText="position:absolute;width:100px;height:100px;overflow-y:visible;";
 
+    child = tester.childNodes[0];
     document.body.appendChild(tester);
-    var noScroller = tester.childNodes[0].innerWidth;
+    var noScroller = child.innerWidth || child.clientWidth;
     tester.style.overflowY = 'scroll';
-    var withScroller = tester.childNodes[0].innerWidth;
+    var withScroller = child.innerWidth || child.clientWidth;
     document.body.removeChild(tester);
 
     return noScroller-withScroller;

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js

@@ -79,7 +79,7 @@ SC.RootResponder = SC.Object.extend(
     Usually you will not need to edit the main pane directly.  Instead, you
     should use a MainPane subclass, which will automatically make itself main
     when you append it to the document.
-    
+
     @type SC.MainPane
   */
   mainPane: null,
@@ -344,7 +344,7 @@ SC.RootResponder = SC.Object.extend(
     (removing sc-blur).  Also notify panes.
   */
   focus: function() {
-    
+
     if (!this.get('hasFocus')) {
       SC.$('body').addClass('sc-focus').removeClass('sc-blur');
 
@@ -355,7 +355,7 @@ SC.RootResponder = SC.Object.extend(
             nextValidKeyView = mainPane ? mainPane.get('nextValidKeyView') : null;
         if (nextValidKeyView) mainPane.makeFirstResponder(nextValidKeyView);
       }
-      
+
       SC.run(function() {
         this.set('hasFocus', YES);
       }, this);
@@ -904,7 +904,7 @@ SC.RootResponder = SC.Object.extend(
 
   assignTouch: function(touch, view) {
     // sanity-check
-    if (touch.hasEnded) throw "Attemt to assign a touch that is already finished.";
+    if (touch.hasEnded) throw "Attempt to assign a touch that is already finished.";
 
     // unassign from old view if necessary
     if (touch.view === view) return;
@@ -1697,9 +1697,9 @@ SC.RootResponder = SC.Object.extend(
   /**
     IE's default behavior to blur textfields and other controls can only be
     blocked by returning NO to this event. However we don't want to block
-    its default behavior otherwise textfields won't loose focus by clicking on
+    its default behavior otherwise textfields won't lose focus by clicking on
     an empty area as it's expected. If you want to block IE from bluring another
-    control set blockIEDeactivate to true on the especific view in which you
+    control set blockIEDeactivate to true on the specific view in which you
     want to avoid this. Think of an autocomplete menu, you want to click on
     the menu but don't loose focus.
   */

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/sparse_array.js

@@ -314,15 +314,18 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     @returns {Number} the discovered index or -1 if not found
   */
   indexOf: function(obj) {
-    var del = this.delegate ;
+    var c, ret, del = this.delegate ;
     if (del && del.sparseArrayDidRequestIndexOf) {
-      return del.sparseArrayDidRequestIndexOf(this, obj);
-    } else {
-      var content = this._sa_content ;
-      if (!content) content = this._sa_content = [] ;
-      return content.indexOf(obj) ;
+      ret = del.sparseArrayDidRequestIndexOf(this, obj);
+    } 
+    
+    if (SC.none(ret)) {
+      c = this._sa_content ;
+      if (!c) c = this._sa_content = [] ;
+      ret = c.indexOf(obj) ;
     }
-  },
+    return ret;
+  },  
 
   // ..........................................................
   // EDITING

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/action_support.js

@@ -0,0 +1,106 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+/*global module test equals context ok same */
+
+(function() {
+  var target, pane, sendActionSpy, view;
+
+  module("SC.ActionSupport", {
+    setup: function() {
+      target = SC.Object.create({
+        mainAction: function() {},
+        someAction: function() {}
+      });
+
+      var rootResponder = {sendAction: function(){} };
+      sendActionSpy = CoreTest.spyOn(rootResponder, 'sendAction');
+
+      pane = SC.Object.create({
+        rootResponder: rootResponder
+      });
+
+      view = SC.View.create(SC.ActionSupport, {
+        action: null,
+        zomgAction: null,
+        pane: pane,
+
+        someEvent: function() {
+          return this.fireAction(this.get('zomgAction'));
+        }
+      });
+    },
+
+    teardown: function() {
+      target = pane = sendActionSpy = view = null;
+    }
+  });
+
+
+  // ..........................................................
+  // No Parameters
+  // 
+
+  test("no paramaters - only action set", function() {
+    var expectedAction = 'someAction';
+
+    view.set('action', expectedAction);
+    view.fireAction();
+
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, null, view), 'triggers the action');
+  });
+
+  test("no paramaters - action and target set", function() {
+    var expectedAction = 'someAction';
+
+    view.set('target', target);
+    view.set('action', expectedAction);
+    view.fireAction();
+
+    ok(sendActionSpy.wasCalledWith(expectedAction, target, view, pane, null, view), 'triggers the action');
+  });
+
+
+  // ..........................................................
+  // Actions Parameter
+  // 
+
+  test("action parameter - only action set", function() {
+    var expectedAction = 'someAction';
+
+    view.set('zomgAction', expectedAction);
+    view.someEvent();
+
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, null, view), 'triggers the action');
+  });
+
+  test("action parameter - action and target set", function() {
+    var expectedAction = 'someAction';
+
+    view.set('target', target);
+    view.set('zomgAction', expectedAction);
+    view.someEvent();
+
+    ok(sendActionSpy.wasCalledWith(expectedAction, target, view, pane, null, view), 'triggers the action');
+  });
+
+
+  // ..........................................................
+  // Action Context
+  // 
+
+  test("context", function() {
+    var expectedAction = 'someAction';
+    var context = {zomg: "context"};
+
+    view.set('action', expectedAction);
+    view.set('actionContext', context)
+    view.fireAction();
+
+    ok(sendActionSpy.wasCalledWith(expectedAction, null, view, pane, context, view), 'triggers the action');
+  });
+
+})();

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/collection.js

@@ -382,3 +382,21 @@ test("#collection helper should allow relative paths for the collection view cla
   equals(view.$('li').length, 3, '#collection should find relative collection view path');
 });
 
+test("#collection helper should raise an error when passing a first argument that isn't an SC.TemplateCollectionView", function() {
+  var view = SC.TemplateView.create({
+    content: {
+      names: ["Dom", "Arthur"]
+    },
+    template: SC.Handlebars.compile('{{#collection content.names}}{{/collection}}')
+  });
+  var errored = false;
+
+  try {
+    view.createLayer();
+  } catch(e) {
+    errored = true;
+  }
+
+  ok(errored, "throws an error when creating the view");
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/handlebars.js

@@ -3,8 +3,54 @@
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
 /*globals TemplateTests module */
+
+// Included to test bindAttr problem where setting an attr when it
+// has the same value is overkill and sometimes causes the browser
+// to misbehave, like in SC.TextField where listening to change
+// events caused the cursor to go to the end of the input
+(function() {
+
+  jQuery.fn.caretPosition = function() {
+      var ctrl = this[0];
+
+      var CaretPos = 0;
+      // IE Support
+      if (document.selection) {
+
+          ctrl.focus();
+          var Sel = document.selection.createRange ();
+
+          Sel.moveStart ('character', -ctrl.value.length);
+
+          CaretPos = Sel.text.length;
+      }
+      // Firefox support
+      else if (ctrl.selectionStart || ctrl.selectionStart == '0') {
+          CaretPos = ctrl.selectionStart;
+      }
+
+      return (CaretPos);
+  };
+
+
+  jQuery.fn.setCaretPosition = function(pos) {
+      var ctrl = this[0];
+
+      if(ctrl.setSelectionRange) {
+          ctrl.focus();
+          ctrl.setSelectionRange(pos,pos);
+      } else if (ctrl.createTextRange) {
+          var range = ctrl.createTextRange();
+          range.collapse(true);
+          range.moveEnd('character', pos);
+          range.moveStart('character', pos);
+          range.select();
+      }
+  }
+
+})();
+
 /**
   This module specifically tests integration with Handlebars and SproutCore-specific
   Handlebars extensions.
@@ -855,6 +901,30 @@ test("should be able to bind element attributes using {{bindAttr}}", function()
   equals(view.$('img').attr('alt'), "Nanananana SproutCore!", "updates alt attribute when title property is computed");
 });
 
+test("should not reset cursor position when text field receives keyUp event", function() {
+  var pane = SC.Pane.create({
+    childViews: ['view'],
+    view: SC.TextField.create({
+      value: "Broseidon, King of the Brocean"
+    })
+  });
+
+  pane.append();
+
+  var view = pane.get('childViews')[0];
+
+  view.$('input').val('Brosiedoon, King of the Brocean');
+  view.$('input').setCaretPosition(5);
+
+  SC.run(function() {
+    view.keyUp({});
+  });
+
+  equals(view.$('input').caretPosition(), 5, "The keyUp event should not result in the cursor being reset due to the bindAttr observers");
+
+  pane.remove().destroy();
+});
+
 test("should be able to bind element attributes using {{bindAttr}} inside a block", function() {
   var template = SC.Handlebars.compile('{{#with content}}<img {{bindAttr src="url" alt="title"}}>{{/with}}');
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/attribute_bindings_test.js

@@ -0,0 +1,38 @@
+// ==========================================================================
+// 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 */
+
+module("SC.CoreView - Attribute Bindings");
+
+test("should render and update attribute bindings", function() {
+  var view = SC.View.create({
+    classNameBindings: ['priority', 'isUrgent', 'isClassified:classified', 'canIgnore'],
+    attributeBindings: ['type', 'exploded', 'destroyed', 'exists', 'explosions'],
+
+    type: 'reset',
+    exploded: true,
+    destroyed: true,
+    exists: false,
+    explosions: 15
+  });
+
+  view.createLayer();
+  equals(view.$().attr('type'), 'reset', "adds type attribute");
+  ok(view.$().attr('exploded'), "adds exploded attribute when true");
+  ok(view.$().attr('destroyed'), "adds destroyed attribute when true");
+  ok(!view.$().attr('exists'), "does not add exists attribute when false");
+  equals(view.$().attr('explosions'), "15", "adds integer attributes");
+
+  view.set('type', 'submit');
+  view.set('exploded', false);
+  view.set('destroyed', false);
+  view.set('exists', true);
+
+  equals(view.$().attr('type'), 'submit', "updates type attribute");
+  ok(!view.$().attr('exploded'), "removes exploded attribute when false");
+  ok(!view.$().attr('destroyed'), "removes destroyed attribute when false");
+  ok(view.$().attr('exists'), "adds exists attribute when true");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/class_name_bindings_test.js

@@ -0,0 +1,47 @@
+// ==========================================================================
+// 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 */
+
+module("SC.CoreView - Class Name Bindings");
+
+test("should apply bound class names to the element", function() {
+  var view = SC.View.create({
+    classNameBindings: ['priority', 'isUrgent', 'isClassified:classified', 'canIgnore'],
+
+    priority: 'high',
+    isUrgent: true,
+    isClassified: true,
+    canIgnore: false
+  });
+
+  view.createLayer();
+  ok(view.$().hasClass('high'), "adds string values as class name");
+  ok(view.$().hasClass('is-urgent'), "adds true Boolean values by dasherizing");
+  ok(view.$().hasClass('classified'), "supports customizing class name for Boolean values");
+  ok(!view.$().hasClass('can-ignore'), "does not add false Boolean values as class");
+});
+
+test("should add, remove, or change class names if changed after element is created", function() {
+  var view = SC.View.create({
+    classNameBindings: ['priority', 'isUrgent', 'canIgnore'],
+
+    priority: 'high',
+    isUrgent: true,
+    canIgnore: false
+  });
+
+  view.createLayer();
+
+  view.set('priority', 'orange');
+  view.set('isUrgent', false);
+  view.set('canIgnore', true);
+
+  ok(view.$().hasClass('orange'), "updates string values");
+  ok(!view.$().hasClass('high'), "removes old string value");
+
+  ok(!view.$().hasClass('is-urgent', "removes dasherized class when changed from true to false"));
+  ok(view.$().hasClass('can-ignore'), "adds dasherized class when changed from false to true");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutChildViews.js

@@ -7,8 +7,8 @@
 /*global module test equals context ok same */
 
 // .......................................................
-// layoutChildViews() 
-// 
+// layoutChildViews()
+//
 module("SC.View#layoutChildViews");
 
 test("calls renderLayout() on child views on views that need layout if they have a layer", function() {
@@ -17,25 +17,25 @@ test("calls renderLayout() on child views on views that need layout if they have
 	var ChildView = SC.View.extend({
 		updateLayout: function(context) { callCount++; }
 	});
-	
+
 	var view = SC.View.create({
 		childViews: [ChildView, ChildView, ChildView]
 	});
-	
+
 	var cv1 = view.childViews[0];
 	var cv2 = view.childViews[1];
-	
+
 	// add to set...
 	view.layoutDidChangeFor(cv1);
 	view.layoutDidChangeFor(cv2);
-	
+
 	view.layoutChildViews();
 	equals(callCount, 2, 'updateLayout should be called on two dirty child views');
 });
 
 // .......................................................
-// updateLayout() 
-// 
+// updateLayout()
+//
 module("SC.View#updateLayout");
 
 test("if view has layout, calls renderLayout with context to update element", function() {
@@ -52,10 +52,10 @@ test("if view has layout, calls renderLayout with context to update element", fu
 			callCount++;
 		}
 	});
-	
+
 	view.createLayer(); // we need a layer
 	ok(view.get('layer'), 'precond - should have a layer');
-	
+
 	isTesting= YES ;
 	view.updateLayout();
 	equals(callCount, 1, 'should call renderLayout()');
@@ -74,9 +74,9 @@ test("if view has NO layout, should not call renderLayout", function() {
 			callCount++;
 		}
 	});
-	
+
 	ok(!view.get('layer'), 'precond - should NOT have a layer');
-	
+
 	isTesting= YES ;
 	view.updateLayout();
 	equals(callCount, 0, 'should NOT call renderLayout()');
@@ -88,7 +88,7 @@ test("returns receiver", function() {
 });
 
 // .......................................................
-//  renderLayout() 
+//  renderLayout()
 //
 module('SC.View#renderLayout');
 
@@ -96,7 +96,7 @@ test("adds layoutStyle property to passed context", function() {
 
 	var view = SC.View.create({
 		// mock style for testing...
-		layoutStyle: { width: 50, height: 50 } 
+		layoutStyle: { width: 50, height: 50 }
 	});
 	var context = view.renderContext();
 
@@ -111,7 +111,7 @@ test("adds layoutStyle property to passed context", function() {
 });
 
 // .......................................................
-// layoutChildViewsIfNeeded() 
+// layoutChildViewsIfNeeded()
 //
 var view, callCount ;
 module('SC.View#layoutChildViewsIfNeeded', {
@@ -123,7 +123,7 @@ module('SC.View#layoutChildViewsIfNeeded', {
 	},
 	teardown: function() { view = null; }
 });
-  
+
 test("calls layoutChildViews() if childViewsNeedLayout and isVisibleInWindow & sets childViewsNeedLayout to NO", function() {
 
 	view.childViewsNeedLayout = YES ;
@@ -149,7 +149,7 @@ test("does not call layoutChildViews() if isVisibleInWindow is NO unless passed
 	view.layoutChildViewsIfNeeded();
 	equals(callCount, 0, 'should NOT call layoutChildViews()');
 	equals(view.get('childViewsNeedLayout'), YES, 'should leave childViewsNeedLayout set to YES');
-	
+
 	view.layoutChildViewsIfNeeded(YES);
 	equals(callCount, 1, 'should call layoutChildViews()');
 	equals(view.get('childViewsNeedLayout'), NO, 'should set childViewsNeedLayout to NO');
@@ -158,5 +158,5 @@ test("does not call layoutChildViews() if isVisibleInWindow is NO unless passed
 test("returns receiver", function() {
 	equals(view.layoutChildViewsIfNeeded(), view, 'should return receiver');
 });
-  
+