From 68e73006b585bdd27db0ce46b3549d3d1531f92c Mon Sep 17 00:00:00 2001 From: halex Date: Wed, 11 Jul 2007 00:54:52 +0000 Subject: [PATCH] * Put the links for compiled/uncompiled Dragonfly in the wrong place. * When we discard a draft, don't bomb out if we try and delete something that didn't exist * More preference changes - new fields are yet to be hooked up. * Fixes the scrollable composer window problem. --- src/www/dragonfly-debug.html | 4 ++-- src/www/dragonfly.html | 5 ++--- src/www/js/Composer.js | 20 +++++++++++++++----- src/www/js/Mail.js | 8 ++------ src/www/js/Preferences.js | 14 +++++++++++--- 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/www/dragonfly-debug.html b/src/www/dragonfly-debug.html index 6523a35..57fd7b4 100644 --- a/src/www/dragonfly-debug.html +++ b/src/www/dragonfly-debug.html @@ -177,7 +177,8 @@ Console / - Logs + Logs / + Compiled @@ -254,7 +255,6 @@ Source | Console | Logs - | Compiled
diff --git a/src/www/dragonfly.html b/src/www/dragonfly.html index 1be932d..e3de62b 100644 --- a/src/www/dragonfly.html +++ b/src/www/dragonfly.html @@ -21,12 +21,11 @@ var subObjs=objs[module];for(var i=0;i < objs[module].length;i++){var subModule= '', '

You may want to contact your administrator. More details may be available in your JavaScript Console.

');document.write (html.join(''));document.getElementById ('loading').style.display = 'none';}else{addLoadEvent (Dragonfly.main);}})();// -->
+ | Logs
diff --git a/src/www/js/Composer.js b/src/www/js/Composer.js index a5c7def..542cc25 100644 --- a/src/www/js/Composer.js +++ b/src/www/js/Composer.js @@ -15,6 +15,8 @@ Dragonfly.Mail.Composer = function (parent, msg) this.isReply = this.msg.isReply; this.pendingAttachments = [ ]; + + logDebug('Composer instantiated.'); if (parent) { d.HtmlBuilder.buildChild (parent, this); @@ -352,13 +354,19 @@ Dragonfly.Mail.Composer.prototype.discardDraft = function (evt) return jsob; }, this), bind (function (err) { - if (!(err instanceof CancelledError)) { + // Ignore the fact we errored - probably because we NEVER SAVED ANYTHING. + /*if (!(err instanceof CancelledError)) { d.notifyError ('Could not discard draft'); logDebug ('error deleting draft:', d.reprError (err)); } this.state = c.MaybeDirty; this.scheduleSave(); - return err; + return err;*/ + + // Now, go do what success normally does. + this.state = c.Discarded; + d.go (discardLoc); + return jsob; }, this)); }; @@ -530,13 +538,15 @@ Dragonfly.Mail.Composer.composeNew = function (msg) var html = new d.HtmlBuilder ('
', fakeLoc.getBreadCrumbs(), '
', - '
'); + '
'); var composer = new m.Composer (html, msg); - html.push ('
'); + html.push ('
'); html.set ('content-iframe'); - + + d.resizeScrolledView(); + return composer; }; diff --git a/src/www/js/Mail.js b/src/www/js/Mail.js index 6693be1..adae24d 100644 --- a/src/www/js/Mail.js +++ b/src/www/js/Mail.js @@ -19,6 +19,8 @@ Dragonfly.Mail.setLabels = { Dragonfly.Mail.getView = function (loc) { + logDebug('Dragonfly.Mail.getView(loc) called.'); + var d = Dragonfly; var m = d.Mail; @@ -51,12 +53,6 @@ Dragonfly.Mail.getView = function (loc) ret = m.MultiListView; } } - else if (loc.handler == 'conversations') - { - // Fake ConversationView for Composer. - // (so we can get Dragonfly.Mail.ConversationView.getScrolledElement called) - ret = m.ConversationView; - } else { ret = m.ListView; diff --git a/src/www/js/Preferences.js b/src/www/js/Preferences.js index 8eb5e61..146d71b 100644 --- a/src/www/js/Preferences.js +++ b/src/www/js/Preferences.js @@ -264,7 +264,7 @@ Dragonfly.Preferences.Editor.build = function (loc) // Come up with some magic tabs! var notebook = new d.Notebook(); var userpage = notebook.appendPage('About Me'); - var composerpage = notebook.appendPage('Composer'); + var composerpage = notebook.appendPage('Mail'); var calendarpage = notebook.appendPage('Calendar'); var userhtml = new d.HtmlBuilder (); @@ -278,9 +278,17 @@ Dragonfly.Preferences.Editor.build = function (loc) var composerhtml = new d.HtmlBuilder (); composerhtml.push ('', - '', - '', + '', + '', '', + '', + '', + '', + '', + '', + '', '
Please don\'t abuse the above feature for now.

', + '', + '
'); composerhtml.set (composerpage);