sproutcore 1.10.1 → 1.10.2

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

@@ -0,0 +1,78 @@
+// ==========================================================================
+// Project:   Showcase
+// Copyright: ©2013 7x7 Software, Inc.
+// License:   Licensed under MIT license
+// ==========================================================================
+/*globals module, test, ok, equals */
+
+module("SC.AutoMixin");
+
+test("Auto mixins should be applied to child views.", function () {
+  var A, B, a, d;
+
+  // Create a child view ahead of time. This will be unaffected by autoMixins.
+  d = SC.View.create({
+    foo: false
+  });
+
+  B = SC.View.extend({
+    baz: false
+  });
+
+  // Create a view class that uses SC.AutoMixin
+  A = SC.View.extend(SC.AutoMixin, {
+    autoMixins: [{ foo: true }, { bar: true }],
+
+    createChildViews: function () {
+      var childViews = this.get('childViews'),
+        len = childViews.length,
+        idx, key, view;
+
+      // swap the array
+      for (idx = 0; idx < len; ++idx) {
+        key = view = childViews[idx];
+
+        // is this is a key name, lookup view class
+        if (typeof key === SC.T_STRING) {
+          view = this[key];
+        } else {
+          key = null;
+        }
+
+        var uniqueHash = { idx: idx };
+        uniqueHash['prop_for_view_' + idx] = true;
+        view = this.createChildView(view, uniqueHash);
+        if (key) { this[key] = view; } // save on key name if passed
+
+        childViews[idx] = view;
+      }
+
+      return this;
+    },
+
+    childViews: ['b', 'c', d],
+
+    b: B.extend({
+      bar: false,
+      baz: true
+    }),
+    c: B
+  });
+
+  // Create an instance of the view class.
+  a = A.create();
+  ok(a.b.foo, "The first child view has the foo property.");
+  ok(a.b.bar, "The first child view has the bar property (overridden by mixin).");
+  ok(a.b.baz, "The first child view has the baz property (overridden by extend).");
+  equals(a.b.idx, 0, "The first child view has the idx property of");
+  ok(a.b.prop_for_view_0, "The first child view has the prop_for_view_0 property (set by the view).");
+
+  ok(a.c.foo, "The second child view has the foo property.");
+  ok(a.c.bar, "The second child view has the bar property.");
+  ok(!a.c.baz, "The second child view doesn't have the baz value from the previous child view.");
+  equals(a.c.idx, 1, "The second child view has the idx property of");
+  ok(SC.none(a.c.prop_for_view_0), "The second child view doesn't have the prop_for_view_0 property (set by the view on previous child view).");
+  ok(a.c.prop_for_view_1, "The second child view has the prop_for_view_1 property (set by the view).");
+
+  ok(!d.foo, "The pre-initialized child view is unaffected by autoMixins.");
+});

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

@@ -14,7 +14,7 @@ module("SC.AutoResize", {
 
   setup: function () {
     view = SC.LabelView.create(SC.AutoResize, {
-      layout: { left: 0, height: 40},
+      layout: { left: 0, height: 40 },
       value: "The bottom line, Williams said, is that the internet is “a giant machine designed to give people what they want.” It’s not a utopia. It’s not magical. It’s simply an engine of convenience. Those who can tune that engine well — who solve basic human problems with greater speed and simplicity than those who came before — will profit immensely. Those who lose sight of basic human needs — who want to give people the next great idea — will have problems. “We often think of the internet enables you to do new things,” Williams said. “But people just want to do the same things they’ve always done.”"
     });
   },
@@ -100,3 +100,47 @@ test("Resize with transition plugin - conflict", function () {
     start();
   }, 700);
 });
+
+
+test("Resize with child view layout", function () {
+  stop(700);
+
+  var pane, view2;
+
+  SC.run(function () {
+    pane = SC.Pane.create({
+      childViews: ['a', 'b'],
+      layout: { top: 200, left: 0, width: 200, height: 200 },
+      childViewLayout: SC.View.HORIZONTAL_STACK,
+
+      a: SC.View.extend({
+        layout: { width: 100 }
+      }),
+
+      b: SC.View.extend({
+        layout: { width: 50 }
+      })
+    });
+
+    pane.appendChild(view);
+    equals(view.get('layout').width, 10, 'width is');
+    equals(view.get('layout').left, 0, 'left is');
+    pane.append();
+
+    view2 = SC.View.create({
+      layout: { width: 100 }
+    });
+    pane.appendChild(view2);
+  });
+
+  setTimeout(function () {
+    ok(view.get('layout').width > 2000, 'width is > 2000');
+    equals(view.get('layout').left, 150, 'left is');
+    ok(view2.get('layout').left > 2000, 'left: %@ is > 2000'.fmt(view2.get('layout').left));
+
+    pane.destroy();
+    pane.remove();
+
+    start();
+  }, 500);
+});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_value_support/content.js

