sproutit-sproutcore 1.0.0.20090416161445 → 1.0.0.20090720093355

data/frameworks/sproutcore/frameworks/desktop/system/root_responder.js

@@ -217,7 +217,7 @@ SC.RootResponder = SC.RootResponder.extend(
   */ 
   attemptKeyEquivalent: function(evt) {
     var ret = null ;
-    
+
     // keystring is a method name representing the keys pressed (i.e 
     // 'alt_shift_escape')
     var keystring = evt.commandCodes()[0];
@@ -339,7 +339,7 @@ SC.RootResponder = SC.RootResponder.extend(
   
   dragDidStart: function(drag) {
     // console.log('dragDidStart called in %@ with %@'.fmt(this, drag));
-    // this._mouseDownView = drag ;
+    this._mouseDownView = drag ;
     this._drag = drag ;
   },
   
@@ -420,7 +420,7 @@ SC.RootResponder = SC.RootResponder.extend(
         return evt.hasCustomEventHandling ;
       }
     }
-    return YES; // allow normal processing...
+    return this.sendEvent('keyDown', evt) ; // allow normal processing...
   },
   
   /** @private

data/frameworks/sproutcore/frameworks/desktop/tests/integration/dialog.js

@@ -24,7 +24,7 @@ test("adding dialog to screen", function() {
     },
     
     alertPaneDidDismiss: function(alert, status) {
-      console.log("%@.alertDidDismiss - %@".fmt(alert, status));
+      //console.log("%@.alertDidDismiss - %@".fmt(alert, status));
       switch(status) {
         case SC.OK_STATUS:
           this.invokeLater(this.couldNotSend, 1000);

data/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js

@@ -49,7 +49,7 @@ function evaluatePane(pane, message, description, caption, button1Title, button2
   
   var button1 = pane.childViews[0].childViews[1].childViews[1];
   var button2 = pane.childViews[0].childViews[1].childViews[0];
-  var button3 = pane.childViews[0].childViews[2];
+  var button3 = pane.childViews[0].childViews[2].childViews[0];
   
   if (button1Title) {
     equals(button1.$('span').text(), button1Title, 'pane.div.div button1 should have custom title %@'.fmt(button1Title));
@@ -133,7 +133,7 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
     },
    
     alertPaneDidDismiss: function(alert, status) {
-      console.log("%@.alertDidDismiss - %@".fmt(alert, status));
+      //console.log("%@.alertDidDismiss - %@".fmt(alert, status));
       switch(status) {
         case SC.BUTTON1_STATUS:
           if(alert.icon && alert.icon.indexOf('alert')!=-1) this.invokeLater(this.threeButtonAlertPane, 1000);

data/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/methods.js

@@ -7,4 +7,49 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-module("TODO: Test SC.MenuPane Methods");
+var menu;
+var menuItemTarget;
+var menuItemTargetName = "The Target";
+var menuItemCheckboxKey = "isCheckbox";
+
+module('SC.MenuPane#MenuItemTargetIsSet', {
+  setup: function() {
+    menuItemTarget = SC.Object.create({
+      myName: menuItemTargetName
+    });
+    
+    menu = SC.MenuPane.create({
+      layout: { width: 80, height: 0 },
+      itemTargetKey: 'myTarget',
+      itemTitleKey: 'myTitle',
+      itemCheckboxKey: menuItemCheckboxKey,
+      items: [
+        { myTitle: "Item1", myTarget: menuItemTarget }
+      ],
+      contentView: SC.View.extend({})
+    });
+  },
+  
+  teardown: function() {
+    menuItemTarget.destroy();
+    menuItemTarget = null;
+    menu.destroy();
+    menu = null;
+  }
+});
+
+test("Menu sets item target.", function() {
+  menu.append(); // force a rendering of the menu item child views
+  var target = menu.menuItemViews[0].get('target'); // see if the target propagated through
+  menu.remove(); // remove the menu
+  var success = (target && (target.myName === menuItemTargetName)); // check to see if it's the right target
+  ok(success, "Menu item should have the target we specified.");
+});
+
+test("Menu sets MenuItem.contentCheckboxKey.", function() {
+  menu.append();
+  var key = menu.menuItemViews[0].get('contentCheckboxKey');
+  menu.remove();
+  var success = (key && (key === menuItemCheckboxKey));
+  ok(success, "MenuItem.contentCheckboxKey should equal MenuPane.itemCheckboxKey after being rendered.");
+});

data/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js

@@ -22,6 +22,7 @@ anchor.show();
 module("SC.MENUPANE UI");
 test('menu item added ', function() {
   var menu = SC.MenuPane.create({
+              layout: { width: 150, height: 'auto' },
               items: [ { title: "Item1", isEnabled:YES, icon: iconURL, 
                 separator: NO, action: method ,height:30,
                 checkbox:YES, shortCut: "alt_n", keyEquivalent:"alt_n" },
@@ -29,9 +30,10 @@ test('menu item added ', function() {
                 { title: "Item2", isEnabled:NO, icon: iconURL, separator: NO },
                 { title: "Item3", isEnabled:YES, icon: iconURL, separator: NO , branchItem:YES,
                 subMenu:SC.MenuPane.create({
+                  layout: { width: 150, height: 'auto' },
                   items:["title1","title2"],
                   contentView:SC.View.extend({
-                    layout: { width: 150, height: 200 }
+                    layout: { top: 0, left: 0, bottom: 0, right: 0 }
                   })
                 })
               }],
@@ -49,7 +51,7 @@ test('menu item added ', function() {
               itemKeyEquivalentKey:'keyEquivalent',
               itemHeightKey:'height',
               contentView:SC.View.extend({
-                layout: { width: 150, height: 200 }})
+                layout: { top: 0, left: 0, bottom: 0, right: 0 }})
               });
   anchor.view('anchor').menu = menu;
 });

data/frameworks/sproutcore/frameworks/desktop/tests/panes/palette/ui.js

@@ -15,7 +15,6 @@ test("verify palette pane content container is visible at correct location with
   pane = SC.PalettePane.create({
     layout: { width: 400, height: 200, right: 20, top: 0 },
     contentView: SC.View.extend({
-      layout: { width: 400, height: 200, right: 0, top: 0 }
     })
   });
   pane.append();
@@ -25,12 +24,12 @@ test("verify palette pane content container is visible at correct location with
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
   
-  var ret = pane.childViews[0].layoutStyle();
+  var ret = pane.layoutStyle();
 
-  equals(ret.top, '0px', 'pane.div should be initiated at default position top including shadow');
-  equals(ret.right, '0px', 'pane.div should be initiated at default position right including shadow');
-  equals(ret.width, '400px', 'pane.div should have width 400px');
-  equals(ret.height, '200px', 'pane.div should have height 200px');
+  equals(ret.top, '0px', 'pane should be initiated at default position top including shadow');
+  equals(ret.right, '20px', 'pane should be initiated at default position right including shadow');
+  equals(ret.width, '400px', 'pane should have width 400px');
+  equals(ret.height, '200px', 'pane should have height 200px');
 
   //pane.remove();
 }) ;

data/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js

@@ -13,8 +13,8 @@ var pane ;
 
 test("verify panel content container is visible at correct location with right size", function() { 
   pane = SC.PanelPane.create({
+    layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
     contentView: SC.View.extend({
-      layout: { width: 400, height: 200, centerX: 0, centerY: 0 }
     })
   });
   pane.append();
@@ -24,16 +24,16 @@ test("verify panel content container is visible at correct location with right s
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
   
-  var pw = pane.childViews[0].layout.width;
-  var ph = pane.childViews[0].layout.height;
-  var ret = pane.childViews[0].layoutStyle();
-
-  equals(ret.top, '50%', 'pane.div should center vertically');
-  equals(ret.left, '50%', 'pane.div should center horizontally');
-  equals(ret.width, '400px', 'pane.div should have width 400px');
-  equals(ret.height, '200px', 'pane.div should have height 200px');
-  equals(ret.marginLeft, -pw/2+'px', 'pane.div should shift-left %@ px'.fmt(-pw/2));
-  equals(ret.marginTop, -ph/2+'px', 'pane.div should shift-top %@ px'.fmt(-ph/2));
+  var pw = pane.layout.width;
+  var ph = pane.layout.height;
+  var ret = pane.layoutStyle();
+
+  equals(ret.top, '50%', 'pane should center vertically');
+  equals(ret.left, '50%', 'pane should center horizontally');
+  equals(ret.width, '400px', 'pane should have width 400px');
+  equals(ret.height, '200px', 'pane should have height 200px');
+  equals(ret.marginLeft, -pw/2+'px', 'pane should shift-left %@ px'.fmt(-pw/2));
+  equals(ret.marginTop, -ph/2+'px', 'pane should shift-top %@ px'.fmt(-ph/2));
 
   pane.remove();
 }) ;

data/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js

@@ -17,10 +17,10 @@ function evaluatePicker(pane) {
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
   
-  var ret = pane.childViews[0].layoutStyle();
+  var ret = pane.layoutStyle();
 
-  equals(ret.width, '300px', 'pane.div should have width 300px');
-  equals(ret.height, '200px', 'pane.div should have height 200px');
+  equals(ret.width, '300px', 'pane should have width 300px');
+  equals(ret.height, '200px', 'pane should have height 200px');
 }
 
 var anchor = SC.ControlTestPane.design()
@@ -37,8 +37,9 @@ var panePointer ;
 
 test("verify default picker pane content container is visible at correct location with right size", function() { 
   paneDefault = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
-      layout: { width: 300, height: 200 }
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
   paneDefault.popup(anchor.view('anchor'), SC.PICKER);
@@ -48,8 +49,9 @@ test("verify default picker pane content container is visible at correct locatio
 
 test("verify menu picker pane content container is visible at correct location with right size", function() { 
   paneMenu = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
-      layout: { width: 300, height: 200 }
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
   paneMenu.popup(anchor.view('anchor'), SC.PICKER_MENU);
@@ -59,8 +61,9 @@ test("verify menu picker pane content container is visible at correct location w
 
 test("verify fixed picker pane content container is visible at correct location with right size", function() { 
   paneFixed = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
-      layout: { width: 300, height: 200 }
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
   paneFixed.popup(anchor.view('anchor'), SC.PICKER_FIXED);
@@ -70,8 +73,9 @@ test("verify fixed picker pane content container is visible at correct location
 
 test("verify pointer picker pane content container is visible at correct location with right size", function() { 
   panePointer = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
-      layout: { width: 300, height: 200 }
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
   panePointer.popup(anchor.view('anchor'), SC.PICKER_POINTER, [3,0,1,2,2]);

data/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js

@@ -13,8 +13,8 @@ var pane ;
 
 test("verify sheet pane content container is visible at correct location with right size", function() { 
   pane = SC.SheetPane.create({
+    layout: { width: 400, height: 200, centerX: 0 },
     contentView: SC.View.extend({
-      layout: { width: 400, height: 200, centerX: 0 }
     })
   });
   pane.append();
@@ -24,15 +24,15 @@ test("verify sheet pane content container is visible at correct location with ri
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
   
-  var pw = pane.childViews[0].layout.width;
-  var ph = pane.childViews[0].layout.height;
-  var ret = pane.childViews[0].layoutStyle();
+  var pw = pane.layout.width;
+  var ph = pane.layout.height;
+  var ret = pane.layoutStyle();
 
-  equals(ret.top, '0px', 'pane.div should be displayed at default position top');
-  equals(ret.left, '50%', 'pane.div should center horizontally');
-  equals(ret.width, '400px', 'pane.div should have width 400px');
-  equals(ret.height, '200px', 'pane.div should have height 200px');
-  equals(ret.marginLeft, -pw/2+'px', 'pane.div should shift-left %@ px'.fmt(-pw/2));
+  equals(ret.top, '0px', 'pane should be displayed at default position top');
+  equals(ret.left, '50%', 'pane should center horizontally');
+  equals(ret.width, '400px', 'pane should have width 400px');
+  equals(ret.height, '200px', 'pane should have height 200px');
+  equals(ret.marginLeft, -pw/2+'px', 'pane should shift-left %@ px'.fmt(-pw/2));
 
   pane.remove();
 }) ;

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

@@ -37,6 +37,10 @@ var pane = SC.ControlTestPane.design()
 
   .add("title,icon,selected", SC.ButtonView, { 
     title: "Hello World", icon: iconURL , isSelected: YES 
+  })
+
+  .add("title,toolTip", SC.ButtonView, { 
+    title: "Hello World", toolTip: 'Hello World is my tool tip' 
   });
 
 pane.show(); // add a test to show the test pane
@@ -52,6 +56,7 @@ test("Check that all button are visible", function() {
   ok(pane.view('title,icon,disabled').get('isVisibleInWindow'), 'title,icon,disabled.isVisibleInWindow should be YES');
   ok(pane.view('title,icon,default').get('isVisibleInWindow'), 'title,icon,default.isVisibleInWindow should be YES');
   ok(pane.view('title,icon,selected').get('isVisibleInWindow'), 'title.icon,selected.isVisibleInWindow should be YES');
+  ok(pane.view('title,toolTip').get('isVisibleInWindow'), 'title,toolTip.isVisibleInWindow should be YES');
 });
   
 
@@ -119,6 +124,15 @@ 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');
+   ok(viewElem.hasClass('sc-regular-size'), 'title,toolTip.hasClass(sc-regular-size) should be YES');
+   ok(!viewElem.hasClass('icon'), 'title,toolTip.hasClass(icon) should be NO');
+   ok(!viewElem.hasClass('sel'), 'title,toolTip.hasClass(sel) should be NO');
+   ok(!viewElem.hasClass('disabled'), 'title,toolTip.hasClass(disabled) should be NO');
+   ok(!viewElem.hasClass('def'), 'title,toolTip.hasClass(def) should be NO');
 
 });
 
@@ -137,4 +151,9 @@ test("Check that the title is set or not and if it is in the appropriate element
 
 });
 
+test("Check if title,toolTip has the tool tip set", function() {
+  var viewElem=pane.view('title,toolTip').$('a');
+  ok(viewElem.defaultClass[0].title == 'Hello World is my tool tip', 'title,toolTip has the expected tool tip set.');
+});
+
 })();

data/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js

@@ -120,7 +120,6 @@ test("pressing mouseDown and then mouseUp anywhere in the checkbox should toggle
 });
 
 test("isEnabled=NO should add disabled attr to input", function() {
-  
   SC.RunLoop.begin();
   view.set('isEnabled', NO);
   SC.RunLoop.end();

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

@@ -0,0 +1,249 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            portions copyright @2009 Apple, Inc.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+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, 
+              loc = history.length,
+              args;
+              
+          while(--loc >= 0) {
+            args = history[loc];
+            if (args <= 1) return YES ; 
+            if (args[1] === null) 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, 
+              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 ;
+        },
+
+        // need to save the passed indexes set as a clone because it may be
+        // reused later...
+        action: function(indexes) {
+          var history = this.reload.history;  // note "this" is view
+          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) {
+            equals(this.shouldReloadAll(), YES, 'reload() should reload all');
+          } else if (indexes !== NO) {
+            var expected = this.indexes();
+            var passed = indexes.isEqual(expected);
+            ok(passed, "expected reload(%@), actual: reload(%@)".fmt(indexes, expected));
+          }
+
+          if (callCount !== undefined) {
+            equals(this.callCount, callCount, 'reload() should have been called X times');
+          }
+
+          this.reset();
+        }
+                
+      }),
+      
+      expectLength: function(len) {
+        equals(view.get('length'), len, 'view.length after change');
+
+
+        var nowShowing = view.get('nowShowing'),
+            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 }); 
+    });
+    
+    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
+  view.computeLayout.expect(YES);
+  view.expectLength(content1.get('length'));
+});
+
+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
+  view.computeLayout.expect(YES);
+  view.expectLength(content2.get('length'));
+});
+
+test("changing content with same size", function() {
+
+  view.set('content', "a b".w());
+  view.reset();
+  
+  view.set('content', content2);
+  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
+  view.computeLayout.expect(YES);
+  view.expectLength(content1.get('length'));
+});
+
+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));
+  view.contentPropertyDidChange.expect(0); // should not call
+  view.computeLayout.expect(YES);
+  view.expectLength(content1.get('length'));
+});
+
+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");
+
+  view.reload.expect(SC.IndexSet.create(content1.get('length')-2, 2));
+  view.contentPropertyDidChange.expect(0); // should not call
+  view.expectLength(content1.get('length'));
+  view.computeLayout.expect(YES);
+});
+
+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();
+
+  view.reload.expect(SC.IndexSet.create(content1.get('length'), 2));
+  view.contentPropertyDidChange.expect(0); // should not call
+  view.expectLength(content1.get('length'));
+  view.computeLayout.expect(YES);
+});
+
+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));
+  view.contentPropertyDidChange.expect(0); // should not call
+  view.expectLength(content1.get('length'));
+  view.computeLayout.expect(YES);
+});
+
+// ..........................................................
+// 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);
+});
+
+
+
+
+
+
+