sproutcore 1.6.0.beta.3-x86-mingw32 → 1.6.0.rc.1-x86-mingw32

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

@@ -14,6 +14,8 @@ SC.STRING_TITLEIZE_REGEXP = (/([\s|\-|\_|\n])([^\s|\-|\_|\n]?)/g);
 SC.STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
 SC.STRING_DASHERIZE_REGEXP = (/[ _]/g);
 SC.STRING_DASHERIZE_CACHE = {};
+SC.STRING_TRIM_LEFT_REGEXP = (/^\s+/g);
+SC.STRING_TRIM_RIGHT_REGEXP = (/\s+$/g);
 
 /**
   @namespace
@@ -134,6 +136,8 @@ SC.mixin(SC.String, {
 
     var args = SC.$A(arguments);
     args.shift(); // remove str param
+    //to extend String.prototype 
+    if(args.length>0 && args[0].isSCArray) args=args[0];
 
     return SC.String.fmt(localized, args);
   },
@@ -158,5 +162,62 @@ SC.mixin(SC.String, {
     args.shift(); // remove def param
 
     return SC.String.fmt(localized, args);
+  },
+  
+  /**
+   Removes any extra whitespace from the edges of the string. This method is
+   also aliased as strip().
+
+   @returns {String} the trimmed string
+  */
+  trim: jQuery.trim,
+
+  /**
+   Removes any extra whitespace from the left edge of the string.
+
+   @returns {String} the trimmed string
+  */
+  trimLeft: function (str) {
+    return str.replace(SC.STRING_TRIM_LEFT_REGEXP,"");
+  },
+
+  /**
+   Removes any extra whitespace from the right edge of the string.
+
+   @returns {String} the trimmed string
+  */
+  trimRight: function (str) {
+    return str.replace(SC.STRING_TRIM_RIGHT_REGEXP,"");
   }
 });
+
+
+// IE doesn't support string trimming
+if(String.prototype.trim) {
+  SC.supplement(String.prototype,
+  /** @scope String.prototype */ {
+
+    trim: function() {
+      return SC.String.trim(this, arguments);
+    },
+
+    trimLeft: function() {
+      return SC.String.trimLeft(this, arguments);
+    },
+
+    trimRight: function() {
+      return SC.String.trimRight(this, arguments);
+    }
+  });
+}
+
+// We want the version defined here, not in Runtime
+SC.mixin(String.prototype,
+/** @scope String.prototype */ {
+  
+  loc: function() {
+    return SC.String.loc(this.toString(), SC.$A(arguments));
+  }
+
+});
+

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

@@ -117,21 +117,35 @@ SC.mixin( /** @scope SC */ {
         mobileBuildNumber = userAgent.substring(index + 7, index + 9);
 
         if (parseInt(SC.browser.mobileSafari, 0) <= 532 || (mobileBuildNumber <= "8A")) {
-          result.left = result.left - window.pageXOffset;
-          result.top = result.top - window.pageYOffset;
+          result.left -= window.pageXOffset;
+          result.top -= window.pageYOffset;
         }
       }
 
       // Subtract the scroll offset for viewport coordinates
       if (relativeToFlag === 'viewport') {
-        result.left = result.left - window.pageXOffset;
-        result.top = result.top - window.pageYOffset;
+        
+        if(SC.browser.isIE8OrLower){
+          result.left -= $(window).scrollLeft();
+          result.top -= $(window).scrollTop();
+        }else{
+          result.left -= window.pageXOffset;
+          result.top -= window.pageYOffset;
+        }
       }
     }
 
     // Translate 'left', 'top' to 'x', 'y'
-    result.x = result.left;
-    result.y = result.top;
+    
+    try{
+      result.x = result.left;
+      result.y = result.top;
+    } catch (e) {
+      // We need this for IE, when the element is detached, for some strange 
+      // reason the object returned by element.getBoundingClientRect() 
+      // is read-only
+      result = {x:result.left, y:result.top};
+    }
     delete result.left;
     delete result.top;
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js

