Bug 887242 - Update tests and dependent files for the new IDs. r=mconley. a=Standard8 for CLOSED TREE AURORA_BASE_20130805
authorJosiahOne <josiah@programmer.net>
Thu, 11 Jul 2013 17:42:31 -0400
changeset 16220 b7359393d3fe7e063a6b83676a9f672c00a13d00
parent 16219 a7e0cc2171dc2205c2122f7fcf0ea911176adba1
child 16221 5d0fb1691835bcc27abdfaeef61f3533b7bdf5c7
push idunknown
push userunknown
push dateunknown
reviewersmconley, Standard8
bugs887242
Bug 887242 - Update tests and dependent files for the new IDs. r=mconley. a=Standard8 for CLOSED TREE
mail/components/compose/content/MsgComposeCommands.js
mail/components/compose/content/messengercompose.xul
mail/test/mozmill/cloudfile/test-cloudfile-attachment-item.js
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -704,17 +704,17 @@ var attachmentBucketController = {
       },
       doCommand: function() {
         convertSelectedToRegularAttachment();
       }
     },
 
     cmd_cancelUpload: {
       isEnabled: function() {
-        let cmd = document.getElementById("context_cancelUpload");
+        let cmd = document.getElementById("composeAttachmentContext_cancelUploadItem");
 
         // If Filelink is disabled, hide this menuitem and bailout.
         if (!Services.prefs.getBoolPref("mail.cloud_files.enabled")) {
           cmd.hidden = true;
           return false;
         }
 
         let bucket = document.getElementById("attachmentBucket");
@@ -1018,17 +1018,17 @@ function addAttachCloudMenuItems(aParent
 function addConvertCloudMenuItems(aParentMenu, aAfterNodeId, aRadioGroup)
 {
   let attachment = document.getElementById("attachmentBucket").selectedItem;
   let afterNode = document.getElementById(aAfterNodeId);
   while (afterNode.nextSibling)
     aParentMenu.removeChild(afterNode.nextSibling);
 
   if (!attachment.sendViaCloud) {
-    let item = document.getElementById("context_convertAttachment");
+    let item = document.getElementById("convertCloudMenuItems_popup_convertAttachment");
     item.setAttribute("checked", "true");
   }
 
   for (let [,cloudProvider] in Iterator(cloudFileAccounts.accounts)) {
     let item = document.createElement("menuitem");
     let iconClass = cloudProvider.iconClass;
     item.cloudProvider = cloudProvider;
     item.setAttribute("label", cloudFileAccounts.getDisplayName(cloudProvider));
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -343,17 +343,17 @@
             label="&renameAttachment.label;"
             accesskey="&renameAttachment.accesskey;"
             command="cmd_renameAttachment"/>
   <menu id="composeAttachmentContext_convertCloudMenu"
         label="&convertCloud.label;"
         accesskey="&convertCloud.accesskey;"
         command="cmd_convertCloud">
     <menupopup id="convertCloudMenuItems_popup"
-               onpopupshowing="addConvertCloudMenuItems(this, 'context_convertCloudSeparator', 'context_convertCloud');">
+               onpopupshowing="addConvertCloudMenuItems(this, 'convertCloudSeparator', 'context_convertCloud');">
       <menuitem id="convertCloudMenuItems_popup_convertAttachment"
                 type="radio" name="context_convertCloud"
                 label="&convertRegularAttachment.label;"
                 accesskey="&convertRegularAttachment.accesskey;"
                 command="cmd_convertAttachment"/>
       <menuseparator id="convertCloudSeparator"/>
     </menupopup>
   </menu>
--- a/mail/test/mozmill/cloudfile/test-cloudfile-attachment-item.js
+++ b/mail/test/mozmill/cloudfile/test-cloudfile-attachment-item.js
@@ -150,17 +150,17 @@ function assert_can_cancel_upload(aContr
 
   // Bring up the context menu, and click cancel.
   let cmd = aController.e("cmd_cancelUpload");
   let menu = aController.getMenu("#" + kAttachmentItemContextID);
   aController.window.updateAttachmentItems();
 
   assert_false(cmd.hidden);
   assert_false(cmd.disabled);
-  let cancelItem = aController.eid("context_cancelUpload");
+  let cancelItem = aController.eid("composeAttachmentContext_cancelUploadItem");
   aController.click(cancelItem);
 
   // Close the popup, and wait for the cancellation to be complete.
   close_popup(aController, aController.eid(kAttachmentItemContextID));
   aController.waitFor(function() cancelled);
 }
 
 /**