]> source.dussan.org Git - gwtquery.git/commitdiff
Hide start race button while iframes are loading
authorManolo Carrasco <manolo@apache.org>
Sun, 1 Aug 2010 08:40:41 +0000 (08:40 +0000)
committerManolo Carrasco <manolo@apache.org>
Sun, 1 Aug 2010 08:40:41 +0000 (08:40 +0000)
samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java
samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html

index b79d2cc939e2f4eeea3dcfc3825f6538ae58f541..46b319777799bd0ca50287fa0177a51d9a8925b6 100644 (file)
@@ -189,6 +189,7 @@ public class GwtQueryBenchModule implements EntryPoint {
       selectedBenchmarks = readBenchmarkSelection();\r
       selectPanel.hide();\r
       $("#startrace").hide();\r
+      $("#results").show();\r
 \r
       initResultsTable(dg, selectedBenchmarks);\r
       initTrack(selectedBenchmarks);\r
@@ -300,8 +301,8 @@ public class GwtQueryBenchModule implements EntryPoint {
     \r
     initSelects(benchmarks);\r
     initIFrames();\r
+    $("#results").hide();\r
 \r
-    $("#startrace").click(ask ? askBenchMarks: runBenchMarks);\r
   }\r
 \r
   private void d(int selnumber, int benchnumber, String text) {\r
@@ -337,11 +338,16 @@ public class GwtQueryBenchModule implements EntryPoint {
     } else {\r
       $(i.replaceAll("%ID%", "iframe")).appendTo(document).hide();\r
     }\r
+    \r
+    $("#startrace").text("Loading ...");\r
     // Wait a while until the iframe/s have been loaded\r
     new Timer() {\r
       public void run() {\r
         writeTestContent($(".ibench").contents().find("body").get(0));\r
         gwtiframe = $(".ibench").eq(0).contents().get(0);\r
+        $("#startrace").text("Start Race");\r
+        $("#startrace").click(ask ? askBenchMarks: runBenchMarks);\r
+\r
       }\r
     }.schedule(waitToLoad);\r
   }\r
@@ -406,7 +412,7 @@ public class GwtQueryBenchModule implements EntryPoint {
       g.append($(s));\r
     }\r
 \r
-    int height = g.find(".horse").height() * (benchs.length + 1);\r
+    int height = Math.max(35, g.find(".horse").height() * (benchs.length + 1));\r
     $("#racetrack").css("height", height + "px");\r
     \r
     GQuery flag = $("<img class=flag src='images/bench/animated-flag.gif'/>").appendTo(document);\r
index b2a7cc08e2805d1806945a83b575e55cc03120ca..29843ef781f670f8e7bb79e42030ca3a16a9cdba 100644 (file)
@@ -72,9 +72,8 @@
 <body>\r
        <h2 style="color: white; border-bottom: 1px solid gray">\r
            GWTSpeed - GWT Query benchmarks\r
-           <div id="startrace" style="float: right; color: red">Start Race</div>\r
        </h2>\r
-       \r
+       <div id="startrace" style="color: red"></div>\r
        <div id="racetrack" style="height: 0px; overflow: hidden;">\r
          <div id="racefield"\r
                    style="height: 100%; padding: 15px; background-image: url(images/bench/grass-texture-small.jpg); background-repeat: repeat;">\r