sproutcore 1.9.0 → 1.9.1

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

@@ -457,7 +457,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     @param {Object} source the source to limit
     @returns {SC.SelectionSet} receiver
   */
-  constrain: function(source) {
+  constrain: function (source) {
     var set, len, max, objects;
 
     this.beginPropertyChanges();
@@ -477,9 +477,11 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
     // remove objects not in source
     if (objects = this._objects) {
-      objects.forEach(function(cur) {
-        if (source.indexOf(cur)<0) this.removeObject(cur);
-      },this);
+      var i, cur;
+      for (i = objects.length - 1; i >= 0; i--) {
+        cur = objects[i];
+        if (source.indexOf(cur) < 0) this.removeObject(cur);
+      }
     }
 
     this.endPropertyChanges();

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

@@ -6,15 +6,15 @@
 // ==========================================================================
 
 var LocaleObject;
-module("object.SC.Locale()", {	
+module("object.SC.Locale()", {
 		setup: function() {
-			
+
 			LocaleObject = SC.Locale.create({
 				init: function(){
 					sc_super();
 					//hash of new languages
 					var newLocales = { deflang: 'dl', empty: '' };
-					
+
 					//Added the new languages to the existing list of locales
 					SC.Locale.addStrings(newLocales);
 				}
@@ -22,12 +22,12 @@ module("object.SC.Locale()", {
 
 		}
 	});
-	
+
 test("Locale.init() : Should return a flag if the language has been set during the locale initialization", function() {
 	// As the locale is added during initialization the value of hasString is true
 	equals(LocaleObject.hasStrings, true) ;
-	
-	//check the string values. 
+
+	//check the string values.
 	equals(LocaleObject.strings.deflang, 'dl') ;
 });
 
@@ -44,51 +44,70 @@ test("Locale.locWithDefault() : localized version of the string even if localize
   equals(LocaleObject.locWithDefault("empty", "Empty"), "");
 });
 
-test("Locale.addStrings() : Should be able to add the passed hash of strings to the locale's strings table", function() {		
-	
+test("Locale.addStrings() : Should be able to add the passed hash of strings to the locale's strings table", function() {
+
 	//Check for the new languages. This should be false as these are not added to the list of locales
 	equals(false, SC.Locale.options().strings.chinese === 'zh' && SC.Locale.options().strings.dutch === 'nl') ;
-	
+
 	//hash of new languages
 	var newLocales = { chinese: 'zh', czech: 'cs', dutch: 'nl'};
-	
+
 	//Added the new languages to the existing list of locales
 	SC.Locale.addStrings(newLocales);
-	
+
 	//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') ;
 });
 
+/**
+	There was a bug in SC.Locale where the `strings` object was cloned for each
+	subclass but then the original `strings` object was used to mix in new strings
+	and applied back.  This meant that each subclass ended up sharing the
+	`strings` object and only one set of localizations (the last one) would exist.
+*/
+test("Locale.extend.addStrings() : Subclasses should not share the strings object.", function() {
+	var strings;
+
+	strings = { 'hello': 'Hello' };
+	SC.Locale.locales.en.addStrings(strings);
+
+	strings = { 'hello': 'Bonjour' };
+	SC.Locale.locales.fr.addStrings(strings);
+
+	//Result should be true as the new locales added to the list of default locales
+	ok(SC.Locale.locales.en.prototype.strings !== SC.Locale.locales.fr.prototype.strings, "The strings object should not be shared between subclasses.");
+});
+
 test("Locale.options() : Should provide the registered locales that have not been instantiated", function() {
-		
+
 		//hash of new languages
 		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 returned object has strings.
 		equals(SC.Locale.options().hasStrings, true) ;
-		
+
 		//Checking the strings with default locales.
 		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 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'
 	equals(SC.Locale.normalizeLanguage('English'), 'en') ;
-	
+
 	//For any other code passed which is not in the default code it should return as it was passed
-	equals(SC.Locale.normalizeLanguage('ab'), 'ab') ; 
+	equals(SC.Locale.normalizeLanguage('ab'), 'ab') ;
 });
 
 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 return the chinese object
 	equals(SC.Locale.locales.mx.currentLocale.isObject, true) ;
 
@@ -96,23 +115,23 @@ test("Locale.toString() : Should return the current language set with the guid v
 
 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. 
+	// 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) ;
-	
+
 	//Resetting the default browser language
 	SC.browser.language='kn';
-	
+
 	//This is false as currentLocale will be created as 'en'
 	equals(false, SC.Locale.createCurrentLocale().language===SC.browser.language) ;
-});	
+});
 
 test("Locale.localeClassFor() : Should find the locale class for the names language code or creates on based on its most likely parent", function() {
  		// Local Class for any language other than default languages will be 'en'. Therefore this condition is false
 	equals(false, SC.Locale.localeClassFor('nl').create().language === "nl") ;
-	
+
 	// This adds the new language with the parent language to the default list
 	SC.Locale.locales['nl'] = SC.Locale.extend({ _deprecatedLanguageCodes: ['Dutch'] }) ;
-	
+
 	//This condition is true as the local class now exists for 'nl'
 	equals(true, SC.Locale.localeClassFor('nl').create().language==="nl") ;
 });
@@ -122,19 +141,19 @@ test("Locale.define() : Should be able to define a particular type of locale", f
 		longNames: 'Charles John Romonoski Gregory William'.split(' '),
 		shortNames: ['C','A','Y','N']
 	});
-	
+
 	//Result should return the new locale object
 	equals(SC.Locale.locales.xy.isClass, true) ;
 });
 
 test("Locale.extend() : Should make sure important properties of Locale object are copied to a new class", function() {
 	SC.Locale.locales['mn'] = SC.Locale.extend({ _deprecatedLanguageCodes: ['newlang'] }) ;
-	
+
 	//hash of new languages
 	var testLocales = { test: 'te', newtest: 'nt'};
 	//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 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/selection_set/remove.js

@@ -10,7 +10,7 @@ module("SC.SelectionSet#remove", {
     set = SC.SelectionSet.create();
     array = '0 1 2 3 4 5 6 7 8 9'.w();
     array2 = 'a b c d e f g h i k l m'.w();
-    
+
     expected = SC.IndexSet.create(4,3);
     expected2 = SC.IndexSet.create(1);
     expected.source = array;
@@ -18,7 +18,7 @@ module("SC.SelectionSet#remove", {
   }
 });
 
-/* 
+/*
   validates that the selection set has the expected content.  pass index sets
   with sources set appropriately.  The order of the array is not important.
 */
@@ -26,12 +26,12 @@ function validate(set, expected, defaultSource) {
   var sources = set.get('sources'),
       len  = expected.length,
       idx, cur, actual ;
-      
-  equals(sources.length, expected.length, 'should have same number of sources (actual sources: %@)'.fmt(sources));  
-  
+
+  equals(sources.length, expected.length, 'should have same number of sources (actual sources: %@)'.fmt(sources));
+
   for(idx=0;idx<len;idx++) {
     cur = expected[idx];
-    if (!cur.source) cur.source =defaultSource; 
+    if (!cur.source) cur.source =defaultSource;
     actual = set.indexSetForSource(cur.source, NO);
     ok(actual, 'should have indexSet for source: %@'.fmt(cur.source));
     equals(actual.source, cur.source, 'indexSet.source should match source');
@@ -40,7 +40,7 @@ function validate(set, expected, defaultSource) {
 }
 // ..........................................................
 // BASIC REMOVES
-// 
+//
 
 test("Removed indexes for single source", function() {
   set.add(array, 4, 3);
@@ -51,7 +51,7 @@ test("Removed indexes for single source", function() {
 });
 
 test("Removed multiple sources", function() {
-  
+
   set.add(array, 4, 3).add(array2, 1);
   validate(set, [expected, expected2]); // precondition
 
@@ -71,13 +71,13 @@ test("Remove IndexSet with source", function() {
 });
 
 test("Adding another SelectionSet", function() {
-  
+
   set.add(array, 4, 3).add(array2, 1);
   validate(set, [expected, expected2]); // precondition
 
   var x = SC.SelectionSet.create().add(array, 4,1).add(array2, 1);
   set.remove(x);
-  
+
   expected.remove(4,1);
   validate(set, [SC.IndexSet.create(5,2)], array);
 });
@@ -85,27 +85,63 @@ test("Adding another SelectionSet", function() {
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("removing index set should also remove individually added objects", function() {
   var objToRemove = array[3]; // item from one array...
   var objToNotRemove = array2[3]; // item from array we won't remove..
-  
+
   // add both objects.
   set.addObject(objToRemove).addObject(objToNotRemove);
   set.add(array, 4, 3);
-  
+
   ok(set.contains(objToRemove), 'set should contain objToRemove');
   ok(set.contains(objToNotRemove), 'set should contain objToNotRemove');
   equals(set.get('length'), 5, 'set.length should == two objects + index.length');
-    
+
   // now remove from array set
-  set.remove(array, 2, 4);  
-  
+  set.remove(array, 2, 4);
+
   SC.stopIt = NO ;
-  
+
   ok(!set.contains(objToRemove), 'set should NOT contain objToRemove');
   ok(set.contains(objToNotRemove), 'set should contain objToNotRemove');
   equals(set.get('length'), 2, 'set.length should == 1 object + index.length');
 });
 
+
+module("SC.SelectionSet#constrain", {
+  setup: function() {
+    set = SC.SelectionSet.create();
+    array = '0 1 2 3 4 5 6 7 8 9'.w();
+    array2 = 'a b c d e f g h i k l m'.w();
+
+    expected = SC.IndexSet.create(4,3);
+    expected2 = SC.IndexSet.create(1);
+    expected.source = array;
+    expected2.source = array2;
+  }
+});
+
+/**
+  After cleaning up a memory leak in SC.Set, it was discovered that the constrain
+  method of SC.SelectionSet doesn't work properly.  It was naively using forEach
+  to iterate through the objects while mutating the array so that the last
+  object would never be constrained.
+
+  This test shows that you can constrain more than one object using the method.
+*/
+test("Tests constrain helper method.", function () {
+  var objToRemove1 = 'a',
+    objToRemove2 = 'b';
+
+  set.add(array, 4, 3);
+  set.addObject(objToRemove1);
+  set.addObject(objToRemove2);
+  ok(set.contains(objToRemove1), 'Set should contain objToRemove1');
+  ok(set.contains(objToRemove2), 'Set should contain objToRemove2');
+  set.constrain(array);
+  ok(!set.contains(objToRemove1), 'Set should not contain objToRemove1');
+  ok(!set.contains(objToRemove2), 'Set should not contain objToRemove2');
+});
+

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

@@ -0,0 +1,34 @@
+// ==========================================================================
+// 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.View#destroy");
+
+test('isDestroyed works.', function() {
+  var v = SC.View.create();
+  ok(!v.get('isDestroyed'), 'undestroyed view\'s isDestroyed property is false.');
+  v.destroy();
+  ok(v.get('isDestroyed'), 'destroyed view\'s isDestroyed property is true.');
+});
+
+test('childViews specified as classes are also destroyed.', function() {
+  var v = SC.View.create({ childViews: [ SC.View ] }),
+      v2 = v.childViews[0];
+  v.destroy();
+  ok(v2.get('isDestroyed'), 'destroying a parent also destroys a child, mwaha.');
+  ok(!v2.get('parentView'), 'destroying a parent removes the parentView reference from the child.');
+  ok(v2.get('owner') === null, 'destroying a parent removes the owner reference from the child.');
+});
+
+test('childViews specified as instances are also destroyed.', function() {
+  var v2 = SC.View.create(),
+      v = SC.View.create({ childViews: [v2] });
+  v.destroy();
+  ok(v2.get('isDestroyed'), 'destroying a parent also destroys a child, mwaha.');
+  ok(!v2.get('parentView'), 'destroying a parent removes the parentView reference from the child.');
+  ok(v2.get('owner') === null, 'destroying a parent removes the owner reference from the child.');
+});

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

@@ -3,25 +3,25 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*globals module, test, equals, context, ok, same, Q$ */
 
-/*global module test equals context ok same Q$ */
 
 module("SC.View#destroyLayer");
 
 test("it if has no layer, does nothing", function() {
   var callCount = 0;
-  var view = SC.View.create({ 
+  var view = SC.View.create({
     willDestroyLayer: function() { callCount++; }
   });
   ok(!view.get('layer'), 'precond - does NOT have layer');
-  
+
   view.destroyLayer();
   equals(callCount, 0, 'did not invoke callback');
 });
 
 test("if it has a layer, calls willDestroyLayer on receiver and child views then deletes the layer", function() {
   var callCount = 0;
-  
+
   var view = SC.View.create({
     willDestroyLayer: function() { callCount++; },
     childViews: [SC.View.extend({
@@ -33,9 +33,9 @@ test("if it has a layer, calls willDestroyLayer on receiver and child views then
   });
   view.createLayer();
   ok(view.get('layer'), 'precond - view has layer');
-  
+
   view.destroyLayer();
-  equals(callCount, 2, 'invoked destroy layer');  
+  equals(callCount, 2, 'invoked destroy layer');
   ok(!view.get('layer'), 'view no longer has layer');
 });
 
@@ -46,11 +46,11 @@ test("if it has a layer, calls willDestroyLayerMixin on receiver and child views
   var mixinA = {
     willDestroyLayerMixin: function() { callCount++; }
   };
-  
+
   var mixinB = {
     willDestroyLayerMixin: function() { callCount++; }
   };
-  
+
   var view = SC.View.create(mixinA, mixinB, {
     childViews: [SC.View.extend(mixinA, mixinB, {
       childViews: [SC.View.extend(mixinA)]
@@ -58,7 +58,7 @@ test("if it has a layer, calls willDestroyLayerMixin on receiver and child views
   });
   view.createLayer();
   view.destroyLayer();
-  equals(callCount, 5, 'invoked willDestroyLayerMixin on all mixins');  
+  equals(callCount, 5, 'invoked willDestroyLayerMixin on all mixins');
 });
 
 test("returns receiver", function() {
@@ -69,10 +69,10 @@ test("returns receiver", function() {
 test("removes layer from parentNode if in DOM", function() {
   var view = SC.View.create();
   var layer = view.createLayer().get('layer');
-  
+
   ok(layer, 'precond - has layer');
   document.body.appendChild(layer); // add to document body
-  
+
   view.destroyLayer();
 
   if(layer.parentNode) equals(layer.parentNode.nodeType, 11, 'layer no longer in parent node');
@@ -80,4 +80,40 @@ test("removes layer from parentNode if in DOM", function() {
   layer = null; // cleanup
 });
 
+/**
+  There is a bug that if childView layers are rendered when the parentView's
+  layer is created, the `layer` property on the childView will not be
+  cached.  What occurs is that if the childView is removed from the parent
+  view without ever having its `layer` requested, then when it comes time
+  to destroy the layer of the childView, it will get('layer'), which had a
+  bug that only returned a layer if the view has a parent view.  However,
+  since the child was removed from the parent first and then destroyed, it
+  no longer has a parent view and would return undefined for its `layer`.
 
+  This left elements in the DOM.
+*/
+test("Tests that if the childView's layer was never cached and the childView is removed, it should still destroy the childView's layer", function() {
+  var childView,
+    layerId,
+    pane,
+    view;
+
+  childView = SC.View.create({});
+
+  layerId = childView.get('layerId');
+
+  view = SC.View.create({
+    childViews: [childView]
+  });
+
+  pane = SC.Pane.create({
+    childViews: [view]
+  }).append();
+
+  ok(document.getElementById(layerId), 'child layer should be in the DOM');
+  ok(!childView._view_layer, 'child view should not have cached its layer');
+  view.removeChild(childView);
+  ok(document.getElementById(layerId), 'child layer should be in the DOM');
+  childView.destroy();
+  ok(!document.getElementById(layerId), 'child layer should not be in the DOM');
+});