From d19b91e0e217a287da4fceebf50e09c7f52ef5c2 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 23 Oct 2009 12:02:57 -0600 Subject: [PATCH] Do everything on dom:load --- imp/js/compose.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/imp/js/compose.js b/imp/js/compose.js index f1de0af67..28ddccb74 100644 --- a/imp/js/compose.js +++ b/imp/js/compose.js @@ -399,21 +399,27 @@ var ImpCompose = { } } } + + document.observe('click', this.clickHandler.bindAsEventListener(this)); + document.observe('change', this.changeHandler.bindAsEventListener(this)); + + this.resize(); }, - onLoad: function() + resize: function() { var d, e = this.redirect ? $('redirect') : $('compose'); if (this.popup && !this.reloaded) { + e = e.getHeight(); + if (!e) { + return this.resize.bind(this).defer(); + } d = Math.min(e.getHeight(), screen.height - 100) - document.viewport.getHeight(); if (d > 0) { window.resizeBy(0, d); } } - - document.observe('click', this.clickHandler.bindAsEventListener(this)); - document.observe('change', this.changeHandler.bindAsEventListener(this)); }, onBeforeUnload: function() @@ -427,7 +433,6 @@ var ImpCompose = { /* Code to run on window load. */ document.observe('dom:loaded', ImpCompose.onDomLoad.bind(ImpCompose)); -Event.observe(window, 'load', ImpCompose.onLoad.bind(ImpCompose)); /* Warn before closing the window. */ Event.observe(window, 'beforeunload', ImpCompose.onBeforeUnload.bind(ImpCompose)); -- 2.11.0