Changeset 4486

Timestamp:

Sep 8, 2008, 8:58:19 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1109: Plot tool doesn't display "Generating plot..." correctly in IE

Location:

trunk/www/views/experiments/plotter

Files:

• index.jsp (modified) (2 diffs)
• view.jsp (modified) (1 diff)

trunk/www/views/experiments/plotter/index.jsp

@@ -361 +361 @@
       image.src = getRoot()+'images/plot_generating.gif';
       // Otherwise, the browser refuses to display the 'plot_generating.gif' while we are waiting.
-      setTimeout('changePreviewImage()', 100);
+      //setTimeout('changePreviewImage()', 100);
+      image.realImg = new Image();
+      image.realImg.onload = changePreviewImage;
+      image.realImg.src = url;
     }
   }
@@ -367 +370 @@
   function changePreviewImage()
   {
-    var url = generatePlotUrl(false);
-    if (url)
-    {
-      document.getElementById('preview').src = url;
-    }
+    var image = document.getElementById('preview');
+    image.src = image.realImg.src;
+    image.realImg = null;
   }
   

trunk/www/views/experiments/plotter/view.jsp

@@ -46 +46 @@
     var url = window.opener.generatePlotUrl(true);
     var img = document.getElementById('plot');
-    img.src = url;
+    img.realImg = new Image();
+    img.realImg.onload = switchImage;
+    img.realImg.src = url;
+  }
+  function switchImage()
+  {
+    var img = document.getElementById('plot');
+    img.src = img.realImg.src;
   }
   </script>