Skip to content
This repository
Browse code

Merge branch 'master' of github.com:protz/GMail-Conversation-View

  • Loading branch information...
commit d3a6226fa12502b94f60ebef771d0e6807730ac6 2 parents 0cfa5c8 + 460f89d
Jonathan Protzenko authored December 03, 2012
8  content/assistant/assistant.xhtml
@@ -69,12 +69,12 @@
69 69
     // This is the usual API: if you launch something asynchronous, just do
70 70
     // expect () and call top () when you're done.
71 71
     let expected = 1;
72  
-    let top = function top() {
  72
+    let ttop = function () {
73 73
       if (--expected == 0)
74 74
         finish();
75 75
     };
76 76
     Customizations.expect = function () expected++;
77  
-    Customizations.top = top;
  77
+    Customizations.ttop = ttop;
78 78
 
79 79
     // --- UI event handlers
80 80
 
@@ -92,7 +92,7 @@
92 92
         else
93 93
           Log.debug("User declined", checkbox.id);
94 94
       }
95  
-      top();
  95
+      ttop();
96 96
     }
97 97
 
98 98
     function onCustomSetup(event) {
@@ -108,7 +108,7 @@
108 108
 <body>
109 109
   <div id="wrapper">
110 110
     <div class="main">
111  
-      <h1 class="title">Thunderbird <span class="orange">Conversations</span> 2.0</h1>
  111
+      <h1 class="title">Thunderbird <span class="orange">Conversations</span></h1>
112 112
       <div class="text">
113 113
         <p>
114 114
           &assistant.intro;
7  content/stub.compose-ui.js
@@ -585,12 +585,13 @@ ComposeSession.prototype = {
585 585
     let defaultCc = "";
586 586
     let defaultBcc = "";
587 587
     if (identity.doCc)
588  
-      defaultCc = identity.doCcList;
  588
+      defaultCc = identity.doCcList || "";
589 589
     if (identity.doBcc)
590  
-      defaultBcc = identity.doBccList;
  590
+      defaultBcc = identity.doBccList || "";
591 591
 
592 592
     let mergeDefault = function (aList, aDefault) {
593  
-      aDefault = aDefault.replace(/\s/g, "");
  593
+      if (aDefault)
  594
+        aDefault = aDefault.replace(/\s/g, "");
594 595
       if (!aDefault) // "" evaluates to false
595 596
         return aList;
596 597
       for each (let [, email] in Iterator(aDefault.split(/,/))) {
4  modules/assistant.js
@@ -119,6 +119,8 @@ MultipleCustomization.prototype = {
119 119
 let eid = function (id) getMail3Pane().document.getElementById(id);
120 120
 
121 121
 let Customizations = {
  122
+  ttop: function () {},
  123
+
122 124
   actionSetupViewDefaults: new MultipleCustomization([
123 125
     { name: "mailnews.default_sort_order", type: kPrefInt, value: 2 },
124 126
     { name: "mailnews.default_sort_type", type: kPrefInt, value: 18 },
@@ -206,7 +208,7 @@ let Customizations = {
206 208
         eid("unreadCol").setAttribute("hidden", "false");
207 209
         eid("senderCol").setAttribute("hidden", "true");
208 210
         eid("betweenCol").setAttribute("hidden", "false");
209  
-        Customizations.top();
  211
+        Customizations.ttop();
210 212
       };
211 213
       let i = 0;
212 214
       let waitForIt = function () {
6  modules/message.js
@@ -892,8 +892,12 @@ Message.prototype = {
892 892
       new mainWindow.AttachmentInfo(
893 893
         att.contentType, att.url, att.name, self._uri, att.isExternal, 42
894 894
       ));
895  
-    for each (let [i, attNode] in Iterator(attachmentNodes)) {
  895
+    /* So for some strange reason, Gecko decided that Iterator would now yield
  896
+     * both the element's id attribute and its index in the collection... which
  897
+     * screws us up, so let's forget about using modern JS features. */
  898
+    for (let i = 0; i < attachmentNodes.length; ++i) {
896 899
       let j = i;
  900
+      let attNode = attachmentNodes[j];
897 901
       let att = this._attachments[j];
898 902
 
899 903
       // For the context menu event handlers

0 notes on commit d3a6226

Please sign in to comment.
Something went wrong with that request. Please try again.