sproutcore 1.7.1.beta → 1.8.0

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

@@ -129,7 +129,7 @@ SC.mixin(SC.String, {
     // NB: This could be implemented as a wrapper to locWithDefault() but
     // it would add some overhead to deal with the arguments and adds stack
     // frames, so we are keeping the implementation separate.
-    if(!SC.Locale.currentLocale) { SC.Locale.createCurrentLocale(); }
+    if (!SC.Locale.currentLocale) { SC.Locale.createCurrentLocale(); }
 
     var localized = SC.Locale.currentLocale.locWithDefault(str);
     if (SC.typeOf(localized) !== SC.T_STRING) { localized = str; }
@@ -137,9 +137,23 @@ 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];
+    if (args.length > 0 && args[0] && args[0].isSCArray) { args = args[0]; }
+
+    // I looked up the performance of try/catch. IE and FF do not care so
+    // long as the catch never happens. Safari and Chrome are affected rather
+    // severely (10x), but this is a one-time cost per loc (the code being
+    // executed is likely as expensive as this try/catch cost).
+    //
+    // Also, .loc() is not called SO much to begin with. So, the error handling
+    // that this gives us is worth it.
+    try {
+      return SC.String.fmt(localized, args);      
+    } catch (e) {
+      SC.error("Error processing string with key: " + str);
+      SC.error("Localized String: " + localized);
+      SC.error("Error: " + e);
+    }
 
-    return SC.String.fmt(localized, args);
   },
 
   /**
@@ -280,7 +294,27 @@ SC.mixin(SC.String, {
   */
   trimRight: function (str) {
     return str.replace(SC.STRING_TRIM_RIGHT_REGEXP,"");
+  },
+  
+  /**
+    Mulitplies a given string. For instance if you have a string "xyz"
+    and multiply it by 2 the result is "xyzxyz".
+    
+    @param {String} str the string to multiply
+    @param {Number} value the number of times to multiply the string
+    @returns {String} the mulitiplied string
+  */
+  mult: function(str, value) {
+    if (SC.typeOf(value) !== SC.T_NUMBER || value < 1) return null;
+    
+    var ret = "";
+    for (var i = 0; i < value; i += 1) {
+      ret += str;
+    }
+    
+    return ret;
   }
+  
 });
 
 

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

@@ -19,7 +19,7 @@
   Timers were created for SproutCore as a way to efficiently defer execution
   of code fragments for use in Animations, event handling, and other tasks.
 
-  Browsers are typically fairly inconsistant about when they will fire a
+  Browsers are typically fairly inconsistent about when they will fire a
   timeout or interval based on what the browser is currently doing.  Timeouts
   and intervals are also fairly expensive for a browser to execute, which
   means if you schedule a large number of them it can quickly slow down the
@@ -28,7 +28,7 @@
   Timers, on the other handle, are scheduled cooperatively using the
   SC.RunLoop, which uses exactly one timeout to fire itself when needed and
   then executes by timers that need to fire on its own.  This approach can
-  be many timers faster than using timers and gaurantees that timers scheduled
+  be many times faster than using timers and guarantees that timers scheduled
   to execute at the same time generally will do so, keeping animations and
   other operations in sync.
 
