sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -4,20 +4,21 @@
 //            ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
+/*global module, test, ok, equals */
 var originalTabbing;
 
 module("SC.View - Keyboard support with Tabbing Only Inside Document", {
-  setup: function(){
+  setup: function () {
     originalTabbing = SC.TABBING_ONLY_INSIDE_DOCUMENT;
     SC.TABBING_ONLY_INSIDE_DOCUMENT = YES;
   },
-  teardown: function(){
+
+  teardown: function () {
     SC.TABBING_ONLY_INSIDE_DOCUMENT = originalTabbing;
   }
 });
 
-test("Views only attempt to call performKeyEquivalent on child views that support it", function() {
+test("Views only attempt to call performKeyEquivalent on child views that support it", function () {
   var performKeyEquivalentCalled = 0;
 
   var view = SC.View.design({
@@ -25,7 +26,7 @@ test("Views only attempt to call performKeyEquivalent on child views that suppor
 
     unsupported: SC.CoreView,
     supported: SC.View.design({
-      performKeyEquivalent: function(str) {
+      performKeyEquivalent: function (str) {
         performKeyEquivalentCalled++;
         return NO;
       }
@@ -34,15 +35,16 @@ test("Views only attempt to call performKeyEquivalent on child views that suppor
 
   view = view.create();
   view.performKeyEquivalent("ctrl_r");
-  
+
   ok(performKeyEquivalentCalled > 0, "performKeyEquivalent is called on the view that supports it");
+  view.destroy();
 });
 
 /**
   nextValidKeyView tests
 */
 
-test("nextValidKeyView is receiver if it is the only view that acceptsFirstResponder", function() {
+test("nextValidKeyView is receiver if it is the only view that acceptsFirstResponder", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -63,17 +65,16 @@ test("nextValidKeyView is receiver if it is the only view that acceptsFirstRespo
       view6: SC.View
     })
   });
-
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view1.view4.get('nextValidKeyView'), pane.view1.view4, "nextValidKeyView is receiver");
+
+  pane.remove();
+  pane.destroy();
 });
 
-test("nextValidKeyView is null if no views have acceptsFirstResponder === YES", function() {
-  var testView = SC.View.extend({acceptsFirstResponder: YES}),
-  pane = SC.Pane.create({
+test("nextValidKeyView is null if no views have acceptsFirstResponder === YES", function () {
+  var pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
 
     view1: SC.View.extend({
@@ -92,15 +93,15 @@ test("nextValidKeyView is null if no views have acceptsFirstResponder === YES",
       view6: SC.View
     })
   });
-
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   ok(SC.none(pane.view1.view4.get('nextValidKeyView')), "nextValidKeyView is null");
+
+  pane.remove();
+  pane.destroy();
 });
 
-test("firstKeyView and nextKeyView of parents are respected", function() {
+test("firstKeyView and nextKeyView of parents are respected", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2', 'view7'],
@@ -130,9 +131,7 @@ test("firstKeyView and nextKeyView of parents are respected", function() {
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view2.view6.get('nextValidKeyView'), pane.view7.view8, "order is correct when first and next not set");
 
@@ -141,9 +140,11 @@ test("firstKeyView and nextKeyView of parents are respected", function() {
   pane.view1.set('nextKeyView', pane.view7);
 
   equals(pane.view2.view6.get('nextValidKeyView'), pane.view1.view3, "order is respected when first and next are set");
+  pane.remove();
+  pane.destroy();
 });
 
-test("nextValidKeyView is chosen correctly when nextKeyView is not a sibling", function() {
+test("nextValidKeyView is chosen correctly when nextKeyView is not a sibling", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -165,18 +166,18 @@ test("nextValidKeyView is chosen correctly when nextKeyView is not a sibling", f
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   pane.view1.view4.set('nextKeyView', pane.view2.view5);
   pane.view2.view5.set('nextKeyView', pane.view1.view4);
 
   equals(pane.view1.view4.get('nextValidKeyView'), pane.view2.view5, "nextValidKeyView is correct");
   equals(pane.view2.view5.get('nextValidKeyView'), pane.view1.view4, "nextValidKeyView is correct");
+  pane.remove();
+  pane.destroy();
 });
 
-test("nextValidKeyView is chosen correctly when child of parent's previous sibling has nextKeyView set", function() {
+test("nextValidKeyView is chosen correctly when child of parent's previous sibling has nextKeyView set", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -199,15 +200,14 @@ test("nextValidKeyView is chosen correctly when child of parent's previous sibli
   });
 
   pane.view1.view3.set('nextKeyView', pane.view1.view4);
-
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view2.view5.get('nextValidKeyView'), pane.view2.view6, "nextValidKeyView chosen is next sibling");
+  pane.remove();
+  pane.destroy();
 });
 
-test("nextValidKeyView checks for acceptsFirstResponder", function() {
+test("nextValidKeyView checks for acceptsFirstResponder", function () {
   var pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
 
@@ -221,15 +221,14 @@ test("nextValidKeyView checks for acceptsFirstResponder", function() {
   });
 
   pane.view1.set('nextKeyView', pane.view2);
-
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   ok(pane.view1.get('nextValidKeyView') !== pane.view2, "nextValidKeyView is not nextKeyView because nextKeyView acceptsFirstResponder === NO");
+  pane.remove();
+  pane.destroy();
 });
 
-test("nextValidKeyView prioritizes parent's lastKeyView even if nextKeyView is set", function() {
+test("nextValidKeyView prioritizes parent's lastKeyView even if nextKeyView is set", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -237,7 +236,7 @@ test("nextValidKeyView prioritizes parent's lastKeyView even if nextKeyView is s
     view1: SC.View.extend({
       childViews: ['view3', 'view4'],
 
-      lastKeyView: function() {
+      lastKeyView: function () {
         return this.view3;
       }.property(),
 
@@ -255,18 +254,18 @@ test("nextValidKeyView prioritizes parent's lastKeyView even if nextKeyView is s
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view1.view3.get('nextValidKeyView'), pane.view2.view5, "lastKeyView was respected; views after lastKeyView were skipped");
+  pane.remove();
+  pane.destroy();
 });
 
 /**
   previousValidKeyView tests
 */
 
-test("previousValidKeyView is receiver if it is the only view that acceptsFirstResponder", function() {
+test("previousValidKeyView is receiver if it is the only view that acceptsFirstResponder", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -288,16 +287,15 @@ test("previousValidKeyView is receiver if it is the only view that acceptsFirstR
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view1.view4.get('previousValidKeyView'), pane.view1.view4, "previousValidKeyView is receiver");
+  pane.remove();
+  pane.destroy();
 });
 
-test("previousValidKeyView is null if no views have acceptsFirstResponder === YES", function() {
-  var testView = SC.View.extend({acceptsFirstResponder: YES}),
-  pane = SC.Pane.create({
+test("previousValidKeyView is null if no views have acceptsFirstResponder === YES", function () {
+  var pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
 
     view1: SC.View.extend({
@@ -317,14 +315,14 @@ test("previousValidKeyView is null if no views have acceptsFirstResponder === YE
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   ok(SC.none(pane.view1.view4.get('previousValidKeyView')), "previousValidKeyView is null");
+  pane.remove();
+  pane.destroy();
 });
 
-test("lastKeyView and previousKeyView of parents are respected", function() {
+test("lastKeyView and previousKeyView of parents are respected", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2', 'view7'],
@@ -354,9 +352,7 @@ test("lastKeyView and previousKeyView of parents are respected", function() {
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view2.view5.get('previousValidKeyView'), pane.view1.view4, "order is correct when last and previous not set");
 
@@ -365,9 +361,11 @@ test("lastKeyView and previousKeyView of parents are respected", function() {
   pane.view1.set('previousKeyView', pane.view1);
 
   equals(pane.view2.view5.get('previousValidKeyView'), pane.view7.view9, "order is respected when last and previous are set");
+  pane.remove();
+  pane.destroy();
 });
 
-test("previousValidKeyView is chosen correctly when previousKeyView is not a sibling", function() {
+test("previousValidKeyView is chosen correctly when previousKeyView is not a sibling", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -389,18 +387,18 @@ test("previousValidKeyView is chosen correctly when previousKeyView is not a sib
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   pane.view1.view4.set('previousKeyView', pane.view2.view5);
   pane.view2.view5.set('previousKeyView', pane.view1.view4);
 
   equals(pane.view1.view4.get('previousValidKeyView'), pane.view2.view5, "previousValidKeyView is correct");
   equals(pane.view2.view5.get('previousValidKeyView'), pane.view1.view4, "previousValidKeyView is correct");
+  pane.remove();
+  pane.destroy();
 });
 
-test("previousValidKeyView prioritizes parent's firstKeyView even if previousKeyView is set", function() {
+test("previousValidKeyView prioritizes parent's firstKeyView even if previousKeyView is set", function () {
   var testView = SC.View.extend({acceptsFirstResponder: YES}),
   pane = SC.Pane.create({
     childViews: ['view1', 'view2'],
@@ -416,7 +414,7 @@ test("previousValidKeyView prioritizes parent's firstKeyView even if previousKey
     view2: SC.View.extend({
       childViews: ['view5', 'view6'],
 
-      firstKeyView: function() {
+      firstKeyView: function () {
         return this.view6;
       }.property(),
 
@@ -426,11 +424,11 @@ test("previousValidKeyView prioritizes parent's firstKeyView even if previousKey
     })
   });
 
-  // fake the pane being attached
-  pane.set('isPaneAttached', YES);
-  pane.recomputeIsVisibleInWindow();
+  pane.append();
 
   equals(pane.view2.view6.get('previousValidKeyView'), pane.view1.view4, "firstKeyView was respected; views before firstKeyView were skipped");
+  pane.remove();
+  pane.destroy();
 });
 
 

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

@@ -4,9 +4,9 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok same precondition */
+/*global module, test, equals, context, ok, same, precondition */
 
-// NOTE: it is very important to make sure that the layer is not created 
+// NOTE: it is very important to make sure that the layer is not created
 // until the view is actually visible in the window.
 
 module("SC.View#layer");
@@ -22,7 +22,7 @@ test("returns null if the view has no layer and parent view has no layer", funct
      childViews: [ SC.View.extend() ]
   });
   var view = parent.childViews[0];
-  
+
   equals(view.get('parentView'), parent, 'precond - has parent view');
   equals(parent.get('layer'), null, 'parentView has no layer');
   equals(view.get('layer'), null, ' has no layer');
@@ -31,12 +31,12 @@ test("returns null if the view has no layer and parent view has no layer", funct
 test("returns layer if you set the value", function() {
   var view = SC.View.create();
   equals(view.get('layer'), null, 'precond- has no layer');
-  
+
   var dom = document.createElement('div');
   view.set('layer', dom);
-  
+
   equals(view.get('layer'), dom, 'now has set layer');
-  
+
   dom = null;
 });
 
@@ -59,24 +59,24 @@ module("SC.View#layer - autodiscovery", {
     parentDom = document.createElement('div');
     childDom = document.createElement('div');
     parentDom.appendChild(childDom);
-    
+
     // set parent layer...
     parent.set('layer', parentDom);
   },
-  
+
   teardown: function() {
     parent = child = parentDom = childDom = null ;
   }
 });
 
-test("discovers layer if has no layer but parent view does have layer", function() {  
+test("discovers layer if has no layer but parent view does have layer", function() {
   equals(parent.get('layer'), parentDom, 'precond - parent has layer');
   ok(!!parentDom.firstChild, 'precond - parentDom has first child');
-  
+
   equals(child.get('layer'), childDom, 'view discovered child');
 });
 
-test("once its discovers layer, returns the same element, even if you remove it from the parent view", function() {  
+test("once its discovers layer, returns the same element, even if you remove it from the parent view", function() {
   equals(child.get('layer'), childDom, 'precond - view discovered child');
   parentDom.removeChild(childDom) ;
 
@@ -98,14 +98,14 @@ module("SC.View#$", {
           context.push('<span></span>');
         }
       })).create();
-      
+
     view = pane.childViews[0];
-    
+
     SC.RunLoop.begin();
     pane.append(); // add to create layer...
     SC.RunLoop.end();
-  }, 
-  
+  },
+
   teardown: function() {
     SC.RunLoop.begin();
     pane.remove();
@@ -122,7 +122,7 @@ test("returns an empty CQ object if no layer", function() {
 
 test("returns CQ object selecting layer if provided", function() {
   ok(view.get('layer'), 'precond - should have layer');
-  
+
   var cq = view.$();
   equals(cq.size(), 1, 'view.$() should have one element');
   equals(cq.get(0), view.get('layer'), 'element should be layer');
@@ -130,7 +130,7 @@ test("returns CQ object selecting layer if provided", function() {
 
 test("returns CQ object selecting element inside layer if provided", function() {
   ok(view.get('layer'), 'precond - should have layer');
-  
+
   var cq = view.$('span');
   equals(cq.size(), 1, 'view.$() should have one element');
   equals(cq.get(0).parentNode, view.get('layer'), 'element should be in layer');
@@ -138,9 +138,60 @@ test("returns CQ object selecting element inside layer if provided", function()
 
 test("returns empty CQ object if filter passed that does not match item in parent", function() {
   ok(view.get('layer'), 'precond - should have layer');
-  
+
   var cq = view.$('body'); // would normally work if not scoped to view
   equals(cq.size(), 0, 'view.$(body) should have no elements');
 });
 
+var parentView;
+
+module("Notifies that layer has changed whenever re-render", {
+
+  setup: function () {
+    parentView = SC.View.create({
+      childViews: ['a', 'b', SC.View],
 
+      containerLayer: function () {
+        return this.$('._wrapper')[0];
+      }.property('layer').cacheable(),
+
+      a: SC.View,
+      b: SC.View,
+
+      render: function (context) {
+        context = context.begin().addClass('_wrapper');
+        this.renderChildViews(context);
+        context = context.end();
+      }
+    });
+  },
+
+  teardown: function () {
+    parentView.destroy();
+    parentView = null;
+  }
+
+});
+
+/**
+  If the containerLayer property is cached, then when the view re-renders and the original container layer
+  element is lost, the containerLayer property will be invalid.  Instead, whenever the view updates,
+  we have to indicate that the 'layer' property has changed.
+  */
+test("containerLayer should be able to be dependent on layer so that it invalidates when updated", function () {
+  var containerLayer;
+
+  // Render the parent view and attach.
+  parentView.createLayer();
+  parentView._doAttach(document.body);
+
+  // Get the container layer.
+  containerLayer = parentView.get('containerLayer');
+
+  // Rerender the view.
+  SC.run(function () {
+    parentView.displayDidChange();
+  });
+
+  ok(containerLayer !== parentView.get('containerLayer'), "The container layer should not be the same anymore.");
+});