From 967531a1e321b5bc06dff0eae8e4a7ab60e1ccb5 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 2 Oct 2009 18:09:47 +0000
Subject: [PATCH] [FIXED HUDSON-4590] Defer injection of the script until the
 page load event fires, so that inability to load scripts from java.net
 wouldn't block other things that's wating for the firing of the onload event.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22347 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/DownloadService.java      | 8 ++++++--
 .../resources/hudson/model/UsageStatistics/footer.jelly   | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
index e9612644b2..10e580684c 100644
--- a/core/src/main/java/hudson/model/DownloadService.java
+++ b/core/src/main/java/hudson/model/DownloadService.java
@@ -65,7 +65,9 @@ public class DownloadService extends PageDecorator {
             long now = System.currentTimeMillis();
             for (Downloadable d : Downloadable.all()) {
                 if(d.getDue()<now) {
-                    buf.append("<script>downloadService.download(")
+                    buf.append("<script>")
+                       .append("Behaviour.addLoadEvent(function() {")
+                       .append("  downloadService.download(")
                        .append(QuotedStringTokenizer.quote(d.getId()))
                        .append(',')
                        .append(QuotedStringTokenizer.quote(d.getUrl()))
@@ -74,7 +76,9 @@ public class DownloadService extends PageDecorator {
                        .append(',')
                        .append(QuotedStringTokenizer.quote(Stapler.getCurrentRequest().getContextPath()+'/'+getUrl()+"/byId/"+d.getId()+"/postBack"))
                        .append(',')
-                       .append("null);</script>");
+                       .append("null);")
+                       .append("});")
+                       .append("</script>");
                 }
             }
         }
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly b/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly
index 57bf31edf8..e8f2c3eeb1 100644
--- a/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly
+++ b/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly
@@ -32,7 +32,9 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:if test="${it.due}">
     <script>
-      loadScript("https://hudson.dev.java.net/usage-stats.js?${it.statData}");
+      Behaviour.addLoadEvent(function() {
+        loadScript("https://hudson.dev.java.net/usage-stats.js?${it.statData}");
+      });
     </script>
   </j:if>
 </j:jelly>
\ No newline at end of file