Bug 608993 - Remove final uses of commonDialog following m-c changes. r=Standard8.
authorJonathan Protzenko <jonathan.protzenko@gmail.com>
Wed, 03 Nov 2010 15:12:54 -0400
changeset 6648 84bcef776fdb128aa269c53419b964a99a4af731
parent 6647 8356c5aebd6ccabc5da8e38cebf5bdf677969618
child 6649 2e8a2042a6aa89f1abee20a105eb63ecba57ba84
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs608993
Bug 608993 - Remove final uses of commonDialog following m-c changes. r=Standard8.
mail/test/mozmill/composition/test-attachment-reminder.js
mail/test/mozmill/composition/test-forward-headers.js
--- a/mail/test/mozmill/composition/test-attachment-reminder.js
+++ b/mail/test/mozmill/composition/test-attachment-reminder.js
@@ -176,23 +176,23 @@ function clickSendAndHandleSendError(con
   // Close it, the compose window will close too.
   plan_for_modal_dialog("commonDialog", clickOkOnSendError);
   controller.click(controller.eid("button-send"));
   wait_for_modal_dialog("commonDialog");
 }
 
 /** Click the "Oh, I Did!" button. */
 function clickOhIDid(controller) {
-  controller.window.commonDialogOnExtra1();
+  controller.window.document.documentElement.getButton('extra1').doCommand();
 }
 
 /** Click the "No, Send Now" button */
 function clickNoSendNow(controller) {
-  controller.window.commonDialogOnAccept();
+  controller.window.document.documentElement.getButton('accept').doCommand();
 }
 
 /** Click Ok in the Send Message Error dialog. */
 function clickOkOnSendError(controller) {
   if (controller.window.document.title != "Send Message Error")
     throw new Error("Not a send error dialog; title=" + controller.window.document.title);
-  controller.window.commonDialogOnAccept();
+  controller.window.document.documentElement.getButton('accept').doCommand();
 }
 
--- a/mail/test/mozmill/composition/test-forward-headers.js
+++ b/mail/test/mozmill/composition/test-forward-headers.js
@@ -72,17 +72,17 @@ function forward_selected_messages_and_g
   // opening a new compose window
   cwc = f(mc);
   cwc.type(cwc.eid("content-frame"), "Hey check out this megalol link");
 
   plan_for_window_close(cwc);
   // mwc is modal window controller
   windowHelper.plan_for_modal_dialog("commonDialog", function click_save (mwc) {
       //accept saving
-      mwc.window.commonDialogOnAccept();
+      mwc.window.document.documentElement.getButton('accept').doCommand();
     });
 
   // quit -> do you want to save ?
   cwc.keypress(null, "w", {shiftKey: false, accelKey: true});
   // wait for the modal dialog to return
   windowHelper.wait_for_modal_dialog();
   // actually quite the window
   wait_for_window_close();