sproutcore 1.4.5-java → 1.5.0-java

data/lib/frameworks/sproutcore/frameworks/desktop/system/key_bindings.js

@@ -1,8 +1,10 @@
-// ========================================================================
-// SproutCore -- JavaScript Application Framework
-// Copyright ©2006-2011, Strobe Inc. and contributors.
-// Portions copyright ©2008 Apple Inc.  All rights reserved.
-// ========================================================================
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
 
 // Key Bindings are used to map a keyboard input to an action message on a
 // responder.  These bindings are most useful when implementing sophisticated

data/lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js

@@ -1,10 +1,13 @@
-// ========================================================================
-// SproutCore -- JavaScript Application Framework
-// Copyright ©2006-2011, Strobe Inc. and contributors.
-// Portions copyright ©2008 Apple Inc.  All rights reserved.
-// ========================================================================
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
 
-require('core');
+/*
+  TODO More docs for this class
+*/
 
 /**
   @class
@@ -13,7 +16,7 @@ require('core');
   do is to make sure that you register a function with this manager to undo
   every change you make.  You can then invoke the undo/redo methods to do it.
   
-  h4. USING THE UNDOMANAGER
+  ## Using SC.UndoManager
   
   Typically you create an undo manager inside on of your controllers.  Then,
   whenever you are about to perform an action on your model object, all you
@@ -23,29 +26,28 @@ require('core');
   Besure the undo function you register also saves undo functions.  This makes
   redo possible.
   
-  More docs TBD.
-  
   @extends SC.Object
 */
 SC.UndoManager = SC.Object.extend(
-/** @scope SC.UndoManager.prototype */
-{
+/** @scope SC.UndoManager.prototype */ {
 
   /** 
-    (Property) Name of the next undo action name.  
-  
     Use this property to build your Undo menu name.
     
+    @field
+    @type String
+    @default null
   */
   undoActionName: function() { 
     return this.undoStack ? this.undoStack.name : null ;
   }.property('undoStack'),
   
   /** 
-    (Property) Name of the next return action name.  
-  
     Use this property to build your Redo menu name.
     
+    @field
+    @type String
+    @default null
   */
   redoActionName: function() { 
     return this.redoStack ? this.redoStack.name : null ;
@@ -55,43 +57,57 @@ SC.UndoManager = SC.Object.extend(
     True if there is an undo action on the stack.
     
     Use to validate your menu item.
+    
+    @field
+    @type Boolean
+    @default NO
   */
   canUndo: function() { 
-    return this.undoStack != null; 
+    // instead of this.undoStack !== null && this.undoStack !== undefined
+    return this.undoStack != null;
   }.property('undoStack'),
   
   /** 
-    True if there is an redo action on the stack.
+    True if there is an redo action on the stack. Use to validate your menu item.
     
-    Use to validate your menu item.
+    @field
+    @type Boolean
+    @default NO
   */
   canRedo: function() { 
+    // instead of this.redoStack !== null && this.redoStack !== undefined
     return this.redoStack != null; 
   }.property('redoStack'),
   
-  /**  
-    Tries to undo the last action.  
-  
-    Returns true if succeeded.  Fails if an undo group is currently open.
+  /**
+    Tries to undo the last action. Fails if an undo group is currently open.
+    
+    @returns {Boolean} YES if suceeded, NO otherwise.
   */
-  undo: function() { this._undoOrRedo('undoStack','isUndoing'); },
-  
-  /**  
-    Tries to redo the last action.  
+  undo: function() {
+    this._undoOrRedo('undoStack','isUndoing');
+  },
   
-    Returns true if succeeded.  Fails if an undo group is currently open.
+  /**
+    Tries to redo the last action. Fails if a redo group is currently open.
+    
+    @returns {Boolean} YES if suceeded, NO otherwise.
   */
-  redo: function() { this._undoOrRedo('redoStack','isRedoing'); },
+  redo: function() {
+    this._undoOrRedo('redoStack','isRedoing');
+  },
   
   /**
-    True if the manager is currently undoing events. 
+    @type Boolean
+    @default NO
   */
-  isUndoing: false, 
+  isUndoing: NO,
   
   /**
-    True if the manager is currently redoing events.
+    @type Boolean
+    @default NO
   */
-  isRedoing: false, 
+  isRedoing: NO, 
   
   /** @private */
   groupingLevel: 0,
@@ -124,6 +140,8 @@ SC.UndoManager = SC.Object.extend(
     
     When you are finished performing the action, balance this with a call to
     endUndoGroup().
+    
+    @param {String} name
   */
   beginUndoGroup: function(name) {
     // is a group already active? Just increment the counter.
@@ -139,7 +157,12 @@ SC.UndoManager = SC.Object.extend(
     }
   },
  
-  /** end the undo group.  see beginUndoGroup() */
+  /**
+    @throws {Error} If there is no active group
+    
+    @param {String} name
+    @see beginUndoGroup()
+  */
   endUndoGroup: function(name) {
     // if more than one groups are active, just decrement the counter.
     if (!this._activeGroup) raise("endUndoGroup() called outside group.") ;
@@ -154,9 +177,13 @@ SC.UndoManager = SC.Object.extend(
   },
 
   /**
-    Change the name of the current undo group.  
-  
+    Change the name of the current undo group.
+    
     Normally you don't want to do this as it will effect the whole group.
+    
+    @param {String} name
+    
+    @throws {Error} If there is no active group
   */
   setActionName: function(name) {
     if (!this._activeGroup) raise("setActionName() called outside group.") ;
@@ -166,8 +193,18 @@ SC.UndoManager = SC.Object.extend(
   // --------------------------------
   // PRIVATE
   //
-  _activeGroup: null, undoStack: null, redoStack: null, 
-  _undoOrRedo: function(stack,state) {
+  
+  /** @private */
+  _activeGroup: null,
+  
+  /** @private */
+  undoStack: null,
+  
+  /** @private */
+  redoStack: null, 
+  
+  /** @private */
+  _undoOrRedo: function(stack, state) {
     if (this._activeGroup) return false ;
     if (this.get(stack) == null) return true; // noting to do.
 

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

@@ -1,26 +1,47 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok same htmlbody */
 
-module("A dialog with some basic controls and buttons");
+/*global module test equals context ok same htmlbody */
 
 var pane ;
+
+module("A dialog with some basic controls and buttons", {
+  teardown: function(){
+    if (pane) pane.remove();
+  }
+});
+
 test("adding dialog to screen", function() {
 
   
   var delegate = SC.Object.create({
     
     couldNotSend: function() {
-      pane = SC.AlertPane.warn("Email could not be sent", 'There might be a problem with the server or with your internet connection.  Try again in a few minutes.', "Try Again", "Cancel", 'Report Problem...', this);      
+      pane = SC.AlertPane.warn({
+        message: "Email could not be sent",
+        description: 'There might be a problem with the server or with your internet connection.  Try again in a few minutes.',
+        buttons: [
+          { title: "Try Again" },
+          { title: "Cancel" },
+          { title: 'Report Problem...' }
+        ],
+        delegate: this
+      });
     },
     
     showMoreInfo: function() {
-      pane = SC.AlertPane.info("Sending Email", "Sometimes email doesn't make it.  It's a fact of life.  We all love email, but hey that's how it goes.  \nAnyway, the nice thing is that we can provide this helpful dialog message, with multiple paragraphs and everything because of SproutCore.\nEmail is OK, AlertPanes are great. So just deal m'kay?  Bye bye.", delegate);
+      pane = SC.AlertPane.info({
+        message: "Sending Email",
+        description: "Sometimes email doesn't make it.  It's a fact of life.  We all love email, but hey that's how it goes.\n" +
+                      "Anyway, the nice thing is that we can provide this helpful dialog message, with multiple paragraphs and everything because of SproutCore.\n" +
+                      "Email is OK, AlertPanes are great. So just deal m'kay?  Bye bye.",
+        delegate: delegate
+      });
     },
     
     alertPaneDidDismiss: function(alert, status) {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/mixins/border.js

@@ -1,16 +1,22 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright ©2010 Apple Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+
 /*global module test htmlbody ok equals same stop start */
 
 var pane;
 
 module("SC.Border", {
   setup: function() {
+    var boxstyles = '<style>.box1-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
+                    '.box2-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
+                    '.box3-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }</style>';
+    htmlbody(boxstyles);
+
     SC.RunLoop.begin();
     pane = SC.MainPane.create();
     pane.append();
@@ -20,14 +26,10 @@ module("SC.Border", {
   teardown: function() {
     pane.remove();
     pane = null;
+    clearHtmlbody();
   }
 });
 
-var boxstyles = '<style>.box1-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
-                '.box2-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
-                '.box3-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }</style>';
-htmlbody(boxstyles);
-
 test('SC.View should not have border properties by default', function() {
   var view = SC.View.create();
   ok(!view.get('hasBorder'), 'view should not have hasBorder set');
@@ -94,3 +96,11 @@ test('View frame should account for borders if border dimension properties are s
   equals(frame.height, elem.clientHeight, 'height equal');
 });
 
+test('Should be deprecated', function(){
+  var originalLogger = console.warn, logged;
+  console.warn = function(msg){ logged = msg; }
+  SC.View.create(SC.Border);
+  console.warn = originalLogger;
+
+  equals(logged, "SC.Border is deprecated, please set border in your layout");
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/methods.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 

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

@@ -1,10 +1,11 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2009 Apple Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+
 /*global module test htmlbody ok equals same stop start */
 
 module("SC.AlertPane UI");
@@ -44,7 +45,7 @@ function evaluatePane(pane, message, description, caption, button1Title, button2
   
   // buttons
   ok(pane.childViews[0].childViews[1].$('div'), 'pane.div.div.div existance should be YES');
-  equals(pane.childViews[0].childViews[1].$('div').length, 2, 'pane.div.div should have 2 Buttons');
+  equals(pane.childViews[0].childViews[1].$('div.button').length, 2, 'pane.div.div should have 2 Buttons');
   ok(pane.childViews[0].$('div'), 'pane.div.div existance should be YES');
   
   var button1 = pane.childViews[0].childViews[1].childViews[1];
@@ -52,95 +53,260 @@ function evaluatePane(pane, message, description, caption, button1Title, button2
   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));
+    equals(button1.$('label').text(), button1Title, 'pane.div.div button1 should have custom title %@'.fmt(button1Title));
   } else {
-    equals(button1.$('span').text(), 'OK', 'pane.div.div button1 should have default title OK');
+    equals(button1.$('label').text(), 'OK', 'pane.div.div button1 should have default title OK');
   }
   if (button2Title) {
-    equals(button2.$('span').text(), button2Title, 'pane.div.div button2 should have custom title %@'.fmt(button2Title));
+    equals(button2.$('label').text(), button2Title, 'pane.div.div button2 should have custom title %@'.fmt(button2Title));
   } else {
-    ok(button2.$().hasClass('hidden'), 'pane.div.div button2 should be hidden');
+    ok(button2.$().hasClass('sc-hidden'), 'pane.div.div button2 should be hidden');
   }
   if (button3Title) {
-    equals(button3.$('span').text(), button3Title, 'pane.div button3 should have custom title %@'.fmt(button3Title));
+    equals(button3.$('label').text(), button3Title, 'pane.div button3 should have custom title %@'.fmt(button3Title));
   } else {
-    ok(button3.$().hasClass('hidden'), 'pane.div button3 should be hidden');
+    ok(button3.$().hasClass('sc-hidden'), 'pane.div button3 should be hidden');
   }
 }
 
 test("AlertPane.show with icon, message, description, caption and 3 buttons", function() {
+  pane = SC.AlertPane.show({
+    message: 'AlertPane.message',
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    icon: 'sc-icon-tools-24',
+    delegate: this,
+    buttons: [
+      { title: 'okButtonTitle' },
+      { title: 'cancelButtonTitle' },
+      { title: 'extraButtonTitle' }
+    ]
+  });
+  evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24');
+  pane.dismiss();
+});
+
+test("AlertPane.show with icon, message, description, caption and 3 buttons - old style", function() {
   pane = SC.AlertPane.show("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24', this);      
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24');
   pane.dismiss();
 });
 
 test("AlertPane.warn with icon, message, description, caption and 3 buttons", function() {
-  pane = SC.AlertPane.warn("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
+  pane = SC.AlertPane.warn({
+    message: "AlertPane.message",
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    buttons: [
+      { title: "okButtonTitle" },
+      { title: "cancelButtonTitle" },
+      { title: 'extraButtonTitle' }
+    ],
+    delegate: this
+  });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-alert-48');
   pane.dismiss();
 });
 
 test("AlertPane.error with icon, message, description, caption and 3 buttons", function() {
-  pane = SC.AlertPane.error("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
+  pane = SC.AlertPane.error({
+    message: "AlertPane.message",
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    buttons: [
+      { title: "okButtonTitle" },
+      { title: "cancelButtonTitle" },
+      { title: 'extraButtonTitle' }
+    ],
+    delegate: this
+  });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-error-48');
   pane.dismiss();
 });
 
 test("AlertPane.plain with message, description, caption and 3 buttons", function() {
-  pane = SC.AlertPane.plain("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
+  pane = SC.AlertPane.plain({
+    message: "AlertPane.message",
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    buttons: [
+      { title: "okButtonTitle" },
+      { title: "cancelButtonTitle" },
+      { title: 'extraButtonTitle' }
+    ],
+    delegate: this
+  });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'blank');
   pane.dismiss();
 });
 
 test("AlertPane.info with icon, message, description, caption and 3 buttons", function() {
-  pane = SC.AlertPane.info("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
+  pane = SC.AlertPane.info({
+    message: "AlertPane.message",
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    buttons: [
+      { title: "okButtonTitle" },
+      { title: "cancelButtonTitle" },
+      { title: 'extraButtonTitle' }
+    ],
+    delegate: this
+  });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-info-48');
   pane.dismiss();
 });
 
-test("AlertPane.info with icon, message and 1 default button (omit all optional parameters)", function() {
+test("AlertPane.info with icon, message and 1 default button (omit all optional parameters) - old style", function() {
   pane = SC.AlertPane.info("AlertPane.message");      
   evaluatePane(pane, "AlertPane.message", null, null, null, null, null, 'sc-icon-info-48');
   pane.dismiss();
 });
 
-test("AlertPane.info with icon, message and 3 buttons (passing null to optional description and caption)", function() {
+test("AlertPane.info with icon, message and 3 buttons (passing null to optional description and caption) - old style", function() {
   pane = SC.AlertPane.info("AlertPane.message", null, null, "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
   evaluatePane(pane, "AlertPane.message", null, null, "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-info-48');
   pane.dismiss();
 });
 
-test("AlertPane.info with icon, message, description, caption and 1 button (passing null to 3 buttons)", function() {
+test("AlertPane.info with icon, message, description, caption and 1 button (passing null to 3 buttons) - old style", function() {
   pane = SC.AlertPane.info("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', null, null, null, this);      
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', null, null, null, 'sc-icon-info-48');
   pane.dismiss();
 });
 
-test("users interaction with mutiple alert panes with 1-3 buttons", function() {
+test("AlertPane.info with individual actions and targets for three buttons", function() {
+  
+  var clickValue = null;
+  
+  var delegate = SC.Object.create({
+    didClickOK: function() {
+      clickValue = 'OK';
+    },
+    didClickCancel: function() {
+      clickValue = 'Cancel';
+    }
+  });
+  
+  pane = SC.AlertPane.info({
+    message: 'AlertPane.message',
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    icon: 'sc-icon-tools-24',
+    buttons: [
+      { title: 'okButtonTitle', action: 'didClickOK', target: delegate },
+      { title: 'cancelButtonTitle', action: 'didClickCancel', target: delegate },
+      { title: 'extraButtonTitle', action: function() { clickValue = 'Extra'; } }
+    ]
+  });
   
+  pane.dismiss(pane.get('button1'));
+  equals(clickValue, 'OK', 'Action for the OK button was clicked');
+  
+  pane.dismiss(pane.get('button2'));
+  equals(clickValue, 'Cancel', 'Action for the Cancel button was clicked');
+  
+  pane.dismiss(pane.get('button3'));
+  equals(clickValue, 'Extra', 'Action for the Extra button was clicked');
+  
+});
+
+test("users interaction with mutiple alert panes with 1-3 buttons", function() {
+
+  var didDismiss = NO;
+
+  var delegate = SC.Object.create({
+    
+    threeButtonAlertPane: function() {
+      pane = SC.AlertPane.warn({
+        title: "AlertPane.warn title",
+        description: 'Click OK to see this alert pane again.  \nClick Other... to see other alert panes.',
+        caption: 'Click cancel to dismiss.',
+        buttons: [
+          { title: "OK" },
+          { title: "Cancel" },
+          { title: 'Other...' }
+        ],
+        delegate: this
+      });
+      pane.dismiss(pane.get('button3'));
+    },
+
+    twoButtonAlertPane: function() {
+      pane = SC.AlertPane.error({
+        title: "AlertPane.error title",
+        description: 'Click OK to see one button alert pane.',
+        caption: 'Click cancel to dismiss.',
+        buttons: [
+          { title: "OK" },
+          { title: "Cancel" }
+        ],
+        delegate: delegate
+      });
+      pane.dismiss(pane.get('button2'));
+    },
+
+    oneButtonAlertPane: function() {
+      pane = SC.AlertPane.info({
+        title: "AlertPane.info title",
+        description: 'Click OK to dismiss.',
+        delegate: delegate
+      });
+      pane.dismiss(pane.get('button1'));
+    },
+   
+    alertPaneDidDismiss: function(alert, status) {
+      switch(status) {
+        case SC.BUTTON1_STATUS:
+          if (alert.icon && alert.icon.indexOf('info')!=-1){ didDismiss = YES; }
+          break;
+        case SC.BUTTON2_STATUS:
+          if (alert.icon && alert.icon.indexOf('error')!=-1){ this.oneButtonAlertPane(); }
+          break;
+        case SC.BUTTON3_STATUS:
+          if (alert.icon && alert.icon.indexOf('alert')!=-1){ this.twoButtonAlertPane(); }
+          break;
+      }
+    }
+  });
+
+  SC.RunLoop.begin();
+  delegate.threeButtonAlertPane();
+  SC.RunLoop.end();
+
+  ok(didDismiss, "should dismiss all buttons");
+}) ;
+
+test("users interaction with mutiple alert panes with 1-3 buttons - old style", function() {
+
+  var didDismiss = NO;
+
   var delegate = SC.Object.create({
     
     threeButtonAlertPane: function() {
       pane = SC.AlertPane.warn("AlertPane.warn title", 'Click OK to see this alert pane again.  \nClick Other... to see other alert panes.', 'Click cancel to dismiss.', "OK", "Cancel", 'Other...', this);      
+      pane.dismiss(pane.get('button3'));
     },
 
     twoButtonAlertPane: function() {
-      pane = SC.AlertPane.error("AlertPane.error title", 'Click OK to see one button alert pane.', 'Click cancel to dismiss.', "OK", "Cancel", delegate);      
+      pane = SC.AlertPane.error("AlertPane.error title", 'Click OK to see one button alert pane.', 'Click cancel to dismiss.', "OK", "Cancel", delegate);
+      pane.dismiss(pane.get('button2'));
     },
 
     oneButtonAlertPane: function() {
-      pane = SC.AlertPane.info("AlertPane.info title", 'Click OK to dismiss.', delegate);      
+      pane = SC.AlertPane.info("AlertPane.info title", 'Click OK to dismiss.', delegate);
+      pane.dismiss(pane.get('button1'));
     },
    
     alertPaneDidDismiss: function(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);
-          if(alert.icon && alert.icon.indexOf('error')!=-1) this.oneButtonAlertPane();
+          if (alert.icon && alert.icon.indexOf('info')!=-1){ didDismiss = YES; }
+          break;
+        case SC.BUTTON2_STATUS:
+          if (alert.icon && alert.icon.indexOf('error')!=-1){ this.oneButtonAlertPane(); }
           break;
         case SC.BUTTON3_STATUS:
-          this.twoButtonAlertPane();
+          if (alert.icon && alert.icon.indexOf('alert')!=-1){ this.twoButtonAlertPane(); }
           break;
       }
     }
@@ -149,4 +315,6 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
   SC.RunLoop.begin();
   delegate.threeButtonAlertPane();
   SC.RunLoop.end();
+
+  ok(didDismiss, "should dismiss all buttons");
 }) ;