Bug 68174 - "remove event handlers from within <template>" ((Bv1a-SM) <messengercompose.xul> ++) [p=sgautherie.bz@free.fr (Serge Gautherie) r+sr=Neil]

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -1984,29 +1984,19 @@ function SaveAsTemplate()
   gEditingDraft = false;
 }
 
+// Sets the additional FCC, in addition to the default FCC.
 function MessageFcc(menuItem)
 {
-  // Get the id for the folder we're FCC into
-  // This is the additional FCC in addition to the
-  // default FCC
-  var destUri = menuItem.getAttribute('id');
-  if (gMsgCompose)
-  {
-    var msgCompFields = gMsgCompose.compFields;
-    if (msgCompFields)
-    {
-      if (msgCompFields.fcc2 == destUri)
-      {
-        msgCompFields.fcc2 = "nocopy://";
-        dump("FCC2: none\n");
-      }
-      else
-      {
-        msgCompFields.fcc2 = destUri;
-        dump("FCC2: " + destUri + "\n");
-      }
-    }
-  }
+  if (!gMsgCompose)
+    return;
+
+  var msgCompFields = gMsgCompose.compFields;
+  if (!msgCompFields)
+    return;
+
+  // Get the uri for the folder to FCC into.
+  var fccUri = menuItem.getAttribute("fccUri");
+  msgCompFields.fcc2 = (msgCompFields.fcc2 == fccUri) ? "nocopy://" : fccUri;
 }
 
 function updatePriorityMenu(priorityMenu)

mailnews/compose/resources/content/messengercompose.xul

@@ -371,7 +371,8 @@
              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
              sortDirection="ascending"
              datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-             ref="msgaccounts:/">
+             ref="msgaccounts:/"
+             oncommand="MessageFcc(event.target);">
             <menupopup/>
             <template>
               <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@@ -385,8 +386,7 @@
                         IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
                         ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType">
                     <menupopup>
-                      <menuitem label="&fileHereMenu.label;"
-                                oncommand="MessageFcc(event.target.parentNode.parentNode)"/>
+                      <menuitem label="&fileHereMenu.label;" fccUri="rdf:*"/>
                       <menuseparator/>
                     </menupopup>
                   </menu>
@@ -408,12 +408,12 @@
               <rule nc:CanFileMessages="true">
                 <menupopup>
                   <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                            oncommand="MessageFcc(event.target)"
                             SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                             BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
                             IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
                             IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-                            ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"/>
+                            ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                            fccUri="rdf:*"/>
                 </menupopup>
               </rule>
             </template>