From eba28995643faa00d6e97ec461f84980e15e4024 Mon Sep 17 00:00:00 2001
From: servertood <servertood@40cadd2d-89a2-4482-8f20-0232d845d7e3>
Date: Sat, 22 Nov 2008 05:09:11 +0000
Subject: [PATCH] change refresh to use new worker stuff

---
 extra/jheidi/mainToolbarEvents.ajl | 14 ++------------
 extra/jheidi/mainWindowEvents.ajl  | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/extra/jheidi/mainToolbarEvents.ajl b/extra/jheidi/mainToolbarEvents.ajl
index 86800b56..1cfb00a6 100644
--- a/extra/jheidi/mainToolbarEvents.ajl
+++ b/extra/jheidi/mainToolbarEvents.ajl
@@ -42,18 +42,8 @@ else if ("Refresh" == who)
     if ( script.endsWith("Worker") )
     {
       Worker w = worker(script, scriptArgs, Worker.RunOption.LET_FINISH_IF_RUNNING);
-      Runnable preloadIfLazy = scriptArgs.getObject("preloadIfLazy");
-      if (preloadIfLazy != null )
-      {
-        //they hit refresh in quick succession
-        if ( w.isCancelled() )
-        {
-          preloadIfLazy.run();
-          return;
-        }
-      }
-      scriptArgs.put("worker", w);
-      LongRunningTask.detect("progressWaiter",scriptArgs, w , 250);
+      if (!w.isCancelled())
+        LongRunningTask.detect("progressWaiter",scriptArgs, w , 250);
     }
     else
     {
diff --git a/extra/jheidi/mainWindowEvents.ajl b/extra/jheidi/mainWindowEvents.ajl
index 93e2b6d2..2e5b6dd4 100644
--- a/extra/jheidi/mainWindowEvents.ajl
+++ b/extra/jheidi/mainWindowEvents.ajl
@@ -43,18 +43,8 @@ else if ("Refresh" == who)
     if ( script.endsWith("Worker") )
     {
       Worker w = worker(script, scriptArgs, Worker.RunOption.LET_FINISH_IF_RUNNING);
-      Runnable preloadIfLazy = scriptArgs.getObject("preloadIfLazy");
-      if (preloadIfLazy != null )
-      {
-        //they hit refresh in quick succession
-        if ( w.isCancelled() )
-        {
-          preloadIfLazy.run();
-          return;
-        }
-      }
-      scriptArgs.put("worker", w);
-      LongRunningTask.detect("progressWaiter",scriptArgs, w , 250);
+      if (!w.isCancelled())
+        LongRunningTask.detect("progressWaiter",scriptArgs, w , 250);
     }
     else
     {