@@ -319,7 +319,10 @@ SC.Timer = SC.Object.extend(
   invalidate: function() {
     this.beginPropertyChanges();
     this.set('isValid', NO);
-    SC.RunLoop.currentRunLoop.cancelTimer(this);
+    
+    var runLoop = SC.RunLoop.currentRunLoop;
+    if(runLoop) runLoop.cancelTimer(this);
+    
     this.action = this.target = null ; // avoid memory leaks
     this.endPropertyChanges();
 
@@ -414,7 +417,7 @@ SC.Timer = SC.Object.extend(
     Resets the timer settings with the new settings.  This is the method
     called by the Timer pool when a timer is reused.  You will not normally
     call this method yourself, though you could override it if you need to
-    reset additonal properties when a timer is reused.
+    reset additional properties when a timer is reused.
 
     @params {Hash} props properties to copy over
     @returns {SC.Timer} receiver

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

@@ -183,6 +183,27 @@ test("array orderBy using function", function(){
 // ADD SPECIAL CASES HERE
 //
 
+test("verify length is correct in arrayObserver didChange method when orderBy is set", function () {
+  content = [];
+  controller = SC.ArrayController.create({
+    content: content,
+    orderBy: 'i haz your content!'
+  });
+  expect(2);
+
+  controller.addArrayObservers({
+    willChange: function () {
+      equals(this.get('length'), 0, 'length should be 0');
+    },
+
+    didChange: function () {
+      equals(this.get('length'), 1, 'length should be 1');
+    }
+  });
+
+  content.pushObject(":{");
+});
+
 test("verify rangeObserver fires when content is deleted", function() {
 
   content = "1 2 3 4 5".w().map(function(x) {

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/content_destroyed.js

@@ -9,7 +9,7 @@ var content, newContent, controller, destroyCount;
 
 // ..........................................................
 // SINGLE OBSERVABLE OBJECT
-// 
+//
 
 SC.TestObject = SC.Object.extend();
 
@@ -21,20 +21,20 @@ SC.TestObject.reopen({
 
 module("SC.ObjectController - content destroyed", {
   setup: function() {
-    content = SC.TestObject.create({ 
+    content = SC.TestObject.create({
       foo: "foo1", bar: "bar1"
     });
     newContent = SC.Object.create({
       foo: "foo2"
     });
     destroyCount = 0;
-    console.log('SSSSS');
-    controller = SC.ObjectController.create({ 
+
+    controller = SC.ObjectController.create({
       destroyContentOnReplace: YES,
-      content: content 
+      content: content
     });
   },
-  
+
   teardown: function() {
     controller.destroy();
   }
@@ -56,4 +56,4 @@ test("Setting content should NOT call 'destroy' on old content if destroyContent
 test("Setting content should NOT call 'destroy' if set to the same object", function() {
   controller.set('content', content);
   equals(destroyCount, 0, 'destroyCount');
-});
+});

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

@@ -76,6 +76,20 @@ test("Localize a string with mutliple parameters", function() {
   equals(SC.String.loc("Test.Multiple", 'parameter1', 'parameter2'), 'parameter1 parameter2', "Localizing with multiple parameters - using SC.String.loc");
 });
 
+test("Localize a string with null or missing parameters", function() {
+  equals("Test".loc(null), "null", "Localizing with null parameter - using String.prototype.loc");
+  equals(SC.String.loc("Test", null), "null", "Localizing with null parameter - using SC.String.loc");
+
+  equals("Test".loc(), "", "Localizing with missing parameter - using String.prototype.loc");
+  equals(SC.String.loc("Test"), "", "Localizing with missing parameter - using SC.String.loc");
+
+  equals("Test.Multiple".loc("p1", null), "p1 null", "Localizing multiple with null parameter - using String.prototype.loc");
+  equals(SC.String.loc("Test.Multiple", "p1", null), "p1 null", "Localizing with null parameter - using SC.String.loc");
+
+  equals("Test.Multiple".loc("p1"), "p1 ", "Localizing multiple with missing parameter - using String.prototype.loc");
+  equals(SC.String.loc("Test.Multiple", "p1"), "p1 ", "Localizing with missing parameter - using SC.String.loc");
+});
+
 test("Localize a string even if localized version is empty", function() {
   equals("empty".loc(), "", "Using String.prototype.loc");
   equals(SC.String.loc("empty"), "", "Using SC.String.loc");
@@ -115,4 +129,12 @@ test("Access a localized layout hash", function() {
   should_throw(function() {
     "Button".locLayout({left:10});
   }, Error, "locLayout():  There is a localized value for the key 'Button.left' but a value for 'left' was also specified in the non-localized hash");
-});
+});
+
+test("Multiply string", function() {
+  equals('a'.mult(0), null);
+  equals('a'.mult(1), 'a');
+  equals('a'.mult(2), 'aa');
+  equals('xyz'.mult(1), 'xyz');
+  equals('xyz'.mult(2), 'xyzxyz');
+});

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

@@ -0,0 +1,66 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+test("SC.browser.compare()", function() {
+  var browser;
+
+  // Use SC.browser.compare() to determine if the given OS is Mac OS 10.7 "Lion"
+  // like as was/is in use in SC.TextFieldView.
+  equals(SC.browser.compare('10.6.8', '10.7'), -1, "'10.6.8' compared to '10.7' should be -1");
+  equals(SC.browser.compare('10.7', '10.7'), 0, "'10.7' compared to '10.7' should be 0");
+  equals(SC.browser.compare('10.7.1', '10.7'), 0, "'10.7.1' compared to '10.7' should be 0");
+  equals(SC.browser.compare('10.8', '10.7'), 1, "'10.8' compared to '10.7' should be 1");
+
+  equals(SC.browser.compare('10.6.8', 10.7), -1, "'10.6.8' compared to 10.7 should be -1");
+  equals(SC.browser.compare('10.7', 10.7), 0, "'10.7' compared to 10.7 should be 0");
+  equals(SC.browser.compare('10.7.1', 10.7), 0, "'10.7.1' compared to 10.7 should be 0");
+  equals(SC.browser.compare('10.8', 10.7), 1, "'10.8' compared to 10.7 should be 1");
+
+  // Use SC.browser.compare() to determine if the given browser is Firefox 3.5
+  // like as was/is in use in SC.RootResponder.
+  equals(SC.browser.compare('1.8.10', '1.9.1'), -1, "'1.8.10' compared to '1.9.1' should be -1");
+  equals(SC.browser.compare('1.9.0', '1.9.1'), -1, "'1.9.0' compared to '1.9.1' should be -1");
+  equals(SC.browser.compare('1.9', '1.9.1'), 0, "'1.9' compared to '1.9.1' should be 0");
+  equals(SC.browser.compare('1.9.1', '1.9.1'), 0, "'1.9.1' compared to '1.9.1' should be 0");
+  equals(SC.browser.compare('1.10', '1.9.1'), 1, "'1.10' compared to '1.9.1' should be 1");
+
+  equals(SC.browser.compare('1.9.0', 1.9), 0, "'1.9.0' compared to 1.9 should be 0");
+  equals(SC.browser.compare('1.9', 1.9), 0, "'1.9' compared to 1.9 should be 0");
+  equals(SC.browser.compare('1.9.1', 1.9), 0, "'1.9.1' compared to 1.9 should be 0");
+  equals(SC.browser.compare('1.10', 1.9), 1, "'1.10' compared to 1.9 should be 1");
+
+  // Use SC.browser.compare() to determine if the given browser is Safari 5.0.1
+  // like as was/is in use in SC.Event.
+  equals(SC.browser.compare('532.7', '533.7'), -1, "'532.7' compared to '533.7' should be -1");
+  equals(SC.browser.compare('533.6', '533.7'), -1, "'533.6' compared to '533.7' should be -1");
+  equals(SC.browser.compare('533.7', '533.7'), 0, "'533.7' compared to '533.7' should be 0");
+  equals(SC.browser.compare('533', '533.7'), 0, "'533' compared to '533.7' should be 0");
+  equals(SC.browser.compare('533.8', '533.7'), 1, "'533.8' compared to '533.7' should be 1");
+  equals(SC.browser.compare('534.7', '533.7'), 1, "'534.7' compared to '533.7' should be 1");
+
+  equals(SC.browser.compare('532.7', 533.7), -1, "'532.7' compared to 533.7 should be -1");
+  equals(SC.browser.compare('533.6', 533.7), -1, "'533.6' compared to 533.7 should be -1");
+  equals(SC.browser.compare('533.7', 533.7), 0, "'533.7' compared to 533.7 should be 0");
+  equals(SC.browser.compare('533', 533.7), 0, "'533' compared to 533.7 should be 0");
+  equals(SC.browser.compare('533.8', 533.7), 1, "'533.8' compared to 533.7 should be 1");
+  equals(SC.browser.compare('534.7', 533.7), 1, "'534.7' compared to 533.7 should be 1");
+
+  // Use SC.browser.compare() to determine if the given OS is IE7 like as
+  // was/is in use in SC.Pane.
+  equals(SC.browser.compare('6.0', '7.0'), -1, "'6.0' compared to '7.0' should be -1");
+  equals(SC.browser.compare('7.0', '7.0'), 0, "'7.0' compared to '7.0' should be 0");
+  equals(SC.browser.compare('7', '7.0'), 0, "'7' compared to '7.0' should be 0");
+  equals(SC.browser.compare('7.1', '7.0'), 1, "'7.1' compared to '7.0' should be 1");
+  equals(SC.browser.compare('8.0', '7.0'), 1, "'8.0' compared to '7.0' should be 1");
+
+  equals(SC.browser.compare('6.0', 7.0), -1, "'6.0' compared to `7.0 should be -1");
+  equals(SC.browser.compare('7.0', 7.0), 0, "'7.0' compared to 7.0 should be 0");
+  equals(SC.browser.compare('7', 7.0), 0, "'7' compared to 7.0 should be 0");
+  equals(SC.browser.compare('7.1', 7.0), 0, "'7.1' compared to 7.0 should be 0");
+  equals(SC.browser.compare('8.0', 7.0), 1, "'8.0' compared to 7.0 should be 1");
+});

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

@@ -0,0 +1,22 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+// // ========================================================================
+// SC.Event Tests
+// ========================================================================
+(function () {
+  module("SC.Event");
+
+  // WebKit browsers have equal values for keyCode and charCode on keypress event
+  test("commandCodes() : should handle equal keyCode and charCode on keypress", function () {
+    // 115 is also keyCode for F4 button
+    var codes = new SC.Event({ type: 'keypress', keyCode: 115, charCode: 115 }).commandCodes();
+    equals(codes[0], null, 'command');
+    equals(codes[1], 's', 'char');
+  });  
+})();
+

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

@@ -55,27 +55,27 @@ test("Locale.addStrings() : Should be able to add the passed hash of strings to
 	//Added the new languages to the existing list of locales
 	SC.Locale.addStrings(newLocales);
 	
-	//Result should be true as the new lacales added to the list of default locales
+	//Result should be true as the new locales added to the list of default locales
 	equals(true, SC.Locale.options().strings.chinese === 'zh' && SC.Locale.options().strings.dutch === 'nl') ;
 });
 
 test("Locale.options() : Should provide the registered locales that have not been instantiated", function() {
 		
 		//hash of new languages
-		var newLocales = { jamican: 'ji', korean: 'ko'};
+		var newLocales = { jamaican: 'ji', korean: 'ko'};
 
 		//Added the new languages to the existing list of locales
 		SC.Locale.addStrings(newLocales);
 		
-		//Options should return the list of registered locales, so checking if the retruned object has strings.
+		//Options should return the list of registered locales, so checking if the returned object has strings.
 		equals(SC.Locale.options().hasStrings, true) ;
 		
 		//Checking the strings with default locales.
-		equals(true, SC.Locale.options().strings.jamican === 'ji' && SC.Locale.options().strings.korean === 'ko') ;
+		equals(true, SC.Locale.options().strings.jamaican === 'ji' && SC.Locale.options().strings.korean === 'ko') ;
 	});
 	
 test("Locale.normalizeLanguage() : Should provide the two character language code for the passed locale", function() {
-	//If nothing is passed this will retrun the default code as 'en'
+	//If nothing is passed this will return the default code as 'en'
 	equals(SC.Locale.normalizeLanguage(), 'en') ;
 	
 	//If the language is passed as 'English' this will return the code as 'en'
@@ -85,17 +85,17 @@ test("Locale.normalizeLanguage() : Should provide the two character language cod
 	equals(SC.Locale.normalizeLanguage('ab'), 'ab') ; 
 });
 
-test("Locale.toString() : Should retrun the current language set with the guid value", function() {
+test("Locale.toString() : Should return the current language set with the guid value", function() {
 	// Creating the new locale by extending an existing Locale object
 	SC.Locale.locales['mx'] = SC.Locale.extend({ _deprecatedLanguageCodes: ['mexican'] }) ;
 	
-	//Result should retrun the chinese object
+	//Result should return the chinese object
 	equals(SC.Locale.locales.mx.currentLocale.isObject, true) ;
 
 });
 
-test("Locale.createCurrentLocale() : Should create the Lacale Object for the language selected", function() {
-	//This will match the browser language with the SC lanuage and create the object accordingly
+test("Locale.createCurrentLocale() : Should create the Locale Object for the language selected", function() {
+	//This will match the browser language with the SC language and create the object accordingly
 	// This test will pass only for the default languages i.e en, fr, de, ja, es, it. 
 	equals(true, SC.Locale.createCurrentLocale().language === SC.browser.language) ;
 	
@@ -123,7 +123,7 @@ test("Locale.define() : Should be able to define a particular type of locale", f
 		shortNames: ['C','A','Y','N']
 	});
 	
-	//Result should retrun the new locale object
+	//Result should return the new locale object
 	equals(SC.Locale.locales.xy.isClass, true) ;
 });
 
@@ -135,6 +135,6 @@ test("Locale.extend() : Should make sure important properties of Locale object a
 	//Added the new languages to the existing list of locales through the new locale object
 	SC.Locale.locales.mn.addStrings(testLocales);
 	
-	//Result should be true as the new lacales added to the list of default locales
+	//Result should be true as the new locales added to the list of default locales
 	equals(SC.Locale.locales.mn.options().strings.test,'te') ;
 });

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

@@ -34,13 +34,13 @@ test("should emit id in tag opts.id", function() {
 
 test("should emit style in tag if opts.styles is defined", function() {
   context.styles({ alpha: "beta", foo: "bar" }).end();
-  ok(context.get(0).match(/style=\"alpha: beta; foo: bar\"/), '<div> has style="alpha: beta; foo: bar"');
+  ok(context.get(0).match(/style=\"alpha: beta; foo: bar; \"/), '<div> has style="alpha: beta; foo: bar; "');
 });
 
 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('<div style="-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3" >'),
-                            '<div> has 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: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3; " >'),
+                            '<div> has style="-moz-column-count: 3; -webkit-column-count: 3, -o-column-count: 3, -ms-column-count: 3; "');
 });
 
 test("should write arbitrary attrs has in opts", function() {
@@ -61,7 +61,7 @@ test("opts.id should override opts.attrs.id", function() {
 
 test("opts.styles should override opts.attrs.style", function() {
   context.styles({ foo: "foo" }).attr({ style: "bar: bar" }).end();
-  ok(context.get(0).match(/style=\"foo: foo\"/), 'has style="foo: foo"');
+  ok(context.get(0).match(/style=\"foo: foo; \"/), 'has style="foo: foo; "');
 });
 
 test("should return receiver if receiver has no prevObject", function() {

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

@@ -0,0 +1,41 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context */
+module("Render Context--Escaping HTML");
+test("Escaping HTML", function() {
+  var input = "<p>HTML!</p><script>alert('hi');<" + "/script> & Hello, World!";
+  var output = SC.RenderContext.escapeHTML(input);
+  
+  equals(output, '&lt;p&gt;HTML!&lt;/p&gt;&lt;script&gt;alert(\'hi\');&lt;/script&gt; &amp; Hello, World!', "Properly escapes HTML");
+});
+
+test("Tests stolen from Prototype.js", function() {
+  var largeTextEscaped = '&lt;span&gt;test&lt;/span&gt;', 
+      largeTextUnescaped = '<span>test</span>';
+  for (var i = 0; i < 2048; i++) { 
+    largeTextEscaped += ' ABC';
+    largeTextUnescaped += ' ABC';
+  }
+  
+  
+  var tests = [
+    'foo bar', 'foo bar',
+    'foo <span>bar</span>', 'foo &lt;span&gt;bar&lt;/span&gt;',
+    'foo ß bar', 'foo ß bar',
+    'ウィメンズ2007\nクルーズコレクション', 'ウィメンズ2007\nクルーズコレクション',
+    'a<a href="blah">blub</a>b<span><div></div></span>cdef<strong>!!!!</strong>g',
+      'a&lt;a href="blah"&gt;blub&lt;/a&gt;b&lt;span&gt;&lt;div&gt;&lt;/div&gt;&lt;/span&gt;cdef&lt;strong&gt;!!!!&lt;/strong&gt;g',
+    '1\n2', '1\n2',
+    
+    largeTextUnescaped, largeTextEscaped
+  ];
+  
+  for (var idx = 0; idx < tests.length; idx++) {
+    // some of these strings are REALLY LONG so we don't want to write them out
+    ok(SC.RenderContext.escapeHTML(tests[idx++]) === tests[idx]);
+  }
+});

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

@@ -85,7 +85,7 @@ module("SC.RenderContext#addClass", {
   }
 });
 
-test("shoudl return receiver", function() {
+test("should return receiver", function() {
   equals(context.addClass('foo'), context, "receiver");
 });