Permalink
Browse files

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

  • Loading branch information...
2 parents 0cfa5c8 + 460f89d commit d3a6226fa12502b94f60ebef771d0e6807730ac6 @protz committed Dec 3, 2012
Showing with 16 additions and 9 deletions.
  1. +4 −4 content/assistant/assistant.xhtml
  2. +4 −3 content/stub.compose-ui.js
  3. +3 −1 modules/assistant.js
  4. +5 −1 modules/message.js
View
8 content/assistant/assistant.xhtml
@@ -69,12 +69,12 @@
// This is the usual API: if you launch something asynchronous, just do
// expect () and call top () when you're done.
let expected = 1;
- let top = function top() {
+ let ttop = function () {
if (--expected == 0)
finish();
};
Customizations.expect = function () expected++;
- Customizations.top = top;
+ Customizations.ttop = ttop;
// --- UI event handlers
@@ -92,7 +92,7 @@
else
Log.debug("User declined", checkbox.id);
}
- top();
+ ttop();
}
function onCustomSetup(event) {
@@ -108,7 +108,7 @@
<body>
<div id="wrapper">
<div class="main">
- <h1 class="title">Thunderbird <span class="orange">Conversations</span> 2.0</h1>
+ <h1 class="title">Thunderbird <span class="orange">Conversations</span></h1>
<div class="text">
<p>
&assistant.intro;
View
7 content/stub.compose-ui.js
@@ -585,12 +585,13 @@ ComposeSession.prototype = {
let defaultCc = "";
let defaultBcc = "";
if (identity.doCc)
- defaultCc = identity.doCcList;
+ defaultCc = identity.doCcList || "";
if (identity.doBcc)
- defaultBcc = identity.doBccList;
+ defaultBcc = identity.doBccList || "";
let mergeDefault = function (aList, aDefault) {
- aDefault = aDefault.replace(/\s/g, "");
+ if (aDefault)
+ aDefault = aDefault.replace(/\s/g, "");
if (!aDefault) // "" evaluates to false
return aList;
for each (let [, email] in Iterator(aDefault.split(/,/))) {
View
4 modules/assistant.js
@@ -119,6 +119,8 @@ MultipleCustomization.prototype = {
let eid = function (id) getMail3Pane().document.getElementById(id);
let Customizations = {
+ ttop: function () {},
+
actionSetupViewDefaults: new MultipleCustomization([
{ name: "mailnews.default_sort_order", type: kPrefInt, value: 2 },
{ name: "mailnews.default_sort_type", type: kPrefInt, value: 18 },
@@ -206,7 +208,7 @@ let Customizations = {
eid("unreadCol").setAttribute("hidden", "false");
eid("senderCol").setAttribute("hidden", "true");
eid("betweenCol").setAttribute("hidden", "false");
- Customizations.top();
+ Customizations.ttop();
};
let i = 0;
let waitForIt = function () {
View
6 modules/message.js
@@ -892,8 +892,12 @@ Message.prototype = {
new mainWindow.AttachmentInfo(
att.contentType, att.url, att.name, self._uri, att.isExternal, 42
));
- for each (let [i, attNode] in Iterator(attachmentNodes)) {
+ /* So for some strange reason, Gecko decided that Iterator would now yield
+ * both the element's id attribute and its index in the collection... which
+ * screws us up, so let's forget about using modern JS features. */
+ for (let i = 0; i < attachmentNodes.length; ++i) {
let j = i;
+ let attNode = attachmentNodes[j];
let att = this._attachments[j];
// For the context menu event handlers

0 comments on commit d3a6226

Please sign in to comment.