@@ -360,19 +360,6 @@ function queuePostLoadAction(contentPanel, action) { }, true); } -function loadDocument(contentPanel, documentHref, action) { - contentPanel.addEventListener( - 'load', function(event) { - contentPanel.contentWindow.addEventListener( - 'load', function(event) { - action(contentPanel.contentDocument); - }, false); - contentPanel.removeEventListener( - 'load', arguments.callee, true); - }, true); - contentPanel.contentDocument.location.href = documentHref; -} - // GUI UTILITIES (SPECIFIC) // ---------------------------------------------------------------------- @@ -487,8 +474,8 @@ function openAttachPanel(account, address, resource, type, documentHref, target, }, true); } - loadDocument( - contentPanel, documentHref, function(document) { + queuePostLoadAction( + contentPanel, function(document) { XMPP.enableContentDocument(contentPanel, account, address, type); if(documentHref == 'chrome://sameplace/content/app/chat.xhtml') @@ -497,6 +484,8 @@ function openAttachPanel(account, address, resource, type, documentHref, target, if(action) action(contentPanel); }); + + contentPanel.contentDocument.location.href = documentHref; return contentPanel; } chrome/content/sameplace.js f384a74140ec90e43e5aa0c70dd5127595527448 Massimiliano Mirra bard@hyperstruct.net http://github.com/bard/sameplace/commit/2c7282fb7937bdd8ede7ee571f69fbd59e81c228 2c7282fb7937bdd8ede7ee571f69fbd59e81c228 2006-09-19T12:51:18-07:00 2006-09-19T12:51:18-07:00 Deleted loadDocument, it was used only in one place and is replaced almost entirely by queuePostLoadAction. darcs-hash:20060919195118-8cc29-60ab2021552d6793b2e834c479dc982e30331073.gz 66f6c95e470ac3455704e26e5562e3eb85077af4 Massimiliano Mirra bard@hyperstruct.net