sproutcore 1.0.1049.pre.2 → 1.4.0.rc

data/lib/frameworks/sproutcore/frameworks/foundation/system/routes.js

@@ -234,9 +234,9 @@ SC.routes = SC.Object.create({
     }
     
     if (this.get('location') !== loc) {
-      SC.RunLoop.begin();
-      this.set('location', loc);
-      SC.RunLoop.end();
+      SC.run(function() {
+        this.set('location', loc);        
+      }, this);
     }
   },
   

data/lib/frameworks/sproutcore/frameworks/foundation/system/task_queue.js

@@ -47,7 +47,7 @@ SC.TaskQueue = SC.Task.extend({
   */
   hasTasks: function() {
     return this._tasks.length > 0;
-  }.property("taskCount").cacheable(),
+  }.property('taskCount').cacheable(),
   
   /**
     Returns the number of tasks in the queue.
@@ -61,7 +61,7 @@ SC.TaskQueue = SC.Task.extend({
   */
   push: function(task) {
     this._tasks.push(task);
-    this.notifyPropertyChange("taskCount");
+    this.notifyPropertyChange('taskCount');
   },
   
   /**
@@ -73,7 +73,7 @@ SC.TaskQueue = SC.Task.extend({
     
     // otherwise, return the first one in the queue
     var next = this._tasks.shift();
-    this.notifyPropertyChange("taskCount");
+    this.notifyPropertyChange('taskCount');
     return next;
   },
   
@@ -83,20 +83,20 @@ SC.TaskQueue = SC.Task.extend({
   */
   _taskCountDidChange: function() {
     this._setupIdle();
-  }.observes("taskCount"),
+  }.observes('taskCount'),
   
   /**
     Sets up the scheduled idling check if needed and applicable.
     @private
   */
   _setupIdle: function() {
-    if (this.get("runWhenIdle") && !this._idleIsScheduled && this.get("taskCount") > 0) {
+    if (this.get('runWhenIdle') && !this._idleIsScheduled && this.get('taskCount') > 0) {
       var self = this;
       setTimeout(
         function(){
           self._idleEntry();
         }, 
-        this.get("interval")
+        this.get('interval')
       );
       this._idleIsScheduled = YES;
     }
@@ -109,13 +109,13 @@ SC.TaskQueue = SC.Task.extend({
   _idleEntry: function() {
     this._idleIsScheduled = NO;
     var last = SC.RunLoop.lastRunLoopEnd;
-    if (Date.now() - last > this.get("minimumIdleDuration")) {
+    if (Date.now() - last > this.get('minimumIdleDuration')) {
       // if no recent events (within < 1s)
       this.run();
     } else {
-      SC.RunLoop.begin();
-      this._setupIdle();
-      SC.RunLoop.end();
+      SC.run(function() {
+        this._setupIdle();        
+      }, this);
       SC.RunLoop.lastRunLoopEnd = last; // we were never here
     }
   },

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

@@ -23,7 +23,7 @@ SC.mixin( /** @scope SC */ {
     
     Use this method when you want to cause a file to be downloaded to a users
     desktop instead of having it display in the web browser.  Note that your
-    server must return a header indicating that the file is intended for 
+    server must return a header indicating that the file  is intended for 
     download also.
   */
   download: function(path) {
@@ -50,7 +50,7 @@ SC.mixin( /** @scope SC */ {
         document.body.removeChild(document.getElementById(frameId)); 
         frameId = null;
       } ;
-      var t = r.invokeLater(null, 2000);
+      r.invokeLater(null, 2000);
     }
     //remove possible IE7 leak
     tempDLIFrame = null;
@@ -267,14 +267,17 @@ SC.mixin( /** @scope SC */ {
     @param width {Number} The fixed width to assume the text will fill
     @param style {String} A CSS style declaration.  E.g., 'font-weight: bold'
     @param classNames {Array} An array of class names that may affect the style
+    @param ignoreEscape {Boolean} To NOT html escape the string.
     @returns {Number} The height of the text given the passed parameters
   */
-  heightForString: function(str, width, style, classNames) {
+  heightForString: function(str, width, style, classNames, ignoreEscape) {
     var elem = this._heightCalcElement, classes, height;
-
+    
+    if(!ignoreEscape) str = SC.RenderContext.escapeHTML(str);
+    
     // Coalesce the array of class names to one string, if the array exists
     classes = (classNames && SC.typeOf(classNames) === SC.T_ARRAY) ? classNames.join(' ') : '';
-
+    
     if (!width) width = 100; // default to 100 pixels
 
     // Only create the offscreen element once, then cache it
@@ -299,18 +302,20 @@ SC.mixin( /** @scope SC */ {
   },
   
   /**
-  Sets up a string measuring environment.
+    Sets up a string measuring environment.
   
-  You may want to use this, in conjunction with teardownStringMeasurement and
-  measureString, instead of metricsForString, if you will be measuring many strings
-  with the same settings. It would be a lot more efficient, as it would only prepare
-  and teardown once instead of several times.
+    You may want to use this, in conjunction with teardownStringMeasurement and
+    measureString, instead of metricsForString, if you will be measuring many 
+    strings with the same settings. It would be a lot more efficient, as it 
+    would only prepare and teardown once instead of several times.
   
-  @param exampleElement The example element to grab styles from, or the style string to use.
-  @param classNames {String} (Optional) Class names to add to the test element.
+    @param exampleElement The example element to grab styles from, or the style 
+                          string to use.
+    @param classNames {String} (Optional) Class names to add to the test element.
   */
   prepareStringMeasurement: function(exampleElement, classNames) {
-    var element = this._metricsCalculationElement, classes, styles, style;
+    var element = this._metricsCalculationElement, classes, styles, style,
+        cqElem;
     
     // collect the class names
     classes = SC.A(classNames).join(' ');
@@ -320,7 +325,8 @@ SC.mixin( /** @scope SC */ {
       element = this._metricsCalculationElement = document.createElement("div");
       document.body.insertBefore(element, null);
     }
-    
+
+    cqElem = SC.$(element);    
     // two possibilities: example element or type string
     if (SC.typeOf(exampleElement) != SC.T_STRING) {
       var computed = null;
@@ -333,6 +339,7 @@ SC.mixin( /** @scope SC */ {
       // set (lovely cssText property here helps a lot—if it works. Unfortunately, only Safari supplies it.)
       style = computed.cssText;
       
+
       // if that didn't work (Safari-only?) go alternate route. This is SLOW code...
       if (!style || style.trim() === "") {
         // there is only one way to do it...
@@ -366,7 +373,7 @@ SC.mixin( /** @scope SC */ {
       else
       {
         // set style
-        element.setAttribute("style", style + "; position:absolute; left: 0px; top: 0px; bottom: auto; right: auto; width: auto; height: auto;");
+        cqElem.attr("style", style + "; position:absolute; left: 0px; top: 0px; bottom: auto; right: auto; width: auto; height: auto;");
       }
       
       // clean up
@@ -376,7 +383,7 @@ SC.mixin( /** @scope SC */ {
       style = exampleElement;
       
       // set style
-      element.setAttribute("style", style + "; position:absolute; left: 0px; top: 0px; bottom: auto; right: auto; width: auto; height: auto;");
+      cqElem.attr("style", style + "; position:absolute; left: 0px; top: 0px; bottom: auto; right: auto; width: auto; height: auto;");
     }
     
     element.className = classes;
@@ -384,13 +391,13 @@ SC.mixin( /** @scope SC */ {
   },
   
   /**
-  Tears down the string measurement environment. Usually, this doesn't _have_
-  to be called, but there are too many what ifs: for example, what if the measurement
-  environment has a bright green background and is over 10,000px wide? Guess what: it will
-  become visible on the screen.
+    Tears down the string measurement environment. Usually, this doesn't _have_
+    to be called, but there are too many what ifs: for example, what if the measurement
+    environment has a bright green background and is over 10,000px wide? Guess what: it will
+    become visible on the screen.
   
-  So, generally, we tear the measurement environment down so that it doesn't cause issue.
-  However, we keep the DOM element for efficiency.
+    So, generally, we tear the measurement environment down so that it doesn't cause issue.
+    However, we keep the DOM element for efficiency.
   */
   teardownStringMeasurement: function() {
     var element = this._metricsCalculationElement;
@@ -403,13 +410,16 @@ SC.mixin( /** @scope SC */ {
   },
   
   /**
-  Measures a string in the prepared environment.
+    Measures a string in the prepared environment.
   
-  An easier and simpler alternative (but less efficient for bulk measuring) is metricsForString.
+    An easier and simpler alternative (but less efficient for bulk measuring) is metricsForString.
   
-  @param string {String} The string to measure.
+    @param string {String} The string to measure.
+    @param ignoreEscape {Boolean} To NOT html escape the string.
   */
-  measureString: function(string) {
+  measureString: function(string, ignoreEscape) {
+    if(!ignoreEscape) string = SC.RenderContext.escapeHTML(string);
+    
     var element = this._metricsCalculationElement;
     if (!element) {
       throw "measureString requires a string measurement environment to be set up. Did you mean metricsForString?";
@@ -429,19 +439,20 @@ SC.mixin( /** @scope SC */ {
     return result;
   },
   
-  
   /**
-  Given a string and an example element or style string, and an optional
-  set of class names, calculates the width and height of that block of text.
+    Given a string and an example element or style string, and an optional
+    set of class names, calculates the width and height of that block of text.
   
-  To constrain the width, set max-width on the exampleElement or in the style string.
+    To constrain the width, set max-width on the exampleElement or in the style string.
   
-  @param string {String} The string to measure.
-  @param exampleElement The example element to grab styles from, or the style string to use.
-  @param classNames {String} (Optional) Class names to add to the test element.
+    @param string {String} The string to measure.
+    @param exampleElement The example element to grab styles from, or the style string to use.
+    @param classNames {String} (Optional) Class names to add to the test element.
+    @param ignoreEscape {Boolean} To NOT html escape the string.
   */
-  metricsForString: function(string, exampleElement, classNames)
-  {
+  metricsForString: function(string, exampleElement, classNames, ignoreEscape) {
+    if(!ignoreEscape) string = SC.RenderContext.escapeHTML(string);
+    
     SC.prepareStringMeasurement(exampleElement, classNames);
     var result = SC.measureString(string);
     SC.teardownStringMeasurement();
@@ -609,12 +620,11 @@ SC.mixin( /** @scope SC */ {
   convertHexToHsv: function (hex) {
     var rgb = this.expandColor(hex),
         max = Math.max(Math.max(rgb[0], rgb[1]), rgb[2]),
-        min = Math.min(Math.min(rgb[0], rgb[1]), rgb[2]);
-
-    var h = (max == min) ? 0 : ((max == rgb[0]) ? ((rgb[1]-rgb[2])/(max-min)/6) : ((max == rgb[1]) ? ((rgb[2]-rgb[0])/(max-min)/6+1/3) : ((rgb[0]-rgb[1])/(max-min)/6+2/3)));
+        min = Math.min(Math.min(rgb[0], rgb[1]), rgb[2]),
+        s = (max === 0) ? 0 : (1 - min/max),
+        v = max/255,
+        h = (max == min) ? 0 : ((max == rgb[0]) ? ((rgb[1]-rgb[2])/(max-min)/6) : ((max == rgb[1]) ? ((rgb[2]-rgb[0])/(max-min)/6+1/3) : ((rgb[0]-rgb[1])/(max-min)/6+2/3)));
     h = (h < 0) ? (h + 1) : ((h > 1)  ? (h - 1) : h);
-    var s = (max === 0) ? 0 : (1 - min/max);
-    var v = max/255;
     return [h, s, v];
   },
 
@@ -636,9 +646,8 @@ SC.mixin( /** @scope SC */ {
 
   // parse rgb color or 3-digit hex color to return a properly formatted 6-digit hex colour spec, or false
   parseColor: function(string) {
-    var i=0, color = '#', match;
+    var i=0, color = '#', match, part;
     if(match = this.PARSE_COLOR_RGBRE.exec(string)) {
-      var part;
       for (i=1; i<=3; i++) {
         part = Math.max(0, Math.min(255, parseInt(match[i],0)));
         color += this.toColorPart(part);
@@ -684,9 +693,9 @@ SC.mixin( /** @scope SC */ {
   // Convert double byte characters to standard Unicode. Considers only
   // conversions from zenkaku to hankaky roomaji
   uniJapaneseConvert: function (str){ 
-    var nChar, cString= '', j;
+    var nChar, cString= '', j, jLen;
     //here we cycle through the characters in the current value 
-    for (j=0; j<str.length; j++){ 
+    for (j=0, jLen = str.length; j<jLen; j++){ 
       nChar = str.charCodeAt(j);
 
       //here we do the unicode conversion from zenkaku to hankaku roomaji 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/button/keyEquivalents.js

@@ -9,34 +9,34 @@
 // ..........................................................
 // performKeyEquivalent() - verify that return value is correct.
 //
-var view;
- 
-module('SC.Button#performKeyEquivalent', {
-  setup: function() {
-    view = SC.View.create(SC.Button, {
-      triggerAction: function() { return YES; }
-    });
-    view.set('title', 'hello world');
-    view.set('keyEquivalent', 'return');
-  },
+var pane = SC.ControlTestPane.design()
+  .add("basic", SC.View.extend(SC.Button), { 
+    triggerAction: function() { return YES; },
+    title:'hello world',
+    keyEquivalent: 'return'
+  });
   
-  teardown: function() {
-    view.destroy();
-    view = null;
-  }
-});
+pane.show(); // add a test to show the test pane
+
+  
+ 
+module('SC.View#performKeyEquivalent', pane.standardSetup());
  
 test("handles matching key equivalent 'return'", function() {
+  var view = pane.view('basic');
   view.triggerAction = function(evt) { return YES; }; // act like we handled it if we get here
-  ok(view.performKeyEquivalent('return'), "should return truthy value indicating it handled the key equivalent 'return'");
+  var u = view.pane();
+  ok(u.performKeyEquivalent('return'), "should return truthy value indicating it handled the key equivalent 'return'");
 });
  
 test("ignores non-matching key equivalent 'wrong_key'", function() {
+  var view = pane.view('basic');
   view.triggerAction = function(evt) { return YES; }; // act like we handled it if we get here (we shouldn't in this case)
   ok(!view.performKeyEquivalent('wrong_key'), "should return falsy value indicating it ignored the non-matching key equivalent 'wrong_key'");
 });
 
 test("triggers on return if isDefault is set and no keyEquivalent is set", function() {
+  var view = pane.view('basic');
   view.set('isDefault', YES);
   view.set('keyEquivalent', null);
   ok(view.performKeyEquivalent('return'), 'should be handled');
@@ -47,6 +47,7 @@ test("triggers on return if isDefault is set and no keyEquivalent is set", funct
 
 
 test("triggers on escape if isCancel is set and no keyEquivalent is set", function() {
+  var view = pane.view('basic');
   view.set('isCancel', YES);
   view.set('keyEquivalent', null);
   ok(view.performKeyEquivalent('escape'), 'should be handled');

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

@@ -140,4 +140,3 @@ test("Test SC.StaticLayout frame support", function() {
   
   ok(SC.typeOf(child.get('frame')) === SC.T_HASH, "View's frame property will be an object when useStaticLayout is YES and layer is attached to DOM.");
 });
-

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/end.js

@@ -39,7 +39,7 @@ test("should emit style in tag if opts.styles is defined", function() {
 
 test("should emit style with custom browser attributes", function() {
   context.styles({ mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' }).end();
-  ok(context.get(0).match(/style=\"-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3\"/),
+  ok(context.get(0).match('<div style="-moz-column-count: 3px; -webkit-column-count: 3px; -o-column-count: 3px; -ms-column-count: 3px" >'),
                             '<div> has style="-moz-column-count: 3; -webkit-column-count: 3, -o-column-count: 3, -ms-column-count: 3"');
 });
 

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

@@ -52,8 +52,9 @@ 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, { height: '20px', color: 'black', height: '20px', borderTop: 'hotpink 1px solid', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
+  else if(SC.browser.mozilla) same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink' }, '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");
 });
@@ -98,12 +99,3 @@ test("css() should be an alias for addStyle()", function() {
   equals(SC.RenderContext.fn.css, SC.RenderContext.fn.addStyle, 'methods');
 });
 
-test("addStyle should remove properties that are part of combo properties", function(){
-  SC.COMBO_STYLES = { foo: 'fooSub'.w() };
-  context.styles({ foo: 'foo', fooSub: 'bar' });
-  equals(context.styles().fooSub, 'bar', 'proper starting values');
-  context.addStyle('foo', 'bar');
-  equals(context.styles().foo, 'bar', 'foo has new value');
-  equals(context.styles().fooSub, undefined, 'fooSub has no value');
-});
-

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/update.js

@@ -211,6 +211,8 @@ test("set styles handle custom browser attributes", function() {
   // sometimes, without one. Normalize it here.
   var style = SC.$(elem).attr("style");
   if (!style.match(/;$/)) style += ';' ;
-
-  equals(style, "-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3;");
+  //Gecko completely ignores css attributes that it doesn't understand.
+  if(SC.browser.mozilla) equals(style, "-moz-column-count: 3;");
+  else if (SC.browser.msie) equals(style, "-webkit-column-count: 3; -moz-column-count: 3; -o-column-count: 3; -ms-column-count: 3;");
+  else equals(style, "-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3;");
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/timer/invokeLater.js

@@ -77,11 +77,11 @@ test("should invoke method string immediately if no time passed", function() {
 test("should automatically bind with arguments if passed", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
-  var g1 = null, g2 = null ; target = null ;
+  var g1 = null, g2 = null ;
   
   var o = SC.Object.create({
     func: function(arg1, arg2) { 
-      g1 = arg1 ; g2 = arg2 ; fired = YES ; target = this ;
+      g1 = arg1 ; g2 = arg2 ; fired = YES ; 
     }
   });
   o.invokeLater('func', 200, 'ARG1', 'ARG2') ;
@@ -96,7 +96,6 @@ test("should automatically bind with arguments if passed", function() {
     equals(YES, fired, 'did not fire') ;
     equals(g1, 'ARG1', 'arg1') ;
     equals(g2, 'ARG2', 'arg2') ;
-    equals(target, o, 'target') ;
     window.start() ; // starts the test runner
   } ;
   
@@ -176,11 +175,11 @@ test("should invoke function immediately if no time passed", function() {
 test("should automatically bind with arguments if passed", function() {
   SC.RunLoop.begin() ;
   var fired = NO ;
-  var g1 = null, g2 = null ; target = null ;
+  var g1 = null, g2 = null ;
   
   var o = SC.Object.create() ;
   var func = function(arg1, arg2) { 
-    g1 = arg1 ; g2 = arg2 ; fired = YES ; target = this ;
+    g1 = arg1 ; g2 = arg2 ; fired = YES ; 
   } ; 
   func.invokeLater(o, 200, 'ARG1', 'ARG2') ;
   SC.RunLoop.end() ;
@@ -193,8 +192,7 @@ test("should automatically bind with arguments if passed", function() {
     }
     equals(YES, fired, 'did not fire') ;
     equals(g1, 'ARG1', 'arg1') ;
-    equals(g2, 'ARG2', 'arg2') ;
-    equals(target, o, 'target') ;
+    equals(g2, 'ARG2', 'arg2') ; 
     window.start() ; // starts the test runner
   } ;
   

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/pane/sendEvent.js

@@ -18,6 +18,7 @@ module("SC.Pane#sendEvent", {
     defaultResponder = SC.Object.create({ defaultEvent: handler });
     pane = SC.Pane.create({
       defaultResponder: defaultResponder,
+      paneEvent: handler,
       childViews: [SC.View.extend({
         fooEvent: handler,
         childViews: [SC.View.extend({
@@ -162,4 +163,44 @@ test("when invoked with target = null", function() {
   equals(callCount, 0, 'should not invoke handler');
   equals(handler, null, 'should return no responder');
   
+  // test event handler on pane itself
+  callCount = 0;
+  handler = pane.sendEvent('paneEvent', evt);
+  equals(callCount, 1, 'should invoke handler on pane');
+  equals(handler, pane, 'should return pane as responder that handled event');  
+
+});
+
+test("when invoked with target = null, no default or first responder", function() {
+  var handler ;
+
+  // no first or default responder
+  pane.set('firstResponder', null);
+  pane.set('defaultResponder', null);
+    
+  // test event handler on child view of target
+  callCount = 0;
+  handler = pane.sendEvent('barEvent', evt);
+  equals(callCount, 0, 'should not invoke handler');
+  equals(handler, null, 'should return no responder');
+
+  // test event handler on target 
+  callCount = 0;
+  handler = pane.sendEvent('fooEvent', evt);
+  equals(callCount, 0, 'should not invoke handler');
+  equals(handler, null, 'should return no responder');
+
+  // test unhandled event handler
+  callCount = 0;
+  handler = pane.sendEvent('imaginary', evt);
+  equals(callCount, 0, 'should not invoke handler');
+  equals(handler, null, 'should return no responder');
+  
+  // test event handler on pane itself
+  callCount = 0;
+  handler = pane.sendEvent('paneEvent', evt);
+  equals(callCount, 1, 'should invoke handler on pane');
+  equals(handler, pane, 'should return pane as responder that handled event');  
+
 });
+