From 74608dbdf89cf490992012f121fc734dbab88b00 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 28 Dec 2015 15:49:30 +0100 Subject: [PATCH] no message --- bookmarklet.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 808ff36..7f3275b 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -201,14 +201,14 @@ function renderCards(issueKeyList) { var promises = []; - var printFrame = global.printFrame; + var printFrameDocument = global.printFrame.document; - printFrame.document.open(); - printFrame.document.write(""); + printFrameDocument.open(); + printFrameDocument.write(""); - $("head", printFrame.document).append(cardElementStyle()); - $("body", printFrame.document).append("
"); - $("#preload", printFrame.document).append("
"); + $("head", printFrameDocument).append(cardElementStyle()); + $("body", printFrameDocument).append("
"); + $("#preload", printFrameDocument).append("
"); console.log("load " + issueKeyList.length + " issues..."); @@ -217,7 +217,7 @@ card.attr("index", index); card.hide(); card.find('.issue-id').text(issueKey); - $("body", printFrame.document).append(card); + $("body", printFrameDocument).append(card); promises.push(global.appFunctions.getCardData(issueKey).then(function(cardData) { console.log("cardData: " + JSON.stringify(cardData,2,2)); @@ -228,15 +228,15 @@ })); }); + printFrameDocument.close(); + + promises.push(new Promise(function(resolve){ + printFrameDocument.onload = resolve; + })); + console.log("wait for issues loaded..."); return Promise.all(promises).then(function() { console.log("...all issues loaded."); - - $(printFrame.window).load(function() { - console.log("...all resources loaded."); - }); - console.log("wait for resources loaded..."); - printFrame.document.close(); redrawCards(); }); }