@@ -287,6 +287,48 @@ test("should invalidate property when property on any enumerable changes", funct
   equals(recomputed, 0, "does not recalculate after changing key on removed item");
 });
 
+test("should invalidate property when property of array item changes after content has changed", function() {
+  var inventory = [];
+  var recomputed = 0;
+
+  for (var idx = 0; idx < 20; idx++) {
+    inventory.pushObject(SC.Object.create({
+      price: 5
+    }));
+  }
+  var restaurant = SC.ArrayController.create({
+    content: [],
+
+    totalCost: function() {
+      recomputed++;
+      return inventory.reduce(function(prev, item) {
+        return prev+item.get('price');
+      }, 0);
+    }.property('@each.price').cacheable()
+  });
+
+  restaurant.set('content', inventory);
+
+  equals(restaurant.get('totalCost'), 100, "precond - computes cost of all items");
+  inventory[0].set('price', 6);
+
+  equals(restaurant.get('totalCost'), 101, "recalculates after dependent key on an enumerable item changes");
+  inventory[19].set('price', 6);
+
+  equals(restaurant.get('totalCost'), 102, "recalculates after dependent key on a different item changes");
+  inventory.pushObject(SC.Object.create({
+    price: 5
+  }));
+  equals(restaurant.get('totalCost'), 107, "recalculates after adding an item to the enumerable");
+
+  var item = inventory.popObject();
+  equals(restaurant.get('totalCost'), 102, "recalculates after removing an item from the enumerable");
+
+  recomputed = 0;
+  item.set('price', 0);
+  equals(recomputed, 0, "does not recalculate after changing key on removed item");
+});
+
 // ..........................................................
 // VERIFY SC.ARRAY COMPLIANCE
 //

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controls/button.js