@@ -4,117 +4,172 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok same */
+/*global module, test, equals, ok */
 
 // ..........................................................
 // contentPropertyDidChange()
-// 
-var view, content ;
+//
+var view, content;
 module('SC.ContentValueSupport#contentPropertyDidChange', {
-  setup: function() {
+  setup: function () {
     content = SC.Object.create();
     view = SC.View.create(SC.ContentValueSupport);
   },
-  
-  teardown: function() {
+
+  teardown: function () {
     content = null;
     view.destroy();
   }
 });
 
-test("invoked with key = * whenever content changes", function() {
-  view.contentPropertyDidChange = function(target, key) {
+test("invoked with key = * whenever content changes", function () {
+  view.contentPropertyDidChange = function (target, key) {
     ok(target === content, 'should pass content object as target target=%@'.fmt(target));
-    equals(key, '*', 'should pass * as key');    
+    equals(key, '*', 'should pass * as key');
   };
   view.set('content', content);
 });
 
-test("should not be invoked when arbitrary keys are changed", function() {
+test("should not be invoked when arbitrary keys are changed", function () {
   var isTesting = NO, count = 0;
-  view.contentPropertyDidChange = function(target, key) {
-    if (!isTesting) return ; //wait until testing should begin...
+  view.contentPropertyDidChange = function (target, key) {
+    if (!isTesting) return; //wait until testing should begin...
     count++;
   };
 
   view.set('content', content);
-  
-  isTesting = YES ;
-  
+
+  isTesting = YES;
+
   content.set('foo', 'foo');
   content.set('bar', 'bar');
 
   equals(count, 0, "method was not invoked");
 });
 
-test("should no longer be invoked when a key is changed on a former content object", function() {
+test("should no longer be invoked when a key is changed on a former content object", function () {
   var isTesting = NO;
-  view.contentPropertyDidChange = function(target, key) {
-    if (!isTesting) return ; //wait until testing should begin...
+  view.contentPropertyDidChange = function (target, key) {
+    if (!isTesting) return; //wait until testing should begin...
     ok(NO, 'should not invoke contentPropertyDidChange after content is removed');
   };
-  
+
   view.set('content', content);
   content.set('foo', 'foo');
   view.set('content', null);
-  
-  isTesting= YES ;
+
+  isTesting = YES;
   content.set('bar', 'bar');
 });
 
-test("should fire even on a content object set when the object is created", function() {
+test("should fire even on a content object set when the object is created", function () {
   var callCount = 0;
   var view = SC.View.create(SC.ContentValueSupport, {
-    contentPropertyDidChange: function() { callCount++; },
+    contentPropertyDidChange: function () { callCount++; },
     content: content
   });
-  
+
   equals(callCount, 1, 'should call contentPropertyDidChange on init to do initial setup');
-  
+
   content.set('foo', 'foo');
   equals(callCount, 1, 'should not call contentPropertyDidChange when changing content.foo');
 });
 
+test("should call updatePropertyFromContent for all properties when content changes", function () {
+  var originalContent = SC.Object.create({
+    contentFoo: 'foo1',
+    contentBar: 'bar1'
+  });
+
+  var fooDidChangeCount = 0,
+    barDidChangeCount = 0;
+
+  var view = SC.View.create(SC.ContentValueSupport, {
+    contentKeys: {
+      'contentFooKey': 'foo',
+      'contentBarKey': 'bar'
+    },
+    contentFooKey: 'contentFoo',
+    contentBarKey: 'contentBar',
+
+    foo: null,
+    bar: null,
+
+    fooDidChange: function () {
+      fooDidChangeCount++;
+    }.observes('foo'),
+
+    barDidChange: function () {
+      barDidChangeCount++;
+    }.observes('bar'),
+
+    content: null
+  });
+
+  equals(fooDidChangeCount, 0, "foo indicated as changed this many times");
+  equals(barDidChangeCount, 0, "bar indicated as changed this many times");
+
+  view.set('content', originalContent);
+
+  equals(fooDidChangeCount, 1, "foo indicated as changed this many times");
+  equals(barDidChangeCount, 1, "bar indicated as changed this many times");
+
+  // set new content
+  var newContent = SC.Object.create({
+    contentFoo: 'foo2',
+    contentBar: 'bar2'
+  });
+
+  view.set('content', newContent);
+
+  equals(fooDidChangeCount, 2, "foo indicated as changed this many times");
+  equals(barDidChangeCount, 2, "bar indicated as changed this many times");
+
+  // Clean up.
+  originalContent.destroy();
+  newContent.destroy();
+});
+
 // ..........................................................
 // updatePropertyFromContent()
-// 
+//
 module("SC.ContentValueSupport#updatePropertyFromContent()", {
-  setup: function() {
+  setup: function () {
     content = SC.Object.create({ foo: "foo", bar: "bar" });
     view = SC.View.create(SC.ContentValueSupport, { content: content });
   },
-  teardown: function() {
-    content = null ;
+  teardown: function () {
+    content = null;
     view.destroy();
   }
-}) ;
+});
 
-test("copies value of content[key] to this[prop] if changed key.  Gets key from contentKey property", function() {
+test("copies value of content[key] to this[prop] if changed key.  Gets key from contentKey property", function () {
   view.contentValueKey = 'foo'; // set key mapping.
   view.updatePropertyFromContent('value', 'foo', 'contentValueKey');
   equals(view.get('value'), 'foo', 'should copy foo from content.foo to value');
 });
 
-test("does nothing of changed key does not match contentKey value" ,function() {
+test("does nothing of changed key does not match contentKey value", function () {
   view.value = "foo";
-  view.contentValueKey = "foo" ;
+  view.contentValueKey = "foo";
   view.updatePropertyFromContent('value', 'bar', 'contentValueKey');
   equals(view.get('value'), 'foo', 'should not have changed "value"');
 });
 
-test("if contentKey is not passed, assume contentPROPKey", function() {
+test("if contentKey is not passed, assume contentPROPKey", function () {
   view.contentValueKey = "foo";
   view.updatePropertyFromContent("value", "foo");
   equals(view.get('value'), 'foo', 'should have looked at foo since contentValueKey is set to foo');
 });
 
-test("if contentFooKey is not set on receiver, ask displayDelegate", function() {
+test("if contentFooKey is not set on receiver, ask displayDelegate", function () {
   view.displayDelegate = SC.Object.create({ contentValueKey: "foo" });
   view.updatePropertyFromContent("value", "foo", "contentValueKey");
   equals(view.get('value'), 'foo', 'should have looked at foo since contentValueKey is set to foo');
 });
 
-test("should be able to get value from a content object that is not SC.Object", function() {
+test("should be able to get value from a content object that is not SC.Object", function () {
   view.content = { foo: "foo" };
   view.contentValueKey = "foo";
   view.updatePropertyFromContent("value", "foo", "contentValueKey");
@@ -123,42 +178,42 @@ test("should be able to get value from a content object that is not SC.Object",
 
 // ..........................................................
 // updateContentWithValueObserver()
-// 
+//
 module("SC.ContentValueSupport#updatePropertyFromContent()", {
-  setup: function() {
+  setup: function () {
     content = SC.Object.create({ foo: "foo", bar: "bar" });
-    view = SC.View.create(SC.ContentValueSupport, { 
+    view = SC.View.create(SC.ContentValueSupport, {
       value: "bar",
       content: content,
       contentValueKey: "bar",
-      displayDelegate: SC.Object.create({ contentValueKey: "foo" }) 
+      displayDelegate: SC.Object.create({ contentValueKey: "foo" })
     });
   },
-  teardown: function() {
-    content = null ;
+  teardown: function () {
+    content = null;
     view.destroy();
   }
-}) ;
+});
 
-test("if contentValueKey is set, changing value will be pushed to content", function() {
+test("if contentValueKey is set, changing value will be pushed to content", function () {
   view.set('value', 'baz');
   equals(content.get('bar'), 'baz', 'should copy from view.value to content');
 });
 
-test("does nothing if content is null", function() {
+test("does nothing if content is null", function () {
   view.set('content', null);
   view.set('value', 'baz'); // should be no errors here...
   equals(content.get('bar'), 'bar', 'should not change');
   equals(content.get('foo'), 'foo', 'should not change');
 });
 
-test("if contentValueKey is undefined, asks display delegate instead", function() {
-  delete view.contentValueKey ;
+test("if contentValueKey is undefined, asks display delegate instead", function () {
+  delete view.contentValueKey;
   view.set('value', 'baz');
   equals(content.get('foo'), 'baz', 'should copy from view.value to content');
 });
 
-test("if contentValueKey is not set & displayDelegate not set, does nothing", function() {
+test("if contentValueKey is not set & displayDelegate not set, does nothing", function () {
   delete view.contentValueKey;
   delete view.displayDelegate;
   view.set('value', 'baz');
@@ -168,9 +223,9 @@ test("if contentValueKey is not set & displayDelegate not set, does nothing", fu
 
 // ..........................................................
 // updateContentWithValueObserver()
-// 
+//
 module("SC.ContentValueSupport#contentKeys", {
-  setup: function() {
+  setup: function () {
     this.count = 0;
     var self = this;
 
@@ -178,7 +233,7 @@ module("SC.ContentValueSupport#contentKeys", {
       contentKeys: {'contentFooKey': 'foo'},
       contentFooKey: 'foo',
       content: SC.Object.create({foo: 'BAR'}),
-      contentPropertyDidChange: function(orig, target, key) {
+      contentPropertyDidChange: function (orig, target, key) {
         equals(target, this.content, "content is target");
         self.count++;
 
@@ -187,15 +242,15 @@ module("SC.ContentValueSupport#contentKeys", {
     });
   },
 
-  teardown: function() {
+  teardown: function () {
     this.obj.destroy();
 
     this.obj = null;
   }
 });
 
-test("different contentKeys on creation are observed correctly", function() {
-  equals(this.count, 1, "observer was called once on init");
+test("different contentKeys on creation are observed correctly", function () {
+  equals(this.count, 1, "Content property setup was called on init");
 
   this.obj.content.set('foo', 'BAR2');
 
@@ -208,8 +263,8 @@ test("different contentKeys on creation are observed correctly", function() {
   equals(this.count, 2, "observer was not called again on setting other keys");
 });
 
-test("different contentKeys after creation are observed correctly", function() {
-  equals(this.count, 1, "observer was called once on init");
+test("different contentKeys after creation are observed correctly", function () {
+  equals(this.count, 1,  "Content property setup was called on init");
 
   this.obj.beginPropertyChanges();
   this.obj.set({
@@ -218,7 +273,7 @@ test("different contentKeys after creation are observed correctly", function() {
   });
   this.obj.endPropertyChanges();
 
-  equals(this.count, 2, "observer was called when changing contentKeys");
+  equals(this.count, 2, "observer was called again when changing contentKeys");
 
   this.obj.content.set('bar', 'BAR2');
 
@@ -234,4 +289,3 @@ test("different contentKeys after creation are observed correctly", function() {
 
   equals(this.count, 3, "observer was not called again on setting old observed keys");
 });
-

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/image_queue.js

@@ -13,8 +13,8 @@ var guardTimeout, firstGoodImageURL, secondGoodImageURL, badImageURL;
 module("Image Queue", {
   setup: function() {
 		guardTimeout = 30000;
-		firstGoodImageURL = sc_static('images/sproutcore-128.png');
-		secondGoodImageURL = sc_static('images/sproutcore-256.png');
+		firstGoodImageURL = sc_static('images/sproutcore-32.png');
+		secondGoodImageURL = sc_static('images/sproutcore-48.png');
 		badImageURL = "http://www.sproutcore.com/images/foobar.png";
 	}
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/transition_test.js

@@ -75,6 +75,147 @@ test("Test that the isTransitioning property of container view updates according
   }, 1000);
 });
 
+test("Test changing nowShowing while the container is already transitioning with pre-initialized views: DISSOLVE.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transitionSwap', SC.ContainerView.DISSOLVE);
+    containerView.set('nowShowing', view2);
+  });
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view1);
+    });
+  }, 100);
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view2);
+    });
+  }, 150);
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1500);
+});
+
+test("Test changing nowShowing while the container is already transitioning with pre-initialized views: MOVE_IN.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transitionSwap', SC.ContainerView.MOVE_IN);
+    containerView.set('nowShowing', view2);
+  });
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view1);
+    });
+  }, 100);
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view2);
+    });
+  }, 150);
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1500);
+});
+
+
+test("Test changing nowShowing while the container is already transitioning with pre-initialized views: REVEAL.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transitionSwap', SC.ContainerView.REVEAL);
+    containerView.set('nowShowing', view2);
+  });
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view1);
+    });
+  }, 100);
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view2);
+    });
+  }, 150);
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1500);
+});
+
+test("Test changing nowShowing while the container is already transitioning with pre-initialized views: PUSH.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transitionSwap', SC.ContainerView.PUSH);
+    containerView.set('nowShowing', view2);
+  });
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view1);
+    });
+  }, 100);
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view2);
+    });
+  }, 150);
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1500);
+});
+
+test("Test changing nowShowing while the container is already transitioning with pre-initialized views: FADE_COLOR.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transitionSwap', SC.ContainerView.FADE_COLOR);
+    containerView.set('nowShowing', view2);
+  });
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view1);
+    });
+  }, 100);
+
+  setTimeout(function () {
+    SC.run(function () {
+      containerView.set('nowShowing', view2);
+    });
+  }, 150);
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1500);
+});
+
 test("Test that the container view calls the proper transition plugin methods.", function () {
   var willBuildInToViewCalled = 0,
     buildInToViewCalled = 0,