sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js

@@ -13,32 +13,32 @@
 var pane = SC.ControlTestPane.design({height:24})
   .add("basic", SC.ButtonView, {
   })
-  
-  .add("title", SC.ButtonView, { 
+
+  .add("title", SC.ButtonView, {
      title: "Hello World"
   })
-   
-  .add("icon", SC.ButtonView, { 
+
+  .add("icon", SC.ButtonView, {
     icon: iconURL
   })
-    
-  .add("title,icon", SC.ButtonView, { 
+
+  .add("title,icon", SC.ButtonView, {
     title: "Hello World", icon: iconURL
   })
-     
-  .add("title,icon,disabled", SC.ButtonView, { 
+
+  .add("title,icon,disabled", SC.ButtonView, {
     title: "Hello World", icon: iconURL , isEnabled: NO
   })
-  
-  .add("title,icon,default", SC.ButtonView, { 
+
+  .add("title,icon,default", SC.ButtonView, {
     title: "Hello World", icon: iconURL , isDefault: YES
   })
 
-  .add("title,icon,selected", SC.ButtonView, { 
+  .add("title,icon,selected", SC.ButtonView, {
     title: "Hello World", icon: iconURL , isSelected: YES
   })
 
-  .add("title,toolTip", SC.ButtonView, { 
+  .add("title,toolTip", SC.ButtonView, {
     title: "Hello World", toolTip: 'Hello World is my tool tip'
   })
 
@@ -58,25 +58,25 @@ var pane = SC.ControlTestPane.design({height:24})
     ariaRole: 'button',
     menu: ['a','b']
   });
-  // 
-  // .add("autocontrolsize", SC.ButtonView, { 
+  //
+  // .add("autocontrolsize", SC.ButtonView, {
   //   controlSize: SC.AUTO_CONTROL_SIZE,
   //   title: "Hello Cheese", layout: { left: 0, top: 0, right: 0, height: 37 }
   // })
-  // 
+  //
   // .add("calculatedcontrolsize", SC.ButtonView, {
   //   // control size should end up small
   //   title: "Smelly Severus", layout: { left: 0, top: 2, right: 0, bottom: 2 },
   //   controlSize: SC.CALCULATED_CONTROL_SIZE
   // });
 
-pane.show(); // add a test to show the test pane
-
 module('SC.ButtonView ui', {
   setup: function(){
     htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
   },
   teardown: function(){
+    pane.standardSetup().teardown();
     clearHtmlbody();
   }
 });
@@ -94,7 +94,7 @@ test("Check that all button are visible", function() {
   ok(pane.view('aria-pressed').get('isVisibleInWindow'), 'aria-pressed.isVisibleInWindow should be YES');
   ok(pane.view('aria-haspopup').get('isVisibleInWindow'), 'aria-haspopup.isVisibleInWindow should be YES');
 });
-  
+
 
 test("Check that all buttons have the right classes set", function() {
   var viewElem=pane.view('basic').$();
@@ -105,8 +105,8 @@ test("Check that all buttons have the right classes set", function() {
   ok(!viewElem.hasClass('sel'), 'basic.hasClass(sel) should be NO');
   ok(!viewElem.hasClass('disabled'), 'basic.hasClass(disabled) should be NO');
   ok(!viewElem.hasClass('def'), 'basic.hasClass(def) should be NO');
-  
-  
+
+
   viewElem=pane.view('title').$();
   ok(viewElem.hasClass('sc-view'), 'title.hasClass(sc-view) should be YES');
   ok(viewElem.hasClass('sc-button-view'), 'title.hasClass(sc-button-view) should be YES');
@@ -151,7 +151,7 @@ test("Check that all buttons have the right classes set", function() {
   ok(!viewElem.hasClass('sel'), 'title,icon,default.hasClass(sel) should be NO');
   ok(!viewElem.hasClass('disabled'), 'title,icon,default.hasClass(disabled) should be NO');
   ok(viewElem.hasClass('def'), 'title,icon,default.hasClass(def) should be YES');
-  
+
   viewElem=pane.view('title,icon,selected').$();
    ok(viewElem.hasClass('sc-view'), 'title,icon,selected.hasClass(sc-view) should be YES');
    ok(viewElem.hasClass('sc-button-view'), 'title,icon,selected.hasClass(sc-button-view) should be YES');
@@ -160,7 +160,7 @@ test("Check that all buttons have the right classes set", function() {
    ok(viewElem.hasClass('sel'), 'title,icon,selected.hasClass(sel) should be YES');
    ok(!viewElem.hasClass('disabled'), 'title,icon,selected.hasClass(disabled) should be NO');
    ok(!viewElem.hasClass('def'), 'title,icon,selected.hasClass(def) should be NO');
-   
+
    viewElem=pane.view('title,toolTip').$();
    ok(viewElem.hasClass('sc-view'), 'title,toolTip.hasClass(sc-view) should be YES');
    ok(viewElem.hasClass('sc-button-view'), 'title,toolTip.hasClass(sc-button-view) should be YES');
@@ -228,7 +228,7 @@ test("mouseDown and then mouseUp anywhere in the button should toggle the aria-p
 //   var viewElem=pane.view('autocontrolsize').$();
 //   ok(viewElem.hasClass('sc-huge-size'), 'HUGE button has sc-huge-size class.');
 // });
-// 
+//
 // test("Check if CALCULATED_CONTROL_SIZE automatically found the correct controlSize", function() {
 //   var viewElem=pane.view('calculatedcontrolsize').$();
 //   ok(viewElem.hasClass('sc-small-size'), 'CALCULATED_CONTROL_SIZE button has sc-small-size class.');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/ui.js

@@ -9,30 +9,30 @@
 
 (function() {
 var pane = SC.ControlTestPane.design()
-  .add("basic", SC.CheckboxView, { 
-    value: NO, isEnabled: YES, title: "Hello World" 
+  .add("basic", SC.CheckboxView, {
+    value: NO, isEnabled: YES, title: "Hello World"
   })
 
-  .add("selected", SC.CheckboxView, { 
-    value: YES, title: "Hello World" 
+  .add("selected", SC.CheckboxView, {
+    value: YES, title: "Hello World"
   })
 
-  .add("disabled", SC.CheckboxView, { 
-    isEnabled: NO, title: "Hello World" 
+  .add("disabled", SC.CheckboxView, {
+    isEnabled: NO, title: "Hello World"
   })
 
-  .add("disabled - selected", SC.CheckboxView, { 
-    isEnabled: NO, value: YES, title: "Hello World" 
+  .add("disabled - selected", SC.CheckboxView, {
+    isEnabled: NO, value: YES, title: "Hello World"
   })
 
   .add("static layout 1", SC.CheckboxView, {
-    useStaticLayout: YES, 
+    useStaticLayout: YES,
     layout: { width: 'auto', right: 'auto' },
     title: 'Static Layout'
   })
 
   .add("static layout 2", SC.CheckboxView, {
-    useStaticLayout: YES, 
+    useStaticLayout: YES,
     layout: { width: 'auto', right: 'auto' },
     title: 'Different Length Title'
   })
@@ -45,11 +45,9 @@ var pane = SC.ControlTestPane.design()
     value: NO, title: "aria-label"
   });
 
-pane.show(); // add a test to show the test pane
-
 // ..........................................................
 // TEST VIEWS
-// 
+//
 module('SC.CheckboxView ui', {
   setup: function(){
     htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
@@ -68,7 +66,7 @@ test("basic", function() {
 
   var input = view.$();
   equals(input.attr('aria-checked'), 'false',  'input should not be checked');
-  
+
   var label = view.$('span.label');
   equals(label.text(), 'Hello World', 'should have label');
 });
@@ -80,7 +78,7 @@ test("selected", function() {
 
   var input = view.$();
   equals(input.attr('aria-checked'), 'true','input should be checked');
-  
+
   var label = view.$('span.label');
   equals(label.text(), 'Hello World', 'should have label');
 });
@@ -92,7 +90,7 @@ test("disabled", function() {
 
   var input = view.$();
   equals(input.attr('aria-checked'), 'false','input should not be checked');
-  
+
   var label = view.$('span.label');
   equals(label.text(), 'Hello World', 'should have label');
 });
@@ -104,7 +102,7 @@ test("disabled - selected", function() {
 
   var input = view.$();
   equals(input.attr('aria-checked'), 'true','input should be checked');
-  
+
   var label = view.$('span.label');
   equals(label.text(), 'Hello World', 'should have label');
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/{mixins → views/collection}/collection_fast_path.js

@@ -10,21 +10,22 @@ var view, exampleView;
 module("SC.CollectionFastPath", {
   setup: function() {
 
-    view = SC.CollectionView.create({
-      content: "a b c d e f".w().map(function(x) {
-        return SC.Object.create({ title: x });
-      }),
-      useFastPath: YES
+    SC.run(function () {
+      view = SC.CollectionView.create({
+        content: "a b c d e f".w().map(function(x) {
+          return SC.Object.create({ title: x });
+        }),
+        // STUB: reloadIfNeeded
+        reloadIfNeeded: CoreTest.stub('reloadIfNeeded', SC.CollectionView.prototype.reloadIfNeeded)
+      });
     });
 
-    exampleView = SC.View.extend({
-      isPoolable: YES,
-      layerIsCacheable: YES
-    });
+    exampleView = SC.View.extend({});
 
   },
 
   teardown: function() {
+    view.destroy();
     view = exampleView = null;
   }
 });
@@ -40,6 +41,8 @@ test("Calling itemViewForContentIndex() before the Collection is visible.", func
   try {
     var itemView = view.itemViewForContentIndex(0);
     ok(true, 'Requesting itemViewForContentIndex() should not throw an exception prior to reloadIfNeeded being called.');
+
+    view.reloadIfNeeded.expect(0);
   } catch (ex) {
     ok(false, 'Requesting itemViewForContentIndex() should not throw an exception prior to reloadIfNeeded being called.');
   }
@@ -47,9 +50,12 @@ test("Calling itemViewForContentIndex() before the Collection is visible.", func
   // The next test just shows how that when isVisibleInWindow changes, causing
   // reloadIfNeeded to be called, then the request would succeed.
   try {
-    SC.RunLoop.begin();
-    view.set('isVisibleInWindow', YES);
-    SC.RunLoop.end();
+    SC.run(function () {
+      view.createLayer();
+      view._doAttach(document.body);
+    });
+
+    view.reloadIfNeeded.expect(1);
     itemView = view.itemViewForContentIndex(0);
     ok(true, 'Requesting itemViewForContentIndex() should not throw an exception after reloadIfNeeded being called.');
   } catch (ex) {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/content.js

@@ -9,52 +9,52 @@ var view, content1, content2 ;
 
 module("SC.CollectionView.content", {
   setup: function() {
-    
+
     // stub in collection view to verify that proper method are called
     view = SC.CollectionView.create({
 
       // ..........................................................
       // STUB: contentPropertyDidChange
-      // 
+      //
       contentPropertyDidChange: CoreTest.stub('contentPropertyDidChange'),
-      
+
       // ..........................................................
       // STUB: computeLayout
-      // 
+      //
       computeLayout: CoreTest.stub('computeLayout'),
-      
+
       // ..........................................................
       // STUB: RELOAD
-      // 
+      //
       reload: CoreTest.stub("reload", {
-        
+
         // detect if we would reload everything.
         shouldReloadAll: function() {
-          var history = this.history, 
+          var history = this.history,
               loc = history.length,
               args;
-              
+
           while(--loc >= 0) {
             args = history[loc];
-            if (args <= 1) return YES ; 
+            if (args <= 1) return YES ;
             if (args[1] === null) return YES ;
-            if (args[0].get('nowShowing').contains(args[1])) return YES ;            
+            if (args[0].get('nowShowing').contains(args[1])) return YES ;
           }
           return NO ;
         },
 
         // join all reload indexes passed excluding null or undefined
-        indexes: function() { 
-          var history = this.history, 
+        indexes: function() {
+          var history = this.history,
               loc = history.length,
               ret = SC.IndexSet.create(),
               args;
-              
+
           while(--loc >= 0) {
             args = history[loc];
             if (args[1] && args[1].isIndexSet) ret.add(args[1]);
           }
-          
+
           return ret ;
         },
 
@@ -65,13 +65,13 @@ module("SC.CollectionView.content", {
           if (indexes) {
             history[history.length-1][1] = indexes.clone();
           }
-          
+
           // simulate calling computeLayout() to match original impl.
           this.computeLayout();
-          
+
           return this ;
         },
-        
+
         expect: function(indexes, callCount) {
 
           if (indexes === YES) {
@@ -88,9 +88,9 @@ module("SC.CollectionView.content", {
 
           this.reset();
         }
-                
+
       }),
-      
+
       expectLength: function(len) {
         equals(view.get('length'), len, 'view.length after change');
 
@@ -99,34 +99,34 @@ module("SC.CollectionView.content", {
             expected = SC.IndexSet.create(0,len);
         ok(expected.isEqual(nowShowing), 'nowShowing expected: %@, actual: %@'.fmt(expected, nowShowing));
       },
-      
+
       // reset stubs
       reset: function() {
         this.reload.reset();
         this.contentPropertyDidChange.reset();
         this.computeLayout.reset();
       }
-      
+
     });
-    
-    content1 = "a b c d e f".w().map(function(x) { 
-      return SC.Object.create({ title: x }); 
+
+    content1 = "a b c d e f".w().map(function(x) {
+      return SC.Object.create({ title: x });
     });
-    
-    content2 = "d e f x y z".w().map(function(x) { 
-      return SC.Object.create({ title: x }); 
+
+    content2 = "d e f x y z".w().map(function(x) {
+      return SC.Object.create({ title: x });
     });
-    
+
   }
 });
 
 // ..........................................................
 // BASIC EDITS
-// 
+//
 
 test("setting content for first time", function() {
   equals(view.get('content'), null, 'precond - view.content should be null');
-  
+
   view.set('content', content1);
   view.reload.expect(YES, 2); // should reload everything
   view.contentPropertyDidChange.expect(0); // should not call
@@ -138,7 +138,7 @@ test("changing content with different size", function() {
 
   view.set('content', "a b".w());
   view.reset();
-  
+
   view.set('content', content2);
   view.reload.expect(YES, 2); // call twice?
   view.contentPropertyDidChange.expect(0); // should not call
@@ -150,19 +150,19 @@ test("changing content with same size", function() {
 
   view.set('content', "a b".w());
   view.reset();
-  
+
   view.set('content', content2);
-  view.reload.expect(YES); 
+  view.reload.expect(YES);
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
   view.expectLength(content2.get('length'));
 });
 
 test("changing the content of a single item should reload that item", function() {
-  
+
   view.set('content', content1);
   view.reset(); // don't care about this fire
-  
+
   content1.replace(1,1, ["X"]);
   view.reload.expect(SC.IndexSet.create(1));
   view.contentPropertyDidChange.expect(0); // should not call
@@ -171,10 +171,10 @@ test("changing the content of a single item should reload that item", function()
 });
 
 test("changing the content of several items should reload each item", function() {
-  
+
   view.set('content', content1);
   view.reset(); // don't care about this fire
-  
+
   content1.replace(1,1, ["X"]);
   content1.replace(3,1, ["X"]);
   view.reload.expect(SC.IndexSet.create(1).add(3));
@@ -184,10 +184,10 @@ test("changing the content of several items should reload each item", function()
 });
 
 test("adding to end of content should reload new items", function() {
-  
+
   view.set('content', content1);
   view.reset(); // don't care about this fire
-  
+
   content1.pushObject("X");
   content1.pushObject("Y");
 
@@ -198,10 +198,10 @@ test("adding to end of content should reload new items", function() {
 });
 
 test("removing from end of content should reload removed items", function() {
-  
+
   view.set('content', content1);
   view.reset(); // don't care about this fire
-  
+
   content1.popObject();
   content1.popObject();
 
@@ -214,7 +214,7 @@ test("removing from end of content should reload removed items", function() {
 test("inserting into middle should reload all following items", function() {
   view.set('content', content1);
   view.reset(); // don't care about this fire
-  
+
   content1.insertAt(3, 'FOO');
 
   view.reload.expect(SC.IndexSet.create(3, content1.get('length')-3));
@@ -225,25 +225,18 @@ test("inserting into middle should reload all following items", function() {
 
 // ..........................................................
 // EDITING PROPERTIES
-// 
+//
 
 test("editing properties", function() {
   view.set('content', content1);
   view.reset();
   view.contentPropertyDidChange.reset();
-  
+
   var obj = content1.objectAt(3);
   ok(obj !== null, 'precond -has object to edit');
-  
+
   obj.set('title', 'FOO');
   view.reload.expect(NO, 0);
   view.contentPropertyDidChange.expect(0);
   view.computeLayout.expect(NO);
 });
-
-
-
-
-
-
-