Bug 980089 - fix regression from bug 970605 (plenty of 'this.contact is undefined' errors in the contacts window), r=clokep.
authorFlorian Quèze <florian@queze.net>
Thu, 06 Mar 2014 00:19:21 +0100
changeset 15857 a5850f3ecb9ad38521c16a32c2245f3d374f40da
parent 15856 f148b04140ff764863bb320a1010cdb65adcdde4
child 15858 0264d503ecc75d4753eef253a6613b5ea8e65f5b
push id9938
push userflorian@queze.net
push dateWed, 05 Mar 2014 23:19:34 +0000
treeherdercomm-central@a5850f3ecb9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs980089, 970605
Bug 980089 - fix regression from bug 970605 (plenty of 'this.contact is undefined' errors in the contacts window), r=clokep.
im/content/blist.js
im/content/buddy.xml
im/content/contact.xml
mail/components/im/content/chat-messenger-overlay.js
mail/components/im/content/imcontact.xml
--- a/im/content/blist.js
+++ b/im/content/blist.js
@@ -141,17 +141,17 @@ buddyListContextMenu.prototype = {
     let prompts = Services.prompt;
     let flags = prompts.BUTTON_TITLE_IS_STRING * prompts.BUTTON_POS_0 +
                 prompts.BUTTON_TITLE_CANCEL * prompts.BUTTON_POS_1 +
                 prompts.BUTTON_POS_1_DEFAULT;
     if (prompts.confirmEx(window, promptTitle, promptMessage, flags,
                           deleteButton, null, null, null, {}))
       return;
 
-    this.target.remove();
+    this.target.delete();
   },
   addTag: function blcm_addTag(aTag) {
     // If the contact already has the tag, addTag will return early.
     this.tagMenu.target.contact.addTag(aTag);
   },
   toggleTag: function blcm_toggleTag(aTag) {
     let contact = this.tagMenu.target.contact;
     if (contact.getTags().some(function(t) t.id == aTag.id))
--- a/im/content/buddy.xml
+++ b/im/content/buddy.xml
@@ -121,17 +121,17 @@
         if (this.state == "visible") // FIXME check the heigh instead
           this.state = "collapsing";
         else
           this.remove();
       ]]>
       </body>
      </method>
 
-     <method name="remove">
+     <method name="delete">
       <body>
       <![CDATA[
         this.buddy.remove();
       ]]>
       </body>
      </method>
 
      <method name="canOpenConversation">
--- a/im/content/contact.xml
+++ b/im/content/contact.xml
@@ -338,17 +338,17 @@
         this.removeAttribute("aliasing");
         this.parentNode.removeEventListener("select", this._parentSelectListener, false);
         delete this._parentSelectListener;
         this.parentNode.focus();
       ]]>
       </body>
      </method>
 
-     <method name="remove">
+     <method name="delete">
       <body>
       <![CDATA[
         this.contact.remove();
       ]]>
       </body>
      </method>
 
      <method name="canOpenConversation">
--- a/mail/components/im/content/chat-messenger-overlay.js
+++ b/mail/components/im/content/chat-messenger-overlay.js
@@ -62,17 +62,17 @@ buddyListContextMenu.prototype = {
     let prompts = Services.prompt;
     let flags = prompts.BUTTON_TITLE_IS_STRING * prompts.BUTTON_POS_0 +
                 prompts.BUTTON_TITLE_CANCEL * prompts.BUTTON_POS_1 +
                 prompts.BUTTON_POS_1_DEFAULT;
     if (prompts.confirmEx(window, promptTitle, promptMessage, flags,
                           deleteButton, null, null, null, {}))
       return;
 
-    this.target.remove();
+    this.target.delete();
   }
 };
 
 var gChatTab = null;
 
 var chatTabType = {
   name: "chat",
   panelId: "chatTabPanel",
--- a/mail/components/im/content/imcontact.xml
+++ b/mail/components/im/content/imcontact.xml
@@ -151,17 +151,17 @@
         listbox.removeEventListener("select", this._parentSelectListener,
                                     false);
         delete this._parentSelectListener;
         listbox.focus();
       ]]>
       </body>
      </method>
 
-     <method name="remove">
+     <method name="delete">
       <body>
       <![CDATA[
         this.contact.remove();
       ]]>
       </body>
      </method>
 
      <method name="canOpenConversation">