From 315bde60d0618c0b17ffeab3f812adce3586c3da Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 28 May 2013 12:43:15 -0400
Subject: [PATCH] [FIXED JENKINS-18119] Work around timing issue in sortable
 object. Note that when workaround is active, table will not get sorted
 properly. Probably OK since tables with large contents that *need* sorting
 probably take longer to finish rendering.

---
 changelog.html                                                | 3 +++
 core/src/main/java/jenkins/util/ProgressiveRendering.java     | 2 +-
 .../main/resources/hudson/model/View/AsynchPeople/index.jelly | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 13b939e621..492aef617e 100644
--- a/changelog.html
+++ b/changelog.html
@@ -58,6 +58,9 @@ Upcoming changes</a>
   <li class=bug>
     User icon in People broken if Jenkins root URL unconfigured.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18118">issue 18118</a>)
+  <li class=bug>
+    Progress bar sometimes broken in People.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18119">issue 18119</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
index 04b2f97956..d659d0b5ed 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -44,7 +44,7 @@ import org.kohsuke.stapler.bind.JavaScriptMethod;
  * (since it may be canceled if the user simply browses to another page while it is running).
  * <ol>
  * <li>Write a {@code <script>} section defining {@code function display(data)}.
- *     (Call {@code document.getElementById('someid').sortable.refresh()} if using a {@code sortable} table.)
+ *     (Call {@code var t = document.getElementById('someid'); if (t.sortable != null) t.sortable.refresh()} if using a {@code sortable} table.)
  * <li>Use {@code <l:progressiveRendering handler="${it.something()}" callback="display"/>} from your
  *     Jelly page to display a progress bar and initialize JavaScript infrastructure.
  *     (The callback attribute can take arbitrary JavaScript expression to be evaluated in the browser
diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
index f98571068c..1c8a953e57 100644
--- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
+++ b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
@@ -88,7 +88,9 @@ THE SOFTWARE.
                   }
                   r.appendChild(d);
 
-                  p.sortable.refresh();
+                  if (p.sortable != null) {
+                      p.sortable.refresh();
+                  }
               }
           }
       </script>
-- 
GitLab