X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=build%2Fspeed%2Fbenchmarker.js;h=b2c05a149980d9a0da108e215b5ec46cfdef8b24;hb=762370256520c5356fdce8ba07acf7f404e83025;hp=a04e5acc9902f9f41a96e9a2b2e313eea9359489;hpb=73ab36b8f8f14ed7872bf930a08d8eae68f30fda;p=jquery.git

diff --git a/build/speed/benchmarker.js b/build/speed/benchmarker.js
index a04e5ac..b2c05a1 100755
--- a/build/speed/benchmarker.js
+++ b/build/speed/benchmarker.js
@@ -3,15 +3,16 @@
 		"body", "body div", "div", 
 		"div div div", "div div", ".dialog", "div.dialog", "div .dialog",
 		"#speech5", "div#speech5", "div #speech5", "div > div", "div.scene div.dialog",
-		"div#scene1.scene div.dialog div", "#scene1 #speech1", "body > div.dialog div#speech5",
+		"div#scene1.scene div.dialog div.direction", "#scene1 #speech1", "body > div.dialog div div#speech5",
+		"div:not(#speech5)", "div:not(.dialog)",
 		"div:nth-child(even)", "div:nth-child(odd)",
 		"div:nth-child(1)", "div:nth-child(2n)",
 		"div:nth-child(2n+3)", "div:first-child",
 		"div:last-child", "div:only-child",
 		"div:contains(CELIA)",
 		"div ~ div", "div + div",
-		"div[@class]", "div[@class=dialog]", "div[@class!=dialog]", 
-		"div[@class^=dialog]", "div[@class$=dialog]", "div[@class*=dialog]"
+		"div[class]", "div[class=dialog]", "div[class!=dialog]", 
+		"div[class^=dialog]", "div[class$=dialog]", "div[class*=dialog]"
 		]
 
   jQuery.fn.benchmark = function() {
@@ -20,8 +21,8 @@
         jQuery(this).parent().children("*:gt(1)").remove();
       } catch(e) { }
     })
-    var times = 5;
-    jQuery("#times").html(times);
+    // set # times to run the test in index.html
+    var times = parseInt(jQuery("#times").val());
     jQuery.benchmarker.startingList = this.get();
     benchmark(this.get(), times, jQuery.benchmarker.libraries);
   }
@@ -33,13 +34,13 @@
     jQuery("tbody tr:first-child").remove();
     jQuery("td.test").before("<td><input type='checkbox' checked='checked' /></td>");
     jQuery("button.runTests").bind("click", function() {
-      jQuery('td[input:checked] + td.test').benchmark();
+      jQuery('td:has(input:checked) + td.test').benchmark();
     });
 
-    jQuery("button.retryTies").bind("click", function() { jQuery("tr[td.tie] td.test").benchmark() })
+    jQuery("button.retryTies").bind("click", function() { jQuery("tr:has(td.tie) td.test").benchmark() })
 
-    jQuery("button.selectAll").bind("click", function() { jQuery("input[@type=checkbox]").each(function() { this.checked = true }) })
-    jQuery("button.deselectAll").bind("click", function() { jQuery("input[@type=checkbox]").each(function() { this.checked = false }) })
+    jQuery("button.selectAll").bind("click", function() { jQuery("input[type=checkbox]").each(function() { this.checked = true }) })
+    jQuery("button.deselectAll").bind("click", function() { jQuery("input[type=checkbox]").each(function() { this.checked = false }) })
 
     jQuery("#addTest").bind("click", function() {
       jQuery("table").append("<tr><td><input type='checkbox' /></td><td><input type='text' /><button>Add</button></td></tr>");
@@ -52,8 +53,9 @@
       })
     })
 
-    var headers = jQuery.map(jQuery.benchmarker.libraries, function(i) {
-      return "<th>" + i + "</th>"
+    var headers = jQuery.map(jQuery.benchmarker.libraries, function(i,n) {
+      var extra = n == 0 ? "basis - " : "";
+      return "<th>" + extra + i + "</th>"
     }).join("");
 
     jQuery("thead tr").append(headers);
@@ -76,9 +78,6 @@
        var times = times || 50;
        var el = list[0];
        var code = jQuery(el).text().replace(/^-/, "");
-         if(!libraries[0].match(/^jQ/)) {
-           code = code.replace(/@/, "");
-         }
          var timeArr = []
          for(i = 0; i < times + 2; i++) {
            var time = new Date()