@@ -1,78 +1,60 @@
-var button;
+var button, rootResponder, pane, expectedAction, targetObject, sendActionSpy;
 
 module("SC.Button", {
   setup: function() {
-    button = SC.Button.create();
+    expectedAction = 'myAction';
+    targetObject = SC.Object.create({
+      myAction: function() {
+      }
+    });
+
+    var rootResponder = {sendAction: function(){} };
+    sendActionSpy = CoreTest.spyOn(rootResponder, 'sendAction');
 
-    pane = SC.MainPane.create({
-      childViews: [button]
+    pane = SC.Object.create({
+      rootResponder: rootResponder
     });
-    pane.append();
-  },
 
-  teardown: function() {
-    pane.remove();
+    button = SC.Button.create({
+      target: targetObject,
+      action: 'myAction',
+      pane: pane
+    });
   }
 });
 
-function synthesizeEvent(type, view) {
-  var event = new SC.Event({
-    type: type,
-    target: view.get('layer')
-  });
-  SC.RootResponder.responder[type](event);
-}
-
-test("should trigger an action when clicked", function() {
-  var wasClicked = false;
-
-  var actionObject = SC.Object.create({
-    myAction: function() {
-      wasClicked = true;
-    }
-  });
-
-  button.target = actionObject;
-  button.action = 'myAction';
+test("#mouseUp - triggers the action when mouse is over the button", function() {
+  button.set('isActive', true);
 
-  synthesizeEvent('mousedown', button);
-  synthesizeEvent('mouseup', button);
+  button.mouseUp();
 
-  ok(wasClicked);
+  ok(sendActionSpy.wasCalledWith(expectedAction, targetObject, button, pane, null, button), 'triggers the action');
 });
 
-test("should not trigger action if mouse leaves area before mouseup", function() {
-  var wasClicked = false;
+test("#mouseUp - does not trigger action if mouse is not over the button", function() {
+  button.set('isActive', false);
 
-  var actionObject = SC.Object.create({
-    myAction: function() {
-      wasClicked = true;
-    }
-  });
-
-  var otherButton = SC.Button.create();
-  pane.appendChild(otherButton);
+  button.mouseUp();
+  ok(!sendActionSpy.wasCalled, 'should not trigger the action');
+});
 
-  button.target = actionObject;
-  button.action = 'myAction';
+test('#mouseUp - makes the button no longer active', function () {
+  button.set('isActive', true);
+  button.mouseUp();
 
-  synthesizeEvent('mousedown', button);
-  synthesizeEvent('mousemove', button);
-  ok(button.get('isActive'), "becomes active when hovered");
-  synthesizeEvent('mousemove', otherButton);
-  ok(!button.get('isActive'), "loses active state if mouse exits");
-  synthesizeEvent('mouseup', button);
+  equals(button.get('isActive'), false, 'should set the button to not be active');
+});
 
-  ok(!wasClicked);
+test('#mouseDown - makes the button active', function() {
+  button.set('isActive', false);
+  button.mouseDown();
 
-  wasClicked = false;
+  equals(button.get('isActive'), true, 'should set the button to be active');
+});
 
-  synthesizeEvent('mousedown', button);
-  synthesizeEvent('mousemove', button);
-  synthesizeEvent('mousemove', otherButton);
-  synthesizeEvent('mousemove', button);
-  synthesizeEvent('mouseup', button);
+test('#mouseExited - makes but button no longer active', function() {
+  button.set('isActive', false);
+  button.mouseExited();
 
-  ok(wasClicked);
+  equals(button.get('isActive'), false, 'should set the button to no longer be active');
 });
-

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_style.js

@@ -52,9 +52,11 @@ test("extracts styles from element on first retrieval", function() {
   
   var result = context.styles();
   
-  
-  same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
-  
+  if(SC.browser.msie){
+    same(result, { color: 'black', height: '20px', borderTop: 'hotpink 1px solid', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
+  }else{
+    same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
+  }
   equals(context.styles(), result, "should reuse same instance thereafter");
 });
 

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

@@ -77,6 +77,38 @@ test("element to be added is at idx < length of array ", function() {
 	equals(5, ary.get('length'), "length") ;
 });
 
+test("should work with @each dependent keys", function() {
+  var array = SC.SparseArray.create();
+
+  array.pushObject(SC.Object.create({
+    value: 5
+  }));
+  array.provideLength(1);
+
+  var obj = SC.Object.create({
+    total: function() {
+      return this.get('content').reduce(function(prev, item) {
+        return prev + item.get('value');
+      }, 0);
+    }.property('content.@each.value'),
+
+    content: array
+  });
+
+  equals(obj.get('total'), 5, "precond - computes total of all objects");
+
+  array.pushObject(SC.Object.create({
+    value: 10
+  }));
+
+  equals(obj.get('total'), 15, "recomputes when a new object is added");
+
+  array.objectAt(1).set('value', 15);
+
+  equals(obj.get('total'), 20, "recomputes when value property on child object changes");
+
+});
+
 
 test("modifying a range should not require the rest of the array to refetch", function() {
   var del = {

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

@@ -247,3 +247,28 @@ test("should re-render when the content object changes", function() {
   equals(view.$('li:eq(0)').text(), "ramalamadingdong");
 
 });
+
+test("should allow changes to content object before layer is created", function() {
+  var view = SC.TemplateCollectionView.create({
+    content: null
+  });
+
+  view.set('content', []);
+  view.set('content', [1, 2, 3]);
+  view.set('content', [1, 2]);
+
+  view.createLayer();
+  ok(view.$('li').length);
+});
+
+test("should allow changing content property to be null", function() {
+  var view = SC.TemplateCollectionView.create({
+    content: [1, 2, 3]
+  });
+
+  view.createLayer();
+  equals(view.$('li').length, 3, "precond - creates three elements");
+
+  view.set('content', null);
+  equals(view.$('li').length, 0, "should not create any li elements");
+});

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

@@ -1,9 +1,10 @@
 // ==========================================================================
 // 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)
 // ==========================================================================
+
+/*globals TemplateTests module */
 /**
   This module specifically tests integration with Handlebars and SproutCore-specific
   Handlebars extensions.
@@ -293,23 +294,29 @@ test("Handlebars templates update properties if a content object changes", funct
   equals(view.$('h2').text(), "brown coffee", "precond - renders color correctly");
   equals(view.$('#price').text(), '$4', "precond - renders price correctly");
 
-  view.set('coffee', SC.Object.create({
-    color: "mauve",
-    price: "$4.50"
-  }));
+  SC.run(function() {
+    view.set('coffee', SC.Object.create({
+      color: "mauve",
+      price: "$4.50"
+    }));
+  });
 
   equals(view.$('h2').text(), "mauve coffee", "should update name field when content changes");
   equals(view.$('#price').text(), "$4.50", "should update price field when content changes");
 
-  view.set('coffee', SC.Object.create({
-    color: "mauve",
-    price: "$5.50"
-  }));
+  SC.run(function() {
+    view.set('coffee', SC.Object.create({
+      color: "mauve",
+      price: "$5.50"
+    }));
+  });
 
   equals(view.$('h2').text(), "mauve coffee", "should update name field when content changes");
   equals(view.$('#price').text(), "$5.50", "should update price field when content changes");
 
-  view.setPath('coffee.price', "$5");
+  SC.run(function() {
+    view.setPath('coffee.price', "$5");
+  });
 
   equals(view.$('#price').text(), "$5", "should update price field when price property is changed");
 });
@@ -334,11 +341,11 @@ test("Template updates correctly if a path is passed to the bind helper", functi
 
   equals(view.$('h1').text(), "$4", "precond - renders price");
 
-  view.setPath('coffee.price', "$5");
+  SC.run(function() { view.setPath('coffee.price', "$5"); });
 
   equals(view.$('h1').text(), "$5", "updates when property changes");
 
-  view.set('coffee', { price: "$6" });
+  SC.run(function() { view.set('coffee', { price: "$6" }); });
   equals(view.$('h1').text(), "$6", "updates when parent property changes");
 });
 
@@ -354,7 +361,7 @@ test("Template updates correctly if a path is passed to the bind helper and the
     price: "$4"
   });
 
-  controller.set('content', realObject);
+  SC.run(function() { controller.set('content', realObject); });
 
   var view = SC.TemplateView.create({
     templateName: 'menu',
@@ -367,7 +374,7 @@ test("Template updates correctly if a path is passed to the bind helper and the
 
   equals(view.$('h1').text(), "$4", "precond - renders price");
 
-  realObject.set('price', "$5");
+  SC.run(function() { realObject.set('price', "$5"); });
 
   equals(view.$('h1').text(), "$5", "updates when property is set on real object");
 
@@ -907,8 +914,10 @@ test("should be able to bind boolean element attributes using {{bindAttr}}", fun
   ok(!view.$('input').attr('disabled'), 'attribute does not exist upon initial render');
   ok(view.$('input').attr('checked'), 'attribute is present upon initial render');
 
-  content.set('isDisabled', true);
-  content.set('isChecked', false);
+  SC.run(function() {
+    content.set('isDisabled', true);
+    content.set('isChecked', false);
+  });
 
   ok(view.$('input').attr('disabled'), 'attribute exists after update');
   ok(!view.$('input').attr('checked'), 'attribute is not present after update');
@@ -931,7 +940,9 @@ test("should be able to add multiple classes using {{bindAttr class}}", function
   ok(view.$('div').hasClass('is-awesome-sauce'), "dasherizes first property and sets classname");
   ok(view.$('div').hasClass('is-also-cool'), "dasherizes second property and sets classname");
 
-  content.set('isAwesomeSauce', false);
+  SC.run(function() {
+    content.set('isAwesomeSauce', false);
+  });
 
   ok(!view.$('div').hasClass('is-awesome-sauce'), "removes dasherized class when property is set to false");
 });