remove datatable unit tests
remove datatable unit tests

file:a/about.php -> file:b/about.php
--- a/about.php
+++ b/about.php
@@ -19,13 +19,12 @@
 orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit

 </div>

 </div>

+<?php CNDistributionGraph(); ?>

+sourced from austender

 

-sourced from austender

 Government Agency Information (2009-07-10): National Archives of Australia, http://www.naa.gov.au under Creative Commons - Attribution 2.5 Australia (CC-BY)

-jpgraph for php

+

 ABR

-Redhat Liberation fonts

-

 

 <?php

 include_once("./lib/common.inc.php");


file:a/admin/displayUNSPSC.php (deleted)
--- a/admin/displayUNSPSC.php
+++ /dev/null
@@ -1,24 +1,1 @@
-<?php

-error_reporting(E_ALL);

-  include_once("../lib/common.inc.php");

-

-

-$unspscresult= $conn->prepare('select * from "UNSPSCcategories";');

-$unspscresult->execute();

-foreach ($unspscresult->fetchAll() as $row) {

-	$unspsc[$row['UNSPSC']] = $row['Title'];

-

-}

-$catsresult = $conn->prepare('SELECT substr( "categoryUNSPSC"::text, 0, 2 ) as cat , SUM( "value" ) as value

-FROM contractnotice

-GROUP BY cat ;');

-echo "<table>";

-$catsresult->execute();

-foreach ($catsresult->fetchAll() as $row) {

-	$catName = $unspsc[$row['cat']."0000000"].$row['cat'];

-	if ($row['cat'] == "") $catName = "null";

-	

-	echo "<tr><td>$catName</td><td>".$row['value']."</td></tr>";

-}

-?>

 

--- a/admin/import.php
+++ b/admin/import.php
@@ -60,6 +60,7 @@
                       if (($datamapping0711[$headers[$c]]) == "parentCN" || ($datamapping0711[$headers[$c]]) == "CNID") {
                           $data[$c] = substr($data[$c], 2); // take off the "CN" prefix
                           $data[$c] = str_replace("-A","00",$data[$c]); // make amendments really big numbers
+                          if (!is_numeric($data[$c])) die ($data[$c]." is not numeric");
                           if ($data[$c] > 0) {
                               $contractNoticeInsert[] = $data[$c];
                           } else {
@@ -166,5 +167,13 @@
       echo "<br> $success records successfully created";
       flush();
   }
+  // run post import data processing
+  // cn
+  include("linkAmendments.php");
+  include("updateUNSPSC.php");
+// agency
+  include("setAgencyStatus.php");
+  include("setAgencyURLABN.php");
+  
 ?>
 

--- a/admin/importUNSPSC.php
+++ b/admin/importUNSPSC.php
@@ -1,5 +1,26 @@
 <?php
   include_once("../lib/common.inc.php");
+
+  // display existing
+
+$unspscresult= $conn->prepare('select * from "UNSPSCcategories";');
+$unspscresult->execute();
+foreach ($unspscresult->fetchAll() as $row) {
+  $unspsc[$row['UNSPSC']] = $row['Title'];
+
+}
+$catsresult = $conn->prepare('SELECT substr( "categoryUNSPSC"::text, 0, 2 ) as cat , SUM( "value" ) as value
+FROM contractnotice
+GROUP BY cat ;');
+echo "<table>";
+$catsresult->execute();
+foreach ($catsresult->fetchAll() as $row) {
+  $catName = $unspsc[$row['cat']."0000000"].$row['cat'];
+  if ($row['cat'] == "") $catName = "null";
+  
+  echo "<tr><td>$catName</td><td>".$row['value']."</td></tr>";
+}
+// import new from file
       $success = 0;
       $fname = "UNSPSC_ECCMA_V13.2_UNDP_V7.csv";
       echo " ============== $fname  ============== <br>";

--- a/admin/linkAmendments.php
+++ b/admin/linkAmendments.php
@@ -1,17 +1,22 @@
 <?php
 include_once ("../lib/common.inc.php");
-$query = 'SELECT "CNID","parentCN","amendmentReason" FROM contractnotice WHERE
-"parentCN" > 0 ';
+$query = 'SELECT c."CNID",c."parentCN",c."amendmentReason",p."childCN" FROM contractnotice as c  LEFT OUTER JOIN contractnotice as p on c."parentCN" = p."CNID"
+WHERE
+c."parentCN" > 0 AND p."childCN" IS NULL ';
 $query = $conn->prepare($query);
 	$query->execute();
 	if (!$query) {
 		databaseError($conn->errorInfo());
 	}
 foreach ($query->fetchAll() as $row) {
-  $conn->exec('UPDATE contractnotice SET childCN = "' .
-			 $row['CNID'] . '", amendmentReason = "' .
-			 $row['amendmentReason'] . '" where "CNID" = "' .
-			 $row['parentCN'] . '";');
+  $conn->exec('UPDATE contractnotice SET "childCN" = \'' .
+			 $row['CNID'] . '\', "amendmentReason" = \'' .
+			 $row['amendmentReason'] . '\' where "CNID" = \'' .
+			 $row['parentCN'] . '\';');
+			 echo 'UPDATE contractnotice SET "childCN" = \'' .
+			 $row['CNID'] . '\', "amendmentReason" = \'' .
+			 $row['amendmentReason'] . '\' where "CNID" = \'' .
+			 $row['parentCN'] . '\';';
     $errors = $conn->errorInfo();
               
               if ($errors[1] == 7 || $errors[1] ==0)
@@ -20,4 +25,5 @@
   else print_r($errors);
 
 }
+// also need to eliminate CN 100528/100529 - check for double parent CNs with no childCN, latest sequent CN id wins childCN = 0
 ?>

--- a/displayAgency.php
+++ b/displayAgency.php
@@ -4,9 +4,9 @@
     

 include_header("Agency");

   $agency = htmlentities(strip_tags($_REQUEST['agency']));

-  echo '<img src="graphs/displayMethodCountGraph.php?agency=' . stripslashes($agency) . '">';

-  echo '<img src="graphs/displayCnCGraph.php?agency=' . stripslashes($agency) . '">';

-  echo '<img src="graphs/displayMethodValueGraph.php?agency=' . stripslashes($agency) . '">';

+  MethodCountGraph($agency);

+  CnCGraph($agency);

+  MethodValueGraph($agency);

   /*biggest contracts

   spending by year

   spending by industry/category

@@ -63,6 +63,7 @@
      split by portfolio

     */

 include_header("Agencies");

+agenciesGraph();

   $query = 'SELECT SUM("value"), "agencyName"

 FROM contractnotice

 WHERE "childCN" = 0


--- a/displayBubbletree.php
+++ b/displayBubbletree.php
@@ -19,11 +19,17 @@
 		$(function() {
 		<?php
 include_once ("lib/common.inc.php");
+
+include("lib/Color.php");
+$color = new Lux_Color();
+
+
 $unspscresult = mysql_query("select * from UNSPSCcategories;");
 while ($row = mysql_fetch_assoc($unspscresult)) {
 	$unspsc[$row['UNSPSC']] = $row['Title'];
 }
 $total = 0;
+$cats = 0;
 $catsresult = mysql_query("SELECT LEFT( categoryUNSPSC, 1 ) as cat ,
 SUM( value ) as value
 FROM `contractnotice`
@@ -31,6 +37,8 @@
 GROUP BY cat ;");
 $nodes = Array();
 while ($row = mysql_fetch_assoc($catsresult)) {
+$cats++;
+$catColor = $color->hsl2hex(Array($cats/10, .7, .5));
 	$catName = $unspsc[$row['cat'] . "0000000"] . $row['cat'];
 	if ($row['cat'] == "") $catName = "null";
 	$subnodes = Array();
@@ -48,26 +56,27 @@
 FROM `contractnotice`
 WHERE childCN = 0 and LEFT( categoryUNSPSC, 2 ) = '{$tworow['cat']}'
 GROUP BY cat ;");
+		$subCatColor = $color->hsl2hex(Array($cats/10, rand(1,10)/10, .5));
 		while ($threerow = mysql_fetch_assoc($catthreesresult)) {
 			$subsubcatName = $unspsc[$threerow['cat'] . "00000"] . $threerow['cat'];
 			if ($threerow['cat'] == "") $subsubcatName = "null";
 			$subsubnodes[] = Array(
 				"label" => $subsubcatName,
 				"amount" => $threerow['value'],
-				"color" => "#000000"
+				"color" => "#".$subCatColor
 			);
 		}
 		$subnodes[] = Array(
 			"label" => $subcatName,
 			"amount" => $tworow['value'],
-			"color" => "#000000",
+			"color" => "#".$subCatColor,
 			"children" => $subsubnodes
 		);
 	}
 	$nodes[] = Array(
 		"label" => $catName,
 		"amount" => $row['value'],
-		"color" => "#000000",
+		"color" => "#".$catColor,
 		"children" => $subnodes
 	);
 	$total+= $row['value'];

--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -6,15 +6,23 @@
 if ($_REQUEST['month']) {

     echo "<center><h1>".$_REQUEST['month']."</h1></center>";

 $monthParts = explode("-",$_REQUEST['month']);

-  $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName

-    FROM `contractnotice`

-    WHERE childCN = 0 

-    AND YEAR(contractStart) = {$monthParts[1]}

-    AND MONTH(contractStart)  = {$monthParts[0]}

-    ORDER BY value DESC";

-  $result = mysql_query($query);

-echo '<img src="graphs/displayMethodCountGraph.php?month=' . stripslashes($supplier) . '">';

-   echo '<img src="graphs/displayCnCGraph.php?month=' . stripslashes($supplier) . '">';

+  $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName"

+    FROM contractnotice

+    WHERE "childCN" = 0 

+    AND extract(year from "contractStart") = :year

+    AND extract(month from "contractStart")  = :month

+    ORDER BY value DESC';

+$query = $conn->prepare($query);

+$query->bindParam(":month",  $monthParts[0]);

+

+$query->bindParam(":year",  $monthParts[1]);

+  $query->execute();

+  if (!$query) {

+    databaseError($conn->errorInfo());

+  }

+

+MethodCountGraph($supplier);

+CnCGraph($supplier);

 

   echo "<table>  <thead>

     <tr>

@@ -26,7 +34,7 @@
       <th>Supplier</th>

     </tr>

   </thead>";

-  while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {

+  foreach ($query->fetchAll() as $row) {

     setlocale(LC_MONETARY, 'en_US');

     $value = number_format(doubleval($row['value']) , 2);

     echo ("<tr>

@@ -52,10 +60,14 @@
 echo '<img src="graphs/displayContractPublishedGraph.php">';

 

 

-$query = "SELECT YEAR(contractStart), MONTH(contractStart),

-SUM(value) as val, count(1) as count FROM `contractnotice` WHERE childCN = 0 GROUP BY MONTH(contractStart), YEAR(contractStart) ORDER BY YEAR(contractStart), MONTH(contractStart) ";

+$query = 'SELECT extract(year from "contractStart"), extract(month from "contractStart"),

+SUM(value) as val, count(1) as count FROM contractnotice WHERE "childCN" = 0 GROUP BY extract(year from "contractStart"), extract(month from "contractStart") ORDER BY extract(year from "contractStart"), extract(month from "contractStart") ';

+$query = $conn->prepare($query);

+  $query->execute();

+  if (!$query) {

+    databaseError($conn->errorInfo());

+  }

 

-$result = mysql_query($query);

   echo "<table>  <thead>

     <tr>

       <th>Month/Year</th>

@@ -63,7 +75,7 @@
       <th>Number of Contracts</th>

     </tr>

   </thead>";

-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {

+  foreach ($query->fetchAll() as $row) {

 setlocale(LC_MONETARY, 'en_US');

 $value = number_format(doubleval($row["val"]),2);

 $month_name = date( 'F', mktime(0, 0, 0, $row[1]) );


--- a/displayHeatmap.php
+++ b/displayHeatmap.php
@@ -1,7 +1,7 @@
 <?php

 

 

-include('../lib/common.inc.php');

+include('lib/common.inc.php');

 

 $year = 2006;

 $ZeroX = 112.5;

@@ -22,12 +22,17 @@
 $height = 457;

 //echo "http://dev.openstreetmap.org/~pafciu17/?module=map&bbox=".$ZeroX.",".$ZeroY.",".$MaxX.",".$MaxY."&width=".$width."&height=".$height;

 //$handle = ImageCreate ($width, $height) or die ("Cannot Create image");

-$handle = imagecreatefrompng('../images/australia.png');

+$handle = imagecreatefrompng('images/australia.png');

 $white = imagecolorallocate($handle, 0, 0, 0);

 imagecolortransparent($handle, $white);

 

-$query = "SELECT supplierPostcode, sum(value) as value, lat, lon FROM `contractnotice`,`postcodes` where childCN = 0 AND supplierCountry = 'Australia' AND YEAR(contractStart) >= '$year' AND supplierPostcode = postcode GROUP BY supplierPostcode";

-$result = mysql_query($query);

+$query = 'SELECT "supplierPostcode", sum("value") as value, max(lat) as lat, max(lon) as lon FROM contractnotice inner join postcodes on "supplierPostcode" = postcode::text where "childCN" = 0 AND "supplierCountry" = \'Australia\' GROUP BY "supplierPostcode"';

+$query = $conn->prepare($query);

+   $query->execute();

+   if (!$query) {

+      databaseError($conn->errorInfo());

+   }

+

 

 $left = "FFFF50";

 $right= "EF0050";

@@ -41,8 +46,7 @@
     $colorset[$i] = imagecolorallocatealpha($handle, $leftR + ($i*(($rightR-$leftR)/250)), $leftG + ($i*(($rightG-$leftG)/250)), $leftB + ($i*(($rightB-$leftB)/250)),117 - ($i/250)*40);

 }

 

-while ($row = mysql_fetch_array($result, MYSQL_BOTH))

-{

+  foreach ($query->fetchAll() as $row) {

    $xpage = round((($XRange - ($MaxX - $row['lon'])) / $xdivlength));

 	if ($row['lat'] < -40.25) $row['lat']-= 0.75;

    $ypage = round(($YRange - (abs($MaxY) - abs($row['lat']))) / $ydivheight);


--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -4,9 +4,9 @@
     
 include_header("Supplier");
   $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
-  echo '<img src="graphs/displayMethodCountGraph.php?supplier=' . stripslashes($supplierS) . '">';
-   echo '<img src="graphs/displayCnCGraph.php?supplier=' . stripslashes($supplierS) . '">';
-   echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplierS) . '">';
+  MethodCountGraph($supplierS);
+   CnCGraph($supplierS);
+  MethodValueGraph($supplierS);
   /*lobbyist ties
   
   links to ABR/ASIC/Google News/ASX/Court records
@@ -62,6 +62,7 @@
      histograph of supplier size/value
     */
 include_header("Suppliers");
+suppliersGraph();
   $query = 'SELECT SUM("value") as val, MAX("supplierName") as supplierName, "supplierABN",(
  case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID 
 FROM contractnotice

--- a/heuristics/heuristics.inc.php
+++ b/heuristics/heuristics.inc.php
@@ -3,13 +3,13 @@
 $heuristics = Array();
 //each heuristic adds self to description array
 include ("dateHeuristics.php");
-//include ("historyHeuristics.php");
+include ("historyHeuristics.php");
 //include ("metadataHeuristics.php");
 //include ("valueHeuristics.php");
 function runHeuristic($heuristicName, $cn)
 {
 	// check  if already ran
-	$query = "select count(*) from heuristic_results where heuristic_name = '$heuristicName' and CNID = '{$CN['CNID']}";
+	$query = "select count(*) from heuristic_results where heuristic_name = '$heuristicName' and CNID = '{$cn['CNID']}'";
 	$result = mysql_query($query);
 	$r = mysql_fetch_array($result);
 	if ($r[0] == 0) {
@@ -37,3 +37,4 @@
 	}
 }
 ?>
+

file:b/lib/Color.php (new)
--- /dev/null
+++ b/lib/Color.php
@@ -1,1 +1,502 @@
-
+<?php

+/**

+ *

+ * Color values manipulation utilities. Provides methods to convert from and to

+ * Hex, RGB, HSV and HSL color representattions.

+ *

+ * Several color conversion logic are based on pseudo-code from

+ * http://www.easyrgb.com/math.php

+ *

+ * @category Lux

+ *

+ * @package Lux_Color

+ *

+ * @author Rodrigo Moraes <rodrigo.moraes@gmail.com>

+ *

+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License

+ *

+ * @version $Id$

+ *

+ */

+class Lux_Color

+{

+    /**

+     *

+     * Converts hexadecimal colors to RGB.

+     *

+     * @param string $hex Hexadecimal value. Accepts values with 3 or 6 numbers,

+     * with or without #, e.g., CCC, #CCC, CCCCCC or #CCCCCC.

+     *

+     * @return array RGB values: 0 => R, 1 => G, 2 => B

+     *

+     */

+    public function hex2rgb($hex)

+    {

+        // Remove #.

+        if (strpos($hex, '#') === 0) {

+            $hex = substr($hex, 1);

+        }

+

+        if (strlen($hex) == 3) {

+            $hex .= $hex;

+        }

+

+        if (strlen($hex) != 6) {

+            return false;

+        }

+

+        // Convert each tuple to decimal.

+        $r = hexdec(substr($hex, 0, 2));

+        $g = hexdec(substr($hex, 2, 2));

+        $b = hexdec(substr($hex, 4, 2));

+

+        return array($r, $g, $b);

+    }

+

+    /**

+     *

+     * Converts hexadecimal colors to HSV.

+     *

+     * @param string $hex Hexadecimal value. Accepts values with 3 or 6 numbers,

+     * with or without #, e.g., CCC, #CCC, CCCCCC or #CCCCCC.

+     *

+     * @return array HSV values: 0 => H, 1 => S, 2 => V

+     *

+     */

+    public function hex2hsv($hex)

+    {

+        return $this->rgb2hsv($this->hex2rgb($hex));

+    }

+

+    /**

+     *

+     * Converts hexadecimal colors to HSL.

+     *

+     * @param string $hex Hexadecimal value. Accepts values with 3 or 6 numbers,

+     * with or without #, e.g., CCC, #CCC, CCCCCC or #CCCCCC.

+     *

+     * @return array HSL values: 0 => H, 1 => S, 2 => L

+     *

+     */

+    public function hex2hsl($hex)

+    {

+        return $this->rgb2hsl($this->hex2rgb($hex));

+    }

+

+    /**

+     *

+     * Converts RGB colors to hexadecimal.

+     *

+     * @param array $rgb RGB values: 0 => R, 1 => G, 2 => B

+     *

+     * @return string Hexadecimal value with six digits, e.g., CCCCCC.

+     *

+     */

+    public function rgb2hex($rgb)

+    {

+        if(count($rgb) < 3) {

+            return false;

+        }

+

+        list($r, $g, $b) = $rgb;

+

+        // From php.net.

+        $r = 0x10000 * max(0, min(255, $r));

+        $g = 0x100 * max(0, min(255, $g));

+        $b = max(0, min(255, $b));

+

+        return strtoupper(str_pad(dechex($r + $g + $b), 6, 0, STR_PAD_LEFT));

+    }

+

+    /**

+     *

+     * Converts RGB to HSV.

+     *

+     * @param array $rgb RGB values: 0 => R, 1 => G, 2 => B

+     *

+     * @return array HSV values: 0 => H, 1 => S, 2 => V

+     *

+     */

+    public function rgb2hsv($rgb)

+    {

+        // RGB values = 0 ÷ 255

+        $var_R = ($rgb[0] / 255);

+        $var_G = ($rgb[1] / 255);

+        $var_B = ($rgb[2] / 255);

+

+        // Min. value of RGB

+        $var_Min = min($var_R, $var_G, $var_B);

+

+        // Max. value of RGB

+        $var_Max = max($var_R, $var_G, $var_B);

+

+        // Delta RGB value

+        $del_Max = $var_Max - $var_Min;

+

+        $V = $var_Max;

+

+        // This is a gray, no chroma...

+        if ( $del_Max == 0 ) {

+           // HSV results = 0 ÷ 1

+           $H = 0;

+           $S = 0;

+        } else {

+           // Chromatic data...

+           $S = $del_Max / $var_Max;

+

+           $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;

+           $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;

+           $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;

+

+           if ($var_R == $var_Max) {

+               $H = $del_B - $del_G;

+           } else if ($var_G == $var_Max) {

+               $H = (1 / 3) + $del_R - $del_B;

+           } else if ($var_B == $var_Max) {

+               $H = (2 / 3) + $del_G - $del_R;

+           }

+

+           if ($H < 0) {

+               $H += 1;

+           }

+           if ($H > 1) {

+               $H -= 1;

+           }

+        }

+

+        // Returns agnostic values.

+        // Range will depend on the application: e.g. $H*360, $S*100, $V*100.

+        return array($H, $S, $V);

+    }

+

+    /**

+     *

+     * Converts RGB to HSL.

+     *

+     * @param array $rgb RGB values: 0 => R, 1 => G, 2 => B

+     *

+     * @return array HSL values: 0 => H, 1 => S, 2 => L

+     *

+     */

+    public function rgb2hsl($rgb)

+    {

+        // Where RGB values = 0 ÷ 255.

+        $var_R = $rgb[0] / 255;

+        $var_G = $rgb[1] / 255;

+        $var_B = $rgb[2] / 255;

+

+        // Min. value of RGB

+        $var_Min = min($var_R, $var_G, $var_B);

+        // Max. value of RGB

+        $var_Max = max($var_R, $var_G, $var_B);

+        // Delta RGB value

+        $del_Max = $var_Max - $var_Min;

+

+        $L = ($var_Max + $var_Min) / 2;

+

+        if ( $del_Max == 0 ) {

+            // This is a gray, no chroma...

+            // HSL results = 0 ÷ 1

+            $H = 0;

+            $S = 0;

+        } else {

+            // Chromatic data...

+            if ($L < 0.5) {

+                $S = $del_Max / ($var_Max + $var_Min);

+            } else {

+                $S = $del_Max / ( 2 - $var_Max - $var_Min );

+            }

+

+            $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;

+            $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;

+            $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;

+

+            if ($var_R == $var_Max) {

+                $H = $del_B - $del_G;

+            } else if ($var_G == $var_Max) {

+                $H = ( 1 / 3 ) + $del_R - $del_B;

+            } else if ($var_B == $var_Max) {

+                $H = ( 2 / 3 ) + $del_G - $del_R;

+            }

+

+            if ($H < 0) {

+                $H += 1;

+            }

+            if ($H > 1) {

+                $H -= 1;

+            }

+        }

+

+        return array($H, $S, $L);

+    }

+

+    /**

+     *

+     * Converts HSV colors to hexadecimal.

+     *

+     * @param array $hsv HSV values: 0 => H, 1 => S, 2 => V

+     *

+     * @return string Hexadecimal value with six digits, e.g., CCCCCC.

+     *

+     */

+    public function hsv2hex($hsv)

+    {

+        return $this->rgb2hex($this->hsv2rgb($hsv));

+    }

+

+    /**

+     *

+     * Converts HSV to RGB.

+     *

+     * @param array $hsv HSV values: 0 => H, 1 => S, 2 => V

+     *

+     * @return array RGB values: 0 => R, 1 => G, 2 => B

+     *

+     */

+    public function hsv2rgb($hsv)

+    {

+        $H = $hsv[0];

+        $S = $hsv[1];

+        $V = $hsv[2];

+

+        // HSV values = 0 ÷ 1

+        if ($S == 0) {

+            $R = $V * 255;

+            $G = $V * 255;

+            $B = $V * 255;

+        } else {

+            $var_h = $H * 6;

+            // H must be < 1

+            if ( $var_h == 6 ) {

+                $var_h = 0;

+            }

+            // Or ... $var_i = floor( $var_h )

+            $var_i = floor( $var_h );

+            $var_1 = $V * ( 1 - $S );

+            $var_2 = $V * ( 1 - $S * ( $var_h - $var_i ) );

+            $var_3 = $V * ( 1 - $S * ( 1 - ( $var_h - $var_i ) ) );

+

+            switch($var_i) {

+                case 0:

+                    $var_r = $V;

+                    $var_g = $var_3;

+                    $var_b = $var_1;

+                    break;

+                case 1:

+                    $var_r = $var_2;

+                    $var_g = $V;

+                    $var_b = $var_1;

+                    break;

+                case 2:

+                    $var_r = $var_1;

+                    $var_g = $V;

+                    $var_b = $var_3;

+                    break;

+                case 3:

+                    $var_r = $var_1;

+                    $var_g = $var_2;

+                    $var_b = $V;

+                    break;

+                case 4:

+                    $var_r = $var_3;

+                    $var_g = $var_1;

+                    $var_b = $V;

+                    break;

+                default:

+                    $var_r = $V;

+                    $var_g = $var_1;

+                    $var_b = $var_2;

+            }

+

+            //RGB results = 0 ÷ 255

+            $R = $var_r * 255;

+            $G = $var_g * 255;

+            $B = $var_b * 255;

+        }

+

+        return array($R, $G, $B);

+    }

+

+    /**

+     *

+     * Converts HSV colors to HSL.

+     *

+     * @param array $hsv HSV values: 0 => H, 1 => S, 2 => V

+     *

+     * @return array HSL values: 0 => H, 1 => S, 2 => L

+     *

+     */

+    public function hsv2hsl($hsv)

+    {

+        return $this->rgb2hsl($this->hsv2rgb($hsv));

+    }

+

+    /**

+     *

+     * Converts hexadecimal colors to HSL.

+     *

+     * @param array $hsl HSL values: 0 => H, 1 => S, 2 => L

+     *

+     * @return string Hexadecimal value. Accepts values with 3 or 6 numbers,

+     * with or without #, e.g., CCC, #CCC, CCCCCC or #CCCCCC.

+     *

+     */

+    public function hsl2hex($hsl)

+    {

+        return $this->rgb2hex($this->hsl2rgb($hsl));

+    }

+

+    /**

+     *

+     * Converts HSL to RGB.

+     *

+     * @param array $hsv HSL values: 0 => H, 1 => S, 2 => L

+     *

+     * @return array RGB values: 0 => R, 1 => G, 2 => B

+     *

+     */

+    public function hsl2rgb($hsl)

+    {

+        list($H, $S, $L) = $hsl;

+

+        if ($S == 0) {

+            // HSL values = 0 ÷ 1

+            // RGB results = 0 ÷ 255

+            $R = $L * 255;

+            $G = $L * 255;

+            $B = $L * 255;

+        } else {

+            if ($L < 0.5) {

+                $var_2 = $L * (1 + $S);

+            } else {

+                $var_2 = ($L + $S) - ($S * $L);

+            }

+

+            $var_1 = 2 * $L - $var_2;

+

+            $R = 255 * $this->_hue2rgb($var_1, $var_2, $H + (1 / 3));

+            $G = 255 * $this->_hue2rgb($var_1, $var_2, $H);

+            $B = 255 * $this->_hue2rgb($var_1, $var_2, $H - (1 / 3));

+        }

+

+        return array($R, $G, $B);

+    }

+

+    /**

+     *

+     * Support method for hsl2rgb(): converts hue ro RGB.

+     *

+     * @param

+     *

+     * @param

+     *

+     * @param

+     *

+     * @return int

+     *

+     */

+    protected function _hue2rgb($v1, $v2, $vH)

+    {

+        if ($vH < 0) {

+            $vH += 1;

+        }

+

+        if ($vH > 1) {

+            $vH -= 1;

+        }

+

+        if ((6 * $vH) < 1) {

+            return ($v1 + ($v2 - $v1) * 6 * $vH);

+        }

+

+        if ((2 * $vH) < 1) {

+            return $v2;

+        }

+

+        if ((3 * $vH) < 2) {

+            return ($v1 + ($v2 - $v1) * (( 2 / 3) - $vH) * 6);

+        }

+

+        return $v1;

+    }

+

+    /**

+     *

+     * Converts hexadecimal colors to HSL.

+     *

+     * @param array $hsl HSL values: 0 => H, 1 => S, 2 => L

+     *

+     * @return array HSV values: 0 => H, 1 => S, 2 => V

+     *

+     */

+    public function hsl2hsv($hsl)

+    {

+        return $this->rgb2hsv($this->hsl2rgb($hsl));

+    }

+

+    /**

+     *

+     * Updates HSV values.

+     *

+     * @param array $hsv HSV values: 0 => H, 1 => S, 2 => V

+     *

+     * @param array $values Values to update: 0 => value to add to H (0 to 360),

+     * 1 and 2 => values to multiply S and V (0 to 100). Example:

+     *

+     * {{{code:php

+     *     // Update saturation to 80% in the provided HSV.

+     *     $hsv = array(120, 0.75, 0.75);

+     *     $new_hsv = $color->updateHsv($hsv, array(null, 80, null));

+     * }}}

+     *

+     */

+    public function updateHsv($hsv, $values)

+    {

+        if (isset($values[0])) {

+            $hsv[0] = max(0, min(360, ($hsv[0] + $values[0])));

+        }

+

+        if (isset($values[1])) {

+            $hsv[1] = max(0, min(1, ($hsv[1] * ($values[1] / 100))));

+        }

+

+        if (isset($values[2])) {

+            $hsv[2] = max(0, min(1, ($hsv[2] * ($values[2] / 100))));

+        }

+

+        return $hsv;

+    }

+

+    /**

+     *

+     * Updates HSL values.

+     *

+     * @param array $hsl HSL values: 0 => H, 1 => S, 2 => L

+     *

+     * @param array $values Values to update: 0 => value to add to H (0 to 360),

+     * 1 and 2 => values to multiply S and V (0 to 100). Example:

+     *

+     * {{{code:php

+     *     // Update saturation to 80% in the provided HSL.

+     *     $hsl = array(120, 0.75, 0.75);

+     *     $new_hsl = $color->updateHsl($hsl, array(null, 80, null));

+     * }}}

+     *

+     */

+    public function updateHsl($hsl, $values)

+    {

+        if (isset($values[0])) {

+            $hsl[0] = max(0, min(360, ($hsl[0] + $values[0])));

+        }

+

+        if (isset($values[1])) {

+            $hsl[1] = max(0, min(1, ($hsl[1] * ($values[1] / 100))));

+        }

+

+        if (isset($values[2])) {

+            $hsl[2] = max(0, min(1, ($hsl[2] * ($values[2] / 100))));

+        }

+

+        return $hsl;

+    }

+}

--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -207,5 +207,6 @@
    echo '<div id="ft"><p>'."Processing time: ". sprintf("%.4f", ($end-$start))." seconds".'</p></div>'; 

    echo '</div> </body> </html>';

 } 

+include ("graphs.inc.php");

 ?>

 

--- /dev/null
+++ b/lib/flot/excanvas.js
@@ -1,1 +1,1428 @@
-
+// Copyright 2006 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+// Known Issues:
+//
+// * Patterns only support repeat.
+// * Radial gradient are not implemented. The VML version of these look very
+//   different from the canvas one.
+// * Clipping paths are not implemented.
+// * Coordsize. The width and height attribute have higher priority than the
+//   width and height style values which isn't correct.
+// * Painting mode isn't implemented.
+// * Canvas width/height should is using content-box by default. IE in
+//   Quirks mode will draw the canvas using border-box. Either change your
+//   doctype to HTML5
+//   (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype)
+//   or use Box Sizing Behavior from WebFX
+//   (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
+// * Non uniform scaling does not correctly scale strokes.
+// * Filling very large shapes (above 5000 points) is buggy.
+// * Optimize. There is always room for speed improvements.
+
+// Only add this code if we do not already have a canvas implementation
+if (!document.createElement('canvas').getContext) {
+
+(function() {
+
+  // alias some functions to make (compiled) code shorter
+  var m = Math;
+  var mr = m.round;
+  var ms = m.sin;
+  var mc = m.cos;
+  var abs = m.abs;
+  var sqrt = m.sqrt;
+
+  // this is used for sub pixel precision
+  var Z = 10;
+  var Z2 = Z / 2;
+
+  /**
+   * This funtion is assigned to the <canvas> elements as element.getContext().
+   * @this {HTMLElement}
+   * @return {CanvasRenderingContext2D_}
+   */
+  function getContext() {
+    return this.context_ ||
+        (this.context_ = new CanvasRenderingContext2D_(this));
+  }
+
+  var slice = Array.prototype.slice;
+
+  /**
+   * Binds a function to an object. The returned function will always use the
+   * passed in {@code obj} as {@code this}.
+   *
+   * Example:
+   *
+   *   g = bind(f, obj, a, b)
+   *   g(c, d) // will do f.call(obj, a, b, c, d)
+   *
+   * @param {Function} f The function to bind the object to
+   * @param {Object} obj The object that should act as this when the function
+   *     is called
+   * @param {*} var_args Rest arguments that will be used as the initial
+   *     arguments when the function is called
+   * @return {Function} A new function that has bound this
+   */
+  function bind(f, obj, var_args) {
+    var a = slice.call(arguments, 2);
+    return function() {
+      return f.apply(obj, a.concat(slice.call(arguments)));
+    };
+  }
+
+  function encodeHtmlAttribute(s) {
+    return String(s).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+  }
+
+  function addNamespacesAndStylesheet(doc) {
+    // create xmlns
+    if (!doc.namespaces['g_vml_']) {
+      doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml',
+                         '#default#VML');
+
+    }
+    if (!doc.namespaces['g_o_']) {
+      doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office',
+                         '#default#VML');
+    }
+
+    // Setup default CSS.  Only add one style sheet per document
+    if (!doc.styleSheets['ex_canvas_']) {
+      var ss = doc.createStyleSheet();
+      ss.owningElement.id = 'ex_canvas_';
+      ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
+          // default size is 300x150 in Gecko and Opera
+          'text-align:left;width:300px;height:150px}';
+    }
+  }
+
+  // Add namespaces and stylesheet at startup.
+  addNamespacesAndStylesheet(document);
+
+  var G_vmlCanvasManager_ = {
+    init: function(opt_doc) {
+      if (/MSIE/.test(navigator.userAgent) && !window.opera) {
+        var doc = opt_doc || document;
+        // Create a dummy element so that IE will allow canvas elements to be
+        // recognized.
+        doc.createElement('canvas');
+        doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
+      }
+    },
+
+    init_: function(doc) {
+      // find all canvas elements
+      var els = doc.getElementsByTagName('canvas');
+      for (var i = 0; i < els.length; i++) {
+        this.initElement(els[i]);
+      }
+    },
+
+    /**
+     * Public initializes a canvas element so that it can be used as canvas
+     * element from now on. This is called automatically before the page is
+     * loaded but if you are creating elements using createElement you need to
+     * make sure this is called on the element.
+     * @param {HTMLElement} el The canvas element to initialize.
+     * @return {HTMLElement} the element that was created.
+     */
+    initElement: function(el) {
+      if (!el.getContext) {
+        el.getContext = getContext;
+
+        // Add namespaces and stylesheet to document of the element.
+        addNamespacesAndStylesheet(el.ownerDocument);
+
+        // Remove fallback content. There is no way to hide text nodes so we
+        // just remove all childNodes. We could hide all elements and remove
+        // text nodes but who really cares about the fallback content.
+        el.innerHTML = '';
+
+        // do not use inline function because that will leak memory
+        el.attachEvent('onpropertychange', onPropertyChange);
+        el.attachEvent('onresize', onResize);
+
+        var attrs = el.attributes;
+        if (attrs.width && attrs.width.specified) {
+          // TODO: use runtimeStyle and coordsize
+          // el.getContext().setWidth_(attrs.width.nodeValue);
+          el.style.width = attrs.width.nodeValue + 'px';
+        } else {
+          el.width = el.clientWidth;
+        }
+        if (attrs.height && attrs.height.specified) {
+          // TODO: use runtimeStyle and coordsize
+          // el.getContext().setHeight_(attrs.height.nodeValue);
+          el.style.height = attrs.height.nodeValue + 'px';
+        } else {
+          el.height = el.clientHeight;
+        }
+        //el.getContext().setCoordsize_()
+      }
+      return el;
+    }
+  };
+
+  function onPropertyChange(e) {
+    var el = e.srcElement;
+
+    switch (e.propertyName) {
+      case 'width':
+        el.getContext().clearRect();
+        el.style.width = el.attributes.width.nodeValue + 'px';
+        // In IE8 this does not trigger onresize.
+        el.firstChild.style.width =  el.clientWidth + 'px';
+        break;
+      case 'height':
+        el.getContext().clearRect();
+        el.style.height = el.attributes.height.nodeValue + 'px';
+        el.firstChild.style.height = el.clientHeight + 'px';
+        break;
+    }
+  }
+
+  function onResize(e) {
+    var el = e.srcElement;
+    if (el.firstChild) {
+      el.firstChild.style.width =  el.clientWidth + 'px';
+      el.firstChild.style.height = el.clientHeight + 'px';
+    }
+  }
+
+  G_vmlCanvasManager_.init();
+
+  // precompute "00" to "FF"
+  var decToHex = [];
+  for (var i = 0; i < 16; i++) {
+    for (var j = 0; j < 16; j++) {
+      decToHex[i * 16 + j] = i.toString(16) + j.toString(16);
+    }
+  }
+
+  function createMatrixIdentity() {
+    return [
+      [1, 0, 0],
+      [0, 1, 0],
+      [0, 0, 1]
+    ];
+  }
+
+  function matrixMultiply(m1, m2) {
+    var result = createMatrixIdentity();
+
+    for (var x = 0; x < 3; x++) {
+      for (var y = 0; y < 3; y++) {
+        var sum = 0;
+
+        for (var z = 0; z < 3; z++) {
+          sum += m1[x][z] * m2[z][y];
+        }
+
+        result[x][y] = sum;
+      }
+    }
+    return result;
+  }
+
+  function copyState(o1, o2) {
+    o2.fillStyle     = o1.fillStyle;
+    o2.lineCap       = o1.lineCap;
+    o2.lineJoin      = o1.lineJoin;
+    o2.lineWidth     = o1.lineWidth;
+    o2.miterLimit    = o1.miterLimit;
+    o2.shadowBlur    = o1.shadowBlur;
+    o2.shadowColor   = o1.shadowColor;
+    o2.shadowOffsetX = o1.shadowOffsetX;
+    o2.shadowOffsetY = o1.shadowOffsetY;
+    o2.strokeStyle   = o1.strokeStyle;
+    o2.globalAlpha   = o1.globalAlpha;
+    o2.font          = o1.font;
+    o2.textAlign     = o1.textAlign;
+    o2.textBaseline  = o1.textBaseline;
+    o2.arcScaleX_    = o1.arcScaleX_;
+    o2.arcScaleY_    = o1.arcScaleY_;
+    o2.lineScale_    = o1.lineScale_;
+  }
+
+  var colorData = {
+    aliceblue: '#F0F8FF',
+    antiquewhite: '#FAEBD7',
+    aquamarine: '#7FFFD4',
+    azure: '#F0FFFF',
+    beige: '#F5F5DC',
+    bisque: '#FFE4C4',
+    black: '#000000',
+    blanchedalmond: '#FFEBCD',
+    blueviolet: '#8A2BE2',
+    brown: '#A52A2A',
+    burlywood: '#DEB887',
+    cadetblue: '#5F9EA0',
+    chartreuse: '#7FFF00',
+    chocolate: '#D2691E',
+    coral: '#FF7F50',
+    cornflowerblue: '#6495ED',
+    cornsilk: '#FFF8DC',
+    crimson: '#DC143C',
+    cyan: '#00FFFF',
+    darkblue: '#00008B',
+    darkcyan: '#008B8B',
+    darkgoldenrod: '#B8860B',
+    darkgray: '#A9A9A9',
+    darkgreen: '#006400',
+    darkgrey: '#A9A9A9',
+    darkkhaki: '#BDB76B',
+    darkmagenta: '#8B008B',
+    darkolivegreen: '#556B2F',
+    darkorange: '#FF8C00',
+    darkorchid: '#9932CC',
+    darkred: '#8B0000',
+    darksalmon: '#E9967A',
+    darkseagreen: '#8FBC8F',
+    darkslateblue: '#483D8B',
+    darkslategray: '#2F4F4F',
+    darkslategrey: '#2F4F4F',
+    darkturquoise: '#00CED1',
+    darkviolet: '#9400D3',
+    deeppink: '#FF1493',
+    deepskyblue: '#00BFFF',
+    dimgray: '#696969',
+    dimgrey: '#696969',
+    dodgerblue: '#1E90FF',
+    firebrick: '#B22222',
+    floralwhite: '#FFFAF0',
+    forestgreen: '#228B22',
+    gainsboro: '#DCDCDC',
+    ghostwhite: '#F8F8FF',
+    gold: '#FFD700',
+    goldenrod: '#DAA520',
+    grey: '#808080',
+    greenyellow: '#ADFF2F',
+    honeydew: '#F0FFF0',
+    hotpink: '#FF69B4',
+    indianred: '#CD5C5C',
+    indigo: '#4B0082',
+    ivory: '#FFFFF0',
+    khaki: '#F0E68C',
+    lavender: '#E6E6FA',
+    lavenderblush: '#FFF0F5',
+    lawngreen: '#7CFC00',
+    lemonchiffon: '#FFFACD',
+    lightblue: '#ADD8E6',
+    lightcoral: '#F08080',
+    lightcyan: '#E0FFFF',
+    lightgoldenrodyellow: '#FAFAD2',
+    lightgreen: '#90EE90',
+    lightgrey: '#D3D3D3',
+    lightpink: '#FFB6C1',
+    lightsalmon: '#FFA07A',
+    lightseagreen: '#20B2AA',
+    lightskyblue: '#87CEFA',
+    lightslategray: '#778899',
+    lightslategrey: '#778899',
+    lightsteelblue: '#B0C4DE',
+    lightyellow: '#FFFFE0',
+    limegreen: '#32CD32',
+    linen: '#FAF0E6',
+    magenta: '#FF00FF',
+    mediumaquamarine: '#66CDAA',
+    mediumblue: '#0000CD',
+    mediumorchid: '#BA55D3',
+    mediumpurple: '#9370DB',
+    mediumseagreen: '#3CB371',
+    mediumslateblue: '#7B68EE',
+    mediumspringgreen: '#00FA9A',
+    mediumturquoise: '#48D1CC',
+    mediumvioletred: '#C71585',
+    midnightblue: '#191970',
+    mintcream: '#F5FFFA',
+    mistyrose: '#FFE4E1',
+    moccasin: '#FFE4B5',
+    navajowhite: '#FFDEAD',
+    oldlace: '#FDF5E6',
+    olivedrab: '#6B8E23',
+    orange: '#FFA500',
+    orangered: '#FF4500',
+    orchid: '#DA70D6',
+    palegoldenrod: '#EEE8AA',
+    palegreen: '#98FB98',
+    paleturquoise: '#AFEEEE',
+    palevioletred: '#DB7093',
+    papayawhip: '#FFEFD5',
+    peachpuff: '#FFDAB9',
+    peru: '#CD853F',
+    pink: '#FFC0CB',
+    plum: '#DDA0DD',
+    powderblue: '#B0E0E6',
+    rosybrown: '#BC8F8F',
+    royalblue: '#4169E1',
+    saddlebrown: '#8B4513',
+    salmon: '#FA8072',
+    sandybrown: '#F4A460',
+    seagreen: '#2E8B57',
+    seashell: '#FFF5EE',
+    sienna: '#A0522D',
+    skyblue: '#87CEEB',
+    slateblue: '#6A5ACD',
+    slategray: '#708090',
+    slategrey: '#708090',
+    snow: '#FFFAFA',
+    springgreen: '#00FF7F',
+    steelblue: '#4682B4',
+    tan: '#D2B48C',
+    thistle: '#D8BFD8',
+    tomato: '#FF6347',
+    turquoise: '#40E0D0',
+    violet: '#EE82EE',
+    wheat: '#F5DEB3',
+    whitesmoke: '#F5F5F5',
+    yellowgreen: '#9ACD32'
+  };
+
+
+  function getRgbHslContent(styleString) {
+    var start = styleString.indexOf('(', 3);
+    var end = styleString.indexOf(')', start + 1);
+    var parts = styleString.substring(start + 1, end).split(',');
+    // add alpha if needed
+    if (parts.length == 4 && styleString.substr(3, 1) == 'a') {
+      alpha = Number(parts[3]);
+    } else {
+      parts[3] = 1;
+    }
+    return parts;
+  }
+
+  function percent(s) {
+    return parseFloat(s) / 100;
+  }
+
+  function clamp(v, min, max) {
+    return Math.min(max, Math.max(min, v));
+  }
+
+  function hslToRgb(parts){
+    var r, g, b;
+    h = parseFloat(parts[0]) / 360 % 360;
+    if (h < 0)
+      h++;
+    s = clamp(percent(parts[1]), 0, 1);
+    l = clamp(percent(parts[2]), 0, 1);
+    if (s == 0) {
+      r = g = b = l; // achromatic
+    } else {
+      var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+      var p = 2 * l - q;
+      r = hueToRgb(p, q, h + 1 / 3);
+      g = hueToRgb(p, q, h);
+      b = hueToRgb(p, q, h - 1 / 3);
+    }
+
+    return '#' + decToHex[Math.floor(r * 255)] +
+        decToHex[Math.floor(g * 255)] +
+        decToHex[Math.floor(b * 255)];
+  }
+
+  function hueToRgb(m1, m2, h) {
+    if (h < 0)
+      h++;
+    if (h > 1)
+      h--;
+
+    if (6 * h < 1)
+      return m1 + (m2 - m1) * 6 * h;
+    else if (2 * h < 1)
+      return m2;
+    else if (3 * h < 2)
+      return m1 + (m2 - m1) * (2 / 3 - h) * 6;
+    else
+      return m1;
+  }
+
+  function processStyle(styleString) {
+    var str, alpha = 1;
+
+    styleString = String(styleString);
+    if (styleString.charAt(0) == '#') {
+      str = styleString;
+    } else if (/^rgb/.test(styleString)) {
+      var parts = getRgbHslContent(styleString);
+      var str = '#', n;
+      for (var i = 0; i < 3; i++) {
+        if (parts[i].indexOf('%') != -1) {
+          n = Math.floor(percent(parts[i]) * 255);
+        } else {
+          n = Number(parts[i]);
+        }
+        str += decToHex[clamp(n, 0, 255)];
+      }
+      alpha = parts[3];
+    } else if (/^hsl/.test(styleString)) {
+      var parts = getRgbHslContent(styleString);
+      str = hslToRgb(parts);
+      alpha = parts[3];
+    } else {
+      str = colorData[styleString] || styleString;
+    }
+    return {color: str, alpha: alpha};
+  }
+
+  var DEFAULT_STYLE = {
+    style: 'normal',
+    variant: 'normal',
+    weight: 'normal',
+    size: 10,
+    family: 'sans-serif'
+  };
+
+  // Internal text style cache
+  var fontStyleCache = {};
+
+  function processFontStyle(styleString) {
+    if (fontStyleCache[styleString]) {
+      return fontStyleCache[styleString];
+    }
+
+    var el = document.createElement('div');
+    var style = el.style;
+    try {
+      style.font = styleString;
+    } catch (ex) {
+      // Ignore failures to set to invalid font.
+    }
+
+    return fontStyleCache[styleString] = {
+      style: style.fontStyle || DEFAULT_STYLE.style,
+      variant: style.fontVariant || DEFAULT_STYLE.variant,
+      weight: style.fontWeight || DEFAULT_STYLE.weight,
+      size: style.fontSize || DEFAULT_STYLE.size,
+      family: style.fontFamily || DEFAULT_STYLE.family
+    };
+  }
+
+  function getComputedStyle(style, element) {
+    var computedStyle = {};
+
+    for (var p in style) {
+      computedStyle[p] = style[p];
+    }
+
+    // Compute the size
+    var canvasFontSize = parseFloat(element.currentStyle.fontSize),
+        fontSize = parseFloat(style.size);
+
+    if (typeof style.size == 'number') {
+      computedStyle.size = style.size;
+    } else if (style.size.indexOf('px') != -1) {
+      computedStyle.size = fontSize;
+    } else if (style.size.indexOf('em') != -1) {
+      computedStyle.size = canvasFontSize * fontSize;
+    } else if(style.size.indexOf('%') != -1) {
+      computedStyle.size = (canvasFontSize / 100) * fontSize;
+    } else if (style.size.indexOf('pt') != -1) {
+      computedStyle.size = fontSize / .75;
+    } else {
+      computedStyle.size = canvasFontSize;
+    }
+
+    // Different scaling between normal text and VML text. This was found using
+    // trial and error to get the same size as non VML text.
+    computedStyle.size *= 0.981;
+
+    return computedStyle;
+  }
+
+  function buildStyle(style) {
+    return style.style + ' ' + style.variant + ' ' + style.weight + ' ' +
+        style.size + 'px ' + style.family;
+  }
+
+  function processLineCap(lineCap) {
+    switch (lineCap) {
+      case 'butt':
+        return 'flat';
+      case 'round':
+        return 'round';
+      case 'square':
+      default:
+        return 'square';
+    }
+  }
+
+  /**
+   * This class implements CanvasRenderingContext2D interface as described by
+   * the WHATWG.
+   * @param {HTMLElement} surfaceElement The element that the 2D context should
+   * be associated with
+   */
+  function CanvasRenderingContext2D_(surfaceElement) {
+    this.m_ = createMatrixIdentity();
+
+    this.mStack_ = [];
+    this.aStack_ = [];
+    this.currentPath_ = [];
+
+    // Canvas context properties
+    this.strokeStyle = '#000';
+    this.fillStyle = '#000';
+
+    this.lineWidth = 1;
+    this.lineJoin = 'miter';
+    this.lineCap = 'butt';
+    this.miterLimit = Z * 1;
+    this.globalAlpha = 1;
+    this.font = '10px sans-serif';
+    this.textAlign = 'left';
+    this.textBaseline = 'alphabetic';
+    this.canvas = surfaceElement;
+
+    var el = surfaceElement.ownerDocument.createElement('div');
+    el.style.width =  surfaceElement.clientWidth + 'px';
+    el.style.height = surfaceElement.clientHeight + 'px';
+    el.style.overflow = 'hidden';
+    el.style.position = 'absolute';
+    surfaceElement.appendChild(el);
+
+    this.element_ = el;
+    this.arcScaleX_ = 1;
+    this.arcScaleY_ = 1;
+    this.lineScale_ = 1;
+  }
+
+  var contextPrototype = CanvasRenderingContext2D_.prototype;
+  contextPrototype.clearRect = function() {
+    if (this.textMeasureEl_) {
+      this.textMeasureEl_.removeNode(true);
+      this.textMeasureEl_ = null;
+    }
+    this.element_.innerHTML = '';
+  };
+
+  contextPrototype.beginPath = function() {
+    // TODO: Branch current matrix so that save/restore has no effect
+    //       as per safari docs.
+    this.currentPath_ = [];
+  };
+
+  contextPrototype.moveTo = function(aX, aY) {
+    var p = this.getCoords_(aX, aY);
+    this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y});
+    this.currentX_ = p.x;
+    this.currentY_ = p.y;
+  };
+
+  contextPrototype.lineTo = function(aX, aY) {
+    var p = this.getCoords_(aX, aY);
+    this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y});
+
+    this.currentX_ = p.x;
+    this.currentY_ = p.y;
+  };
+
+  contextPrototype.bezierCurveTo = function(aCP1x, aCP1y,
+                                            aCP2x, aCP2y,
+                                            aX, aY) {
+    var p = this.getCoords_(aX, aY);
+    var cp1 = this.getCoords_(aCP1x, aCP1y);
+    var cp2 = this.getCoords_(aCP2x, aCP2y);
+    bezierCurveTo(this, cp1, cp2, p);
+  };
+
+  // Helper function that takes the already fixed cordinates.
+  function bezierCurveTo(self, cp1, cp2, p) {
+    self.currentPath_.push({
+      type: 'bezierCurveTo',
+      cp1x: cp1.x,
+      cp1y: cp1.y,
+      cp2x: cp2.x,
+      cp2y: cp2.y,
+      x: p.x,
+      y: p.y
+    });
+    self.currentX_ = p.x;
+    self.currentY_ = p.y;
+  }
+
+  contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) {
+    // the following is lifted almost directly from
+    // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
+
+    var cp = this.getCoords_(aCPx, aCPy);
+    var p = this.getCoords_(aX, aY);
+
+    var cp1 = {
+      x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_),
+      y: this.currentY_ + 2.0 / 3.0 * (cp.y - this.currentY_)
+    };
+    var cp2 = {
+      x: cp1.x + (p.x - this.currentX_) / 3.0,
+      y: cp1.y + (p.y - this.currentY_) / 3.0
+    };
+
+    bezierCurveTo(this, cp1, cp2, p);
+  };
+
+  contextPrototype.arc = function(aX, aY, aRadius,
+                                  aStartAngle, aEndAngle, aClockwise) {
+    aRadius *= Z;
+    var arcType = aClockwise ? 'at' : 'wa';
+
+    var xStart = aX + mc(aStartAngle) * aRadius - Z2;
+    var yStart = aY + ms(aStartAngle) * aRadius - Z2;
+
+    var xEnd = aX + mc(aEndAngle) * aRadius - Z2;
+    var yEnd = aY + ms(aEndAngle) * aRadius - Z2;
+
+    // IE won't render arches drawn counter clockwise if xStart == xEnd.
+    if (xStart == xEnd && !aClockwise) {
+      xStart += 0.125; // Offset xStart by 1/80 of a pixel. Use something
+                       // that can be represented in binary
+    }
+
+    var p = this.getCoords_(aX, aY);
+    var pStart = this.getCoords_(xStart, yStart);
+    var pEnd = this.getCoords_(xEnd, yEnd);
+
+    this.currentPath_.push({type: arcType,
+                           x: p.x,
+                           y: p.y,
+                           radius: aRadius,
+                           xStart: pStart.x,
+                           yStart: pStart.y,
+                           xEnd: pEnd.x,
+                           yEnd: pEnd.y});
+
+  };
+
+  contextPrototype.rect = function(aX, aY, aWidth, aHeight) {
+    this.moveTo(aX, aY);
+    this.lineTo(aX + aWidth, aY);
+    this.lineTo(aX + aWidth, aY + aHeight);
+    this.lineTo(aX, aY + aHeight);
+    this.closePath();
+  };
+
+  contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) {
+    var oldPath = this.currentPath_;
+    this.beginPath();
+
+    this.moveTo(aX, aY);
+    this.lineTo(aX + aWidth, aY);
+    this.lineTo(aX + aWidth, aY + aHeight);
+    this.lineTo(aX, aY + aHeight);
+    this.closePath();
+    this.stroke();
+
+    this.currentPath_ = oldPath;
+  };
+
+  contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) {
+    var oldPath = this.currentPath_;
+    this.beginPath();
+
+    this.moveTo(aX, aY);
+    this.lineTo(aX + aWidth, aY);
+    this.lineTo(aX + aWidth, aY + aHeight);
+    this.lineTo(aX, aY + aHeight);
+    this.closePath();
+    this.fill();
+
+    this.currentPath_ = oldPath;
+  };
+
+  contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) {
+    var gradient = new CanvasGradient_('gradient');
+    gradient.x0_ = aX0;
+    gradient.y0_ = aY0;
+    gradient.x1_ = aX1;
+    gradient.y1_ = aY1;
+    return gradient;
+  };
+
+  contextPrototype.createRadialGradient = function(aX0, aY0, aR0,
+                                                   aX1, aY1, aR1) {
+    var gradient = new CanvasGradient_('gradientradial');
+    gradient.x0_ = aX0;
+    gradient.y0_ = aY0;
+    gradient.r0_ = aR0;
+    gradient.x1_ = aX1;
+    gradient.y1_ = aY1;
+    gradient.r1_ = aR1;
+    return gradient;
+  };
+
+  contextPrototype.drawImage = function(image, var_args) {
+    var dx, dy, dw, dh, sx, sy, sw, sh;
+
+    // to find the original width we overide the width and height
+    var oldRuntimeWidth = image.runtimeStyle.width;
+    var oldRuntimeHeight = image.runtimeStyle.height;
+    image.runtimeStyle.width = 'auto';
+    image.runtimeStyle.height = 'auto';
+
+    // get the original size
+    var w = image.width;
+    var h = image.height;
+
+    // and remove overides
+    image.runtimeStyle.width = oldRuntimeWidth;
+    image.runtimeStyle.height = oldRuntimeHeight;
+
+    if (arguments.length == 3) {
+      dx = arguments[1];
+      dy = arguments[2];
+      sx = sy = 0;
+      sw = dw = w;
+      sh = dh = h;
+    } else if (arguments.length == 5) {
+      dx = arguments[1];
+      dy = arguments[2];
+      dw = arguments[3];
+      dh = arguments[4];
+      sx = sy = 0;
+      sw = w;
+      sh = h;
+    } else if (arguments.length == 9) {
+      sx = arguments[1];
+      sy = arguments[2];
+      sw = arguments[3];
+      sh = arguments[4];
+      dx = arguments[5];
+      dy = arguments[6];
+      dw = arguments[7];
+      dh = arguments[8];
+    } else {
+      throw Error('Invalid number of arguments');
+    }
+
+    var d = this.getCoords_(dx, dy);
+
+    var w2 = sw / 2;
+    var h2 = sh / 2;
+
+    var vmlStr = [];
+
+    var W = 10;
+    var H = 10;
+
+    // For some reason that I've now forgotten, using divs didn't work
+    vmlStr.push(' <g_vml_:group',
+                ' coordsize="', Z * W, ',', Z * H, '"',
+                ' coordorigin="0,0"' ,
+                ' style="width:', W, 'px;height:', H, 'px;position:absolute;');
+
+    // If filters are necessary (rotation exists), create them
+    // filters are bog-slow, so only create them if abbsolutely necessary
+    // The following check doesn't account for skews (which don't exist
+    // in the canvas spec (yet) anyway.
+
+    if (this.m_[0][0] != 1 || this.m_[0][1] ||
+        this.m_[1][1] != 1 || this.m_[1][0]) {
+      var filter = [];
+
+      // Note the 12/21 reversal
+      filter.push('M11=', this.m_[0][0], ',',
+                  'M12=', this.m_[1][0], ',',
+                  'M21=', this.m_[0][1], ',',
+                  'M22=', this.m_[1][1], ',',
+                  'Dx=', mr(d.x / Z), ',',
+                  'Dy=', mr(d.y / Z), '');
+
+      // Bounding box calculation (need to minimize displayed area so that
+      // filters don't waste time on unused pixels.
+      var max = d;
+      var c2 = this.getCoords_(dx + dw, dy);
+      var c3 = this.getCoords_(dx, dy + dh);
+      var c4 = this.getCoords_(dx + dw, dy + dh);
+
+      max.x = m.max(max.x, c2.x, c3.x, c4.x);
+      max.y = m.max(max.y, c2.y, c3.y, c4.y);
+
+      vmlStr.push('padding:0 ', mr(max.x / Z), 'px ', mr(max.y / Z),
+                  'px 0;filter:progid:DXImageTransform.Microsoft.Matrix(',
+                  filter.join(''), ", sizingmethod='clip');");
+
+    } else {
+      vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;');
+    }
+
+    vmlStr.push(' ">' ,
+                '<g_vml_:image src="', image.src, '"',
+                ' style="width:', Z * dw, 'px;',
+                ' height:', Z * dh, 'px"',
+                ' cropleft="', sx / w, '"',
+                ' croptop="', sy / h, '"',
+                ' cropright="', (w - sx - sw) / w, '"',
+                ' cropbottom="', (h - sy - sh) / h, '"',
+                ' />',
+                '</g_vml_:group>');
+
+    this.element_.insertAdjacentHTML('BeforeEnd', vmlStr.join(''));
+  };
+
+  contextPrototype.stroke = function(aFill) {
+    var W = 10;
+    var H = 10;
+    // Divide the shape into chunks if it's too long because IE has a limit
+    // somewhere for how long a VML shape can be. This simple division does
+    // not work with fills, only strokes, unfortunately.
+    var chunkSize = 5000;
+
+    var min = {x: null, y: null};
+    var max = {x: null, y: null};
+
+    for (var j = 0; j < this.currentPath_.length; j += chunkSize) {
+      var lineStr = [];
+      var lineOpen = false;
+
+      lineStr.push('<g_vml_:shape',
+                   ' filled="', !!aFill, '"',
+                   ' style="position:absolute;width:', W, 'px;height:', H, 'px;"',
+                   ' coordorigin="0,0"',
+                   ' coordsize="', Z * W, ',', Z * H, '"',
+                   ' stroked="', !aFill, '"',
+                   ' path="');
+
+      var newSeq = false;
+
+      for (var i = j; i < Math.min(j + chunkSize, this.currentPath_.length); i++) {
+        if (i % chunkSize == 0 && i > 0) { // move into position for next chunk
+          lineStr.push(' m ', mr(this.currentPath_[i-1].x), ',', mr(this.currentPath_[i-1].y));
+        }
+
+        var p = this.currentPath_[i];
+        var c;
+
+        switch (p.type) {
+          case 'moveTo':
+            c = p;
+            lineStr.push(' m ', mr(p.x), ',', mr(p.y));
+            break;
+          case 'lineTo':
+            lineStr.push(' l ', mr(p.x), ',', mr(p.y));
+            break;
+          case 'close':
+            lineStr.push(' x ');
+            p = null;
+            break;
+          case 'bezierCurveTo':
+            lineStr.push(' c ',
+                         mr(p.cp1x), ',', mr(p.cp1y), ',',
+                         mr(p.cp2x), ',', mr(p.cp2y), ',',
+                         mr(p.x), ',', mr(p.y));
+            break;
+          case 'at':
+          case 'wa':
+            lineStr.push(' ', p.type, ' ',
+                         mr(p.x - this.arcScaleX_ * p.radius), ',',
+                         mr(p.y - this.arcScaleY_ * p.radius), ' ',
+                         mr(p.x + this.arcScaleX_ * p.radius), ',',
+                         mr(p.y + this.arcScaleY_ * p.radius), ' ',
+                         mr(p.xStart), ',', mr(p.yStart), ' ',
+                         mr(p.xEnd), ',', mr(p.yEnd));
+            break;
+        }
+  
+  
+        // TODO: Following is broken for curves due to
+        //       move to proper paths.
+  
+        // Figure out dimensions so we can do gradient fills
+        // properly
+        if (p) {
+          if (min.x == null || p.x < min.x) {
+            min.x = p.x;
+          }
+          if (max.x == null || p.x > max.x) {
+            max.x = p.x;
+          }
+          if (min.y == null || p.y < min.y) {
+            min.y = p.y;
+          }
+          if (max.y == null || p.y > max.y) {
+            max.y = p.y;
+          }
+        }
+      }
+      lineStr.push(' ">');
+  
+      if (!aFill) {
+        appendStroke(this, lineStr);
+      } else {
+        appendFill(this, lineStr, min, max);
+      }
+  
+      lineStr.push('</g_vml_:shape>');
+  
+      this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
+    }
+  };
+
+  function appendStroke(ctx, lineStr) {
+    var a = processStyle(ctx.strokeStyle);
+    var color = a.color;
+    var opacity = a.alpha * ctx.globalAlpha;
+    var lineWidth = ctx.lineScale_ * ctx.lineWidth;
+
+    // VML cannot correctly render a line if the width is less than 1px.
+    // In that case, we dilute the color to make the line look thinner.
+    if (lineWidth < 1) {
+      opacity *= lineWidth;
+    }
+
+    lineStr.push(
+      '<g_vml_:stroke',
+      ' opacity="', opacity, '"',
+      ' joinstyle="', ctx.lineJoin, '"',
+      ' miterlimit="', ctx.miterLimit, '"',
+      ' endcap="', processLineCap(ctx.lineCap), '"',
+      ' weight="', lineWidth, 'px"',
+      ' color="', color, '" />'
+    );
+  }
+
+  function appendFill(ctx, lineStr, min, max) {
+    var fillStyle = ctx.fillStyle;
+    var arcScaleX = ctx.arcScaleX_;
+    var arcScaleY = ctx.arcScaleY_;
+    var width = max.x - min.x;
+    var height = max.y - min.y;
+    if (fillStyle instanceof CanvasGradient_) {
+      // TODO: Gradients transformed with the transformation matrix.
+      var angle = 0;
+      var focus = {x: 0, y: 0};
+
+      // additional offset
+      var shift = 0;
+      // scale factor for offset
+      var expansion = 1;
+
+      if (fillStyle.type_ == 'gradient') {
+        var x0 = fillStyle.x0_ / arcScaleX;
+        var y0 = fillStyle.y0_ / arcScaleY;
+        var x1 = fillStyle.x1_ / arcScaleX;
+        var y1 = fillStyle.y1_ / arcScaleY;
+        var p0 = ctx.getCoords_(x0, y0);
+        var p1 = ctx.getCoords_(x1, y1);
+        var dx = p1.x - p0.x;
+        var dy = p1.y - p0.y;
+        angle = Math.atan2(dx, dy) * 180 / Math.PI;
+
+        // The angle should be a non-negative number.
+        if (angle < 0) {
+          angle += 360;
+        }
+
+        // Very small angles produce an unexpected result because they are
+        // converted to a scientific notation string.
+        if (angle < 1e-6) {
+          angle = 0;
+        }
+      } else {
+        var p0 = ctx.getCoords_(fillStyle.x0_, fillStyle.y0_);
+        focus = {
+          x: (p0.x - min.x) / width,
+          y: (p0.y - min.y) / height
+        };
+
+        width  /= arcScaleX * Z;
+        height /= arcScaleY * Z;
+        var dimension = m.max(width, height);
+        shift = 2 * fillStyle.r0_ / dimension;
+        expansion = 2 * fillStyle.r1_ / dimension - shift;
+      }
+
+      // We need to sort the color stops in ascending order by offset,
+      // otherwise IE won't interpret it correctly.
+      var stops = fillStyle.colors_;
+      stops.sort(function(cs1, cs2) {
+        return cs1.offset - cs2.offset;
+      });
+
+      var length = stops.length;
+      var color1 = stops[0].color;
+      var color2 = stops[length - 1].color;
+      var opacity1 = stops[0].alpha * ctx.globalAlpha;
+      var opacity2 = stops[length - 1].alpha * ctx.globalAlpha;
+
+      var colors = [];
+      for (var i = 0; i < length; i++) {
+        var stop = stops[i];
+        colors.push(stop.offset * expansion + shift + ' ' + stop.color);
+      }
+
+      // When colors attribute is used, the meanings of opacity and o:opacity2
+      // are reversed.
+      lineStr.push('<g_vml_:fill type="', fillStyle.type_, '"',
+                   ' method="none" focus="100%"',
+                   ' color="', color1, '"',
+                   ' color2="', color2, '"',
+                   ' colors="', colors.join(','), '"',
+                   ' opacity="', opacity2, '"',
+                   ' g_o_:opacity2="', opacity1, '"',
+                   ' angle="', angle, '"',
+                   ' focusposition="', focus.x, ',', focus.y, '" />');
+    } else if (fillStyle instanceof CanvasPattern_) {
+      if (width && height) {
+        var deltaLeft = -min.x;
+        var deltaTop = -min.y;
+        lineStr.push('<g_vml_:fill',
+                     ' position="',
+                     deltaLeft / width * arcScaleX * arcScaleX, ',',
+                     deltaTop / height * arcScaleY * arcScaleY, '"',
+                     ' type="tile"',
+                     // TODO: Figure out the correct size to fit the scale.
+                     //' size="', w, 'px ', h, 'px"',
+                     ' src="', fillStyle.src_, '" />');
+       }
+    } else {
+      var a = processStyle(ctx.fillStyle);
+      var color = a.color;
+      var opacity = a.alpha * ctx.globalAlpha;
+      lineStr.push('<g_vml_:fill color="', color, '" opacity="', opacity,
+                   '" />');
+    }
+  }
+
+  contextPrototype.fill = function() {
+    this.stroke(true);
+  };
+
+  contextPrototype.closePath = function() {
+    this.currentPath_.push({type: 'close'});
+  };
+
+  /**
+   * @private
+   */
+  contextPrototype.getCoords_ = function(aX, aY) {
+    var m = this.m_;
+    return {
+      x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
+      y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
+    };
+  };
+
+  contextPrototype.save = function() {
+    var o = {};
+    copyState(this, o);
+    this.aStack_.push(o);
+    this.mStack_.push(this.m_);
+    this.m_ = matrixMultiply(createMatrixIdentity(), this.m_);
+  };
+
+  contextPrototype.restore = function() {
+    if (this.aStack_.length) {
+      copyState(this.aStack_.pop(), this);
+      this.m_ = this.mStack_.pop();
+    }
+  };
+
+  function matrixIsFinite(m) {
+    return isFinite(m[0][0]) && isFinite(m[0][1]) &&
+        isFinite(m[1][0]) && isFinite(m[1][1]) &&
+        isFinite(m[2][0]) && isFinite(m[2][1]);
+  }
+
+  function setM(ctx, m, updateLineScale) {
+    if (!matrixIsFinite(m)) {
+      return;
+    }
+    ctx.m_ = m;
+
+    if (updateLineScale) {
+      // Get the line scale.
+      // Determinant of this.m_ means how much the area is enlarged by the
+      // transformation. So its square root can be used as a scale factor
+      // for width.
+      var det = m[0][0] * m[1][1] - m[0][1] * m[1][0];
+      ctx.lineScale_ = sqrt(abs(det));
+    }
+  }
+
+  contextPrototype.translate = function(aX, aY) {
+    var m1 = [
+      [1,  0,  0],
+      [0,  1,  0],
+      [aX, aY, 1]
+    ];
+
+    setM(this, matrixMultiply(m1, this.m_), false);
+  };
+
+  contextPrototype.rotate = function(aRot) {
+    var c = mc(aRot);
+    var s = ms(aRot);
+
+    var m1 = [
+      [c,  s, 0],
+      [-s, c, 0],
+      [0,  0, 1]
+    ];
+
+    setM(this, matrixMultiply(m1, this.m_), false);
+  };
+
+  contextPrototype.scale = function(aX, aY) {
+    this.arcScaleX_ *= aX;
+    this.arcScaleY_ *= aY;
+    var m1 = [
+      [aX, 0,  0],
+      [0,  aY, 0],
+      [0,  0,  1]
+    ];
+
+    setM(this, matrixMultiply(m1, this.m_), true);
+  };
+
+  contextPrototype.transform = function(m11, m12, m21, m22, dx, dy) {
+    var m1 = [
+      [m11, m12, 0],
+      [m21, m22, 0],
+      [dx,  dy,  1]
+    ];
+
+    setM(this, matrixMultiply(m1, this.m_), true);
+  };
+
+  contextPrototype.setTransform = function(m11, m12, m21, m22, dx, dy) {
+    var m = [
+      [m11, m12, 0],
+      [m21, m22, 0],
+      [dx,  dy,  1]
+    ];
+
+    setM(this, m, true);
+  };
+
+  /**
+   * The text drawing function.
+   * The maxWidth argument isn't taken in account, since no browser supports
+   * it yet.
+   */
+  contextPrototype.drawText_ = function(text, x, y, maxWidth, stroke) {
+    var m = this.m_,
+        delta = 1000,
+        left = 0,
+        right = delta,
+        offset = {x: 0, y: 0},
+        lineStr = [];
+
+    var fontStyle = getComputedStyle(processFontStyle(this.font),
+                                     this.element_);
+
+    var fontStyleString = buildStyle(fontStyle);
+
+    var elementStyle = this.element_.currentStyle;
+    var textAlign = this.textAlign.toLowerCase();
+    switch (textAlign) {
+      case 'left':
+      case 'center':
+      case 'right':
+        break;
+      case 'end':
+        textAlign = elementStyle.direction == 'ltr' ? 'right' : 'left';
+        break;
+      case 'start':
+        textAlign = elementStyle.direction == 'rtl' ? 'right' : 'left';
+        break;
+      default:
+        textAlign = 'left';
+    }
+
+    // 1.75 is an arbitrary number, as there is no info about the text baseline
+    switch (this.textBaseline) {
+      case 'hanging':
+      case 'top':
+        offset.y = fontStyle.size / 1.75;
+        break;
+      case 'middle':
+        break;
+      default:
+      case null:
+      case 'alphabetic':
+      case 'ideographic':
+      case 'bottom':
+        offset.y = -fontStyle.size / 2.25;
+        break;
+    }
+
+    switch(textAlign) {
+      case 'right':
+        left = delta;
+        right = 0.05;
+        break;
+      case 'center':
+        left = right = delta / 2;
+        break;
+    }
+
+    var d = this.getCoords_(x + offset.x, y + offset.y);
+
+    lineStr.push('<g_vml_:line from="', -left ,' 0" to="', right ,' 0.05" ',
+                 ' coordsize="100 100" coordorigin="0 0"',
+                 ' filled="', !stroke, '" stroked="', !!stroke,
+                 '" style="position:absolute;width:1px;height:1px;">');
+
+    if (stroke) {
+      appendStroke(this, lineStr);
+    } else {
+      // TODO: Fix the min and max params.
+      appendFill(this, lineStr, {x: -left, y: 0},
+                 {x: right, y: fontStyle.size});
+    }
+
+    var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' +
+                m[0][1].toFixed(3) + ',' + m[1][1].toFixed(3) + ',0,0';
+
+    var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z);
+
+    lineStr.push('<g_vml_:skew on="t" matrix="', skewM ,'" ',
+                 ' offset="', skewOffset, '" origin="', left ,' 0" />',
+                 '<g_vml_:path textpathok="true" />',
+                 '<g_vml_:textpath on="true" string="',
+                 encodeHtmlAttribute(text),
+                 '" style="v-text-align:', textAlign,
+                 ';font:', encodeHtmlAttribute(fontStyleString),
+                 '" /></g_vml_:line>');
+
+    this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
+  };
+
+  contextPrototype.fillText = function(text, x, y, maxWidth) {
+    this.drawText_(text, x, y, maxWidth, false);
+  };
+
+  contextPrototype.strokeText = function(text, x, y, maxWidth) {
+    this.drawText_(text, x, y, maxWidth, true);
+  };
+
+  contextPrototype.measureText = function(text) {
+    if (!this.textMeasureEl_) {
+      var s = '<span style="position:absolute;' +
+          'top:-20000px;left:0;padding:0;margin:0;border:none;' +
+          'white-space:pre;"></span>';
+      this.element_.insertAdjacentHTML('beforeEnd', s);
+      this.textMeasureEl_ = this.element_.lastChild;
+    }
+    var doc = this.element_.ownerDocument;
+    this.textMeasureEl_.innerHTML = '';
+    this.textMeasureEl_.style.font = this.font;
+    // Don't use innerHTML or innerText because they allow markup/whitespace.
+    this.textMeasureEl_.appendChild(doc.createTextNode(text));
+    return {width: this.textMeasureEl_.offsetWidth};
+  };
+
+  /******** STUBS ********/
+  contextPrototype.clip = function() {
+    // TODO: Implement
+  };
+
+  contextPrototype.arcTo = function() {
+    // TODO: Implement
+  };
+
+  contextPrototype.createPattern = function(image, repetition) {
+    return new CanvasPattern_(image, repetition);
+  };
+
+  // Gradient / Pattern Stubs
+  function CanvasGradient_(aType) {
+    this.type_ = aType;
+    this.x0_ = 0;
+    this.y0_ = 0;
+    this.r0_ = 0;
+    this.x1_ = 0;
+    this.y1_ = 0;
+    this.r1_ = 0;
+    this.colors_ = [];
+  }
+
+  CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) {
+    aColor = processStyle(aColor);
+    this.colors_.push({offset: aOffset,
+                       color: aColor.color,
+                       alpha: aColor.alpha});
+  };
+
+  function CanvasPattern_(image, repetition) {
+    assertImageIsValid(image);
+    switch (repetition) {
+      case 'repeat':
+      case null:
+      case '':
+        this.repetition_ = 'repeat';
+        break
+      case 'repeat-x':
+      case 'repeat-y':
+      case 'no-repeat':
+        this.repetition_ = repetition;
+        break;
+      default:
+        throwException('SYNTAX_ERR');
+    }
+
+    this.src_ = image.src;
+    this.width_ = image.width;
+    this.height_ = image.height;
+  }
+
+  function throwException(s) {
+    throw new DOMException_(s);
+  }
+
+  function assertImageIsValid(img) {
+    if (!img || img.nodeType != 1 || img.tagName != 'IMG') {
+      throwException('TYPE_MISMATCH_ERR');
+    }
+    if (img.readyState != 'complete') {
+      throwException('INVALID_STATE_ERR');
+    }
+  }
+
+  function DOMException_(s) {
+    this.code = this[s];
+    this.message = s +': DOM Exception ' + this.code;
+  }
+  var p = DOMException_.prototype = new Error;
+  p.INDEX_SIZE_ERR = 1;
+  p.DOMSTRING_SIZE_ERR = 2;
+  p.HIERARCHY_REQUEST_ERR = 3;
+  p.WRONG_DOCUMENT_ERR = 4;
+  p.INVALID_CHARACTER_ERR = 5;
+  p.NO_DATA_ALLOWED_ERR = 6;
+  p.NO_MODIFICATION_ALLOWED_ERR = 7;
+  p.NOT_FOUND_ERR = 8;
+  p.NOT_SUPPORTED_ERR = 9;
+  p.INUSE_ATTRIBUTE_ERR = 10;
+  p.INVALID_STATE_ERR = 11;
+  p.SYNTAX_ERR = 12;
+  p.INVALID_MODIFICATION_ERR = 13;
+  p.NAMESPACE_ERR = 14;
+  p.INVALID_ACCESS_ERR = 15;
+  p.VALIDATION_ERR = 16;
+  p.TYPE_MISMATCH_ERR = 17;
+
+  // set up externs
+  G_vmlCanvasManager = G_vmlCanvasManager_;
+  CanvasRenderingContext2D = CanvasRenderingContext2D_;
+  CanvasGradient = CanvasGradient_;
+  CanvasPattern = CanvasPattern_;
+  DOMException = DOMException_;
+})();
+
+} // if
+

--- /dev/null
+++ b/lib/flot/excanvas.min.js
@@ -1,1 +1,1 @@
-
+if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z<j.length;Z++){this.initElement(j[Z])}},initElement:function(i){if(!i.getContext){i.getContext=T;r(i.ownerDocument);i.innerHTML="";i.attachEvent("onpropertychange",S);i.attachEvent("onresize",w);var Z=i.attributes;if(Z.width&&Z.width.specified){i.style.width=Z.width.nodeValue+"px"}else{i.width=i.clientWidth}if(Z.height&&Z.height.specified){i.style.height=Z.height.nodeValue+"px"}else{i.height=i.clientHeight}}return i}};function S(i){var Z=i.srcElement;switch(i.propertyName){case"width":Z.getContext().clearRect();Z.style.width=Z.attributes.width.nodeValue+"px";Z.firstChild.style.width=Z.clientWidth+"px";break;case"height":Z.getContext().clearRect();Z.style.height=Z.attributes.height.nodeValue+"px";Z.firstChild.style.height=Z.clientHeight+"px";break}}function w(i){var Z=i.srcElement;if(Z.firstChild){Z.firstChild.style.width=Z.clientWidth+"px";Z.firstChild.style.height=Z.clientHeight+"px"}}E.init();var I=[];for(var AC=0;AC<16;AC++){for(var AB=0;AB<16;AB++){I[AC*16+AB]=AC.toString(16)+AB.toString(16)}}function V(){return[[1,0,0],[0,1,0],[0,0,1]]}function d(m,j){var i=V();for(var Z=0;Z<3;Z++){for(var AF=0;AF<3;AF++){var p=0;for(var AE=0;AE<3;AE++){p+=m[Z][AE]*j[AE][AF]}i[Z][AF]=p}}return i}function Q(i,Z){Z.fillStyle=i.fillStyle;Z.lineCap=i.lineCap;Z.lineJoin=i.lineJoin;Z.lineWidth=i.lineWidth;Z.miterLimit=i.miterLimit;Z.shadowBlur=i.shadowBlur;Z.shadowColor=i.shadowColor;Z.shadowOffsetX=i.shadowOffsetX;Z.shadowOffsetY=i.shadowOffsetY;Z.strokeStyle=i.strokeStyle;Z.globalAlpha=i.globalAlpha;Z.font=i.font;Z.textAlign=i.textAlign;Z.textBaseline=i.textBaseline;Z.arcScaleX_=i.arcScaleX_;Z.arcScaleY_=i.arcScaleY_;Z.lineScale_=i.lineScale_}var B={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"};function g(i){var m=i.indexOf("(",3);var Z=i.indexOf(")",m+1);var j=i.substring(m+1,Z).split(",");if(j.length==4&&i.substr(3,1)=="a"){alpha=Number(j[3])}else{j[3]=1}return j}function C(Z){return parseFloat(Z)/100}function N(i,j,Z){return Math.min(Z,Math.max(j,i))}function c(AF){var j,i,Z;h=parseFloat(AF[0])/360%360;if(h<0){h++}s=N(C(AF[1]),0,1);l=N(C(AF[2]),0,1);if(s==0){j=i=Z=l}else{var m=l<0.5?l*(1+s):l+s-l*s;var AE=2*l-m;j=A(AE,m,h+1/3);i=A(AE,m,h);Z=A(AE,m,h-1/3)}return"#"+I[Math.floor(j*255)]+I[Math.floor(i*255)]+I[Math.floor(Z*255)]}function A(i,Z,j){if(j<0){j++}if(j>1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" <g_vml_:group",' coordsize="',D*Z,",",D*AE,'"',' coordorigin="0,0"',' style="width:',Z,"px;height:",AE,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var p=[];p.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",K(AW.x/D),",","Dy=",K(AW.y/D),"");var AS=AW;var AR=this.getCoords_(AH+AJ,AF);var AP=this.getCoords_(AH,AF+AV);var AL=this.getCoords_(AH+AJ,AF+AV);AS.x=z.max(AS.x,AR.x,AP.x,AL.x);AS.y=z.max(AS.y,AR.y,AP.y,AL.y);AU.push("padding:0 ",K(AS.x/D),"px ",K(AS.y/D),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",p.join(""),", sizingmethod='clip');")}else{AU.push("top:",K(AW.y/D),"px;left:",K(AW.x/D),"px;")}AU.push(' ">','<g_vml_:image src="',AO.src,'"',' style="width:',D*AJ,"px;"," height:",D*AV,'px"',' cropleft="',AM/AG,'"',' croptop="',AK/AT,'"',' cropright="',(AG-AM-AQ)/AG,'"',' cropbottom="',(AT-AK-AX)/AT,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AH<this.currentPath_.length;AH+=AE){var AK=[];var AF=false;AK.push("<g_vml_:shape",' filled="',!!AM,'"',' style="position:absolute;width:',m,"px;height:",AN,'px;"',' coordorigin="0,0"',' coordsize="',D*m,",",D*AN,'"',' stroked="',!AM,'"',' path="');var AO=false;for(var AI=AH;AI<Math.min(AH+AE,this.currentPath_.length);AI++){if(AI%AE==0&&AI>0){AK.push(" m ",K(this.currentPath_[AI-1].x),",",K(this.currentPath_[AI-1].y))}var Z=this.currentPath_[AI];var AJ;switch(Z.type){case"moveTo":AJ=Z;AK.push(" m ",K(Z.x),",",K(Z.y));break;case"lineTo":AK.push(" l ",K(Z.x),",",K(Z.y));break;case"close":AK.push(" x ");Z=null;break;case"bezierCurveTo":AK.push(" c ",K(Z.cp1x),",",K(Z.cp1y),",",K(Z.cp2x),",",K(Z.cp2y),",",K(Z.x),",",K(Z.y));break;case"at":case"wa":AK.push(" ",Z.type," ",K(Z.x-this.arcScaleX_*Z.radius),",",K(Z.y-this.arcScaleY_*Z.radius)," ",K(Z.x+this.arcScaleX_*Z.radius),",",K(Z.y+this.arcScaleY_*Z.radius)," ",K(Z.xStart),",",K(Z.yStart)," ",K(Z.xEnd),",",K(Z.yEnd));break}if(Z){if(AG.x==null||Z.x<AG.x){AG.x=Z.x}if(AL.x==null||Z.x>AL.x){AL.x=Z.x}if(AG.y==null||Z.y<AG.y){AG.y=Z.y}if(AL.y==null||Z.y>AL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("<g_vml_:stroke",' opacity="',p,'"',' joinstyle="',j.lineJoin,'"',' miterlimit="',j.miterLimit,'"',' endcap="',t(j.lineCap),'"',' weight="',Z,'px"',' color="',m,'" />')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae<AN;Ae++){var AM=AS[Ae];Ab.push(AM.offset*AK+AU+" "+AM.color)}AG.push('<g_vml_:fill type="',AH.type_,'"',' method="none" focus="100%"',' color="',AR,'"',' color2="',AQ,'"',' colors="',Ab.join(","),'"',' opacity="',AV,'"',' g_o_:opacity2="',AW,'"',' angle="',AL,'"',' focusposition="',Ac.x,",",Ac.y,'" />')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("<g_vml_:fill",' position="',AF/Z*AY*AY,",",AZ/m*AX*AX,'"',' type="tile"',' src="',AH.src_,'" />')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('<g_vml_:fill color="',AT,'" opacity="',Ad,'" />')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('<g_vml_:line from="',-i,' 0" to="',AP,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!AG,'" stroked="',!!AG,'" style="position:absolute;width:1px;height:1px;">');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('<g_vml_:skew on="t" matrix="',AL,'" ',' offset="',AJ,'" origin="',i,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',AD(AK),'" style="v-text-align:',p,";font:",AD(j),'" /></g_vml_:line>');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()};

--- /dev/null
+++ b/lib/flot/jquery.colorhelpers.js
@@ -1,1 +1,180 @@
+/* Plugin for jQuery for working with colors.
+ * 
+ * Version 1.1.
+ * 
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
+ */ 
 
+(function($) {
+    $.color = {};
+
+    // construct color object with some convenient chainable helpers
+    $.color.make = function (r, g, b, a) {
+        var o = {};
+        o.r = r || 0;
+        o.g = g || 0;
+        o.b = b || 0;
+        o.a = a != null ? a : 1;
+
+        o.add = function (c, d) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] += d;
+            return o.normalize();
+        };
+        
+        o.scale = function (c, f) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] *= f;
+            return o.normalize();
+        };
+        
+        o.toString = function () {
+            if (o.a >= 1.0) {
+                return "rgb("+[o.r, o.g, o.b].join(",")+")";
+            } else {
+                return "rgba("+[o.r, o.g, o.b, o.a].join(",")+")";
+            }
+        };
+
+        o.normalize = function () {
+            function clamp(min, value, max) {
+                return value < min ? min: (value > max ? max: value);
+            }
+            
+            o.r = clamp(0, parseInt(o.r), 255);
+            o.g = clamp(0, parseInt(o.g), 255);
+            o.b = clamp(0, parseInt(o.b), 255);
+            o.a = clamp(0, o.a, 1);
+            return o;
+        };
+
+        o.clone = function () {
+            return $.color.make(o.r, o.b, o.g, o.a);
+        };
+
+        return o.normalize();
+    }
+
+    // extract CSS color property from element, going up in the DOM
+    // if it's "transparent"
+    $.color.extract = function (elem, css) {
+        var c;
+        do {
+            c = elem.css(css).toLowerCase();
+            // keep going until we find an element that has color, or
+            // we hit the body
+            if (c != '' && c != 'transparent')
+                break;
+            elem = elem.parent();
+        } while (!$.nodeName(elem.get(0), "body"));
+
+        // catch Safari's way of signalling transparent
+        if (c == "rgba(0, 0, 0, 0)")
+            c = "transparent";
+        
+        return $.color.parse(c);
+    }
+    
+    // parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
+    // returns color object, if parsing failed, you get black (0, 0,
+    // 0) out
+    $.color.parse = function (str) {
+        var res, m = $.color.make;
+
+        // Look for rgb(num,num,num)
+        if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10));
+        
+        // Look for rgba(num,num,num,num)
+        if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4]));
+            
+        // Look for rgb(num%,num%,num%)
+        if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55);
+
+        // Look for rgba(num%,num%,num%,num)
+        if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55, parseFloat(res[4]));
+        
+        // Look for #a0b1c2
+        if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))
+            return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
+
+        // Look for #fff
+        if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))
+            return m(parseInt(res[1]+res[1], 16), parseInt(res[2]+res[2], 16), parseInt(res[3]+res[3], 16));
+
+        // Otherwise, we're most likely dealing with a named color
+        var name = $.trim(str).toLowerCase();
+        if (name == "transparent")
+            return m(255, 255, 255, 0);
+        else {
+            // default to black
+            res = lookupColors[name] || [0, 0, 0];
+            return m(res[0], res[1], res[2]);
+        }
+    }
+    
+    var lookupColors = {
+        aqua:[0,255,255],
+        azure:[240,255,255],
+        beige:[245,245,220],
+        black:[0,0,0],
+        blue:[0,0,255],
+        brown:[165,42,42],
+        cyan:[0,255,255],
+        darkblue:[0,0,139],
+        darkcyan:[0,139,139],
+        darkgrey:[169,169,169],
+        darkgreen:[0,100,0],
+        darkkhaki:[189,183,107],
+        darkmagenta:[139,0,139],
+        darkolivegreen:[85,107,47],
+        darkorange:[255,140,0],
+        darkorchid:[153,50,204],
+        darkred:[139,0,0],
+        darksalmon:[233,150,122],
+        darkviolet:[148,0,211],
+        fuchsia:[255,0,255],
+        gold:[255,215,0],
+        green:[0,128,0],
+        indigo:[75,0,130],
+        khaki:[240,230,140],
+        lightblue:[173,216,230],
+        lightcyan:[224,255,255],
+        lightgreen:[144,238,144],
+        lightgrey:[211,211,211],
+        lightpink:[255,182,193],
+        lightyellow:[255,255,224],
+        lime:[0,255,0],
+        magenta:[255,0,255],
+        maroon:[128,0,0],
+        navy:[0,0,128],
+        olive:[128,128,0],
+        orange:[255,165,0],
+        pink:[255,192,203],
+        purple:[128,0,128],
+        violet:[128,0,128],
+        red:[255,0,0],
+        silver:[192,192,192],
+        white:[255,255,255],
+        yellow:[255,255,0]
+    };
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.colorhelpers.min.js
@@ -1,1 +1,1 @@
-
+(function(b){b.color={};b.color.make=function(f,e,c,d){var h={};h.r=f||0;h.g=e||0;h.b=c||0;h.a=d!=null?d:1;h.add=function(k,j){for(var g=0;g<k.length;++g){h[k.charAt(g)]+=j}return h.normalize()};h.scale=function(k,j){for(var g=0;g<k.length;++g){h[k.charAt(g)]*=j}return h.normalize()};h.toString=function(){if(h.a>=1){return"rgb("+[h.r,h.g,h.b].join(",")+")"}else{return"rgba("+[h.r,h.g,h.b,h.a].join(",")+")"}};h.normalize=function(){function g(j,k,i){return k<j?j:(k>i?i:k)}h.r=g(0,parseInt(h.r),255);h.g=g(0,parseInt(h.g),255);h.b=g(0,parseInt(h.b),255);h.a=g(0,h.a,1);return h};h.clone=function(){return b.color.make(h.r,h.b,h.g,h.a)};return h.normalize()};b.color.extract=function(e,d){var f;do{f=e.css(d).toLowerCase();if(f!=""&&f!="transparent"){break}e=e.parent()}while(!b.nodeName(e.get(0),"body"));if(f=="rgba(0, 0, 0, 0)"){f="transparent"}return b.color.parse(f)};b.color.parse=function(f){var e,c=b.color.make;if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return c(parseInt(e[1],10),parseInt(e[2],10),parseInt(e[3],10))}if(e=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(f)){return c(parseInt(e[1],10),parseInt(e[2],10),parseInt(e[3],10),parseFloat(e[4]))}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return c(parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55)}if(e=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(f)){return c(parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55,parseFloat(e[4]))}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return c(parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16))}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return c(parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16))}var d=b.trim(f).toLowerCase();if(d=="transparent"){return c(255,255,255,0)}else{e=a[d]||[0,0,0];return c(e[0],e[1],e[2])}};var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.crosshair.js
@@ -1,1 +1,168 @@
+/*
+Flot plugin for showing crosshairs, thin lines, when the mouse hovers
+over the plot.
 
+  crosshair: {
+    mode: null or "x" or "y" or "xy"
+    color: color
+    lineWidth: number
+  }
+
+Set the mode to one of "x", "y" or "xy". The "x" mode enables a
+vertical crosshair that lets you trace the values on the x axis, "y"
+enables a horizontal crosshair and "xy" enables them both. "color" is
+the color of the crosshair (default is "rgba(170, 0, 0, 0.80)"),
+"lineWidth" is the width of the drawn lines (default is 1).
+
+The plugin also adds four public methods:
+
+  - setCrosshair(pos)
+
+    Set the position of the crosshair. Note that this is cleared if
+    the user moves the mouse. "pos" is in coordinates of the plot and
+    should be on the form { x: xpos, y: ypos } (you can use x2/x3/...
+    if you're using multiple axes), which is coincidentally the same
+    format as what you get from a "plothover" event. If "pos" is null,
+    the crosshair is cleared.
+
+  - clearCrosshair()
+
+    Clear the crosshair.
+
+  - lockCrosshair(pos)
+
+    Cause the crosshair to lock to the current location, no longer
+    updating if the user moves the mouse. Optionally supply a position
+    (passed on to setCrosshair()) to move it to.
+
+    Example usage:
+      var myFlot = $.plot( $("#graph"), ..., { crosshair: { mode: "x" } } };
+      $("#graph").bind("plothover", function (evt, position, item) {
+        if (item) {
+          // Lock the crosshair to the data point being hovered
+          myFlot.lockCrosshair({ x: item.datapoint[0], y: item.datapoint[1] });
+        }
+        else {
+          // Return normal crosshair operation
+          myFlot.unlockCrosshair();
+        }
+      });
+
+  - unlockCrosshair()
+
+    Free the crosshair to move again after locking it.
+*/
+
+(function ($) {
+    var options = {
+        crosshair: {
+            mode: null, // one of null, "x", "y" or "xy",
+            color: "rgba(170, 0, 0, 0.80)",
+            lineWidth: 1
+        }
+    };
+    
+    function init(plot) {
+        // position of crosshair in pixels
+        var crosshair = { x: -1, y: -1, locked: false };
+
+        plot.setCrosshair = function setCrosshair(pos) {
+            if (!pos)
+                crosshair.x = -1;
+            else {
+                var o = plot.p2c(pos);
+                crosshair.x = Math.max(0, Math.min(o.left, plot.width()));
+                crosshair.y = Math.max(0, Math.min(o.top, plot.height()));
+            }
+            
+            plot.triggerRedrawOverlay();
+        };
+        
+        plot.clearCrosshair = plot.setCrosshair; // passes null for pos
+        
+        plot.lockCrosshair = function lockCrosshair(pos) {
+            if (pos)
+                plot.setCrosshair(pos);
+            crosshair.locked = true;
+        }
+
+        plot.unlockCrosshair = function unlockCrosshair() {
+            crosshair.locked = false;
+        }
+
+        function onMouseOut(e) {
+            if (crosshair.locked)
+                return;
+
+            if (crosshair.x != -1) {
+                crosshair.x = -1;
+                plot.triggerRedrawOverlay();
+            }
+        }
+
+        function onMouseMove(e) {
+            if (crosshair.locked)
+                return;
+                
+            if (plot.getSelection && plot.getSelection()) {
+                crosshair.x = -1; // hide the crosshair while selecting
+                return;
+            }
+                
+            var offset = plot.offset();
+            crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
+            crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
+            plot.triggerRedrawOverlay();
+        }
+        
+        plot.hooks.bindEvents.push(function (plot, eventHolder) {
+            if (!plot.getOptions().crosshair.mode)
+                return;
+
+            eventHolder.mouseout(onMouseOut);
+            eventHolder.mousemove(onMouseMove);
+        });
+
+        plot.hooks.drawOverlay.push(function (plot, ctx) {
+            var c = plot.getOptions().crosshair;
+            if (!c.mode)
+                return;
+
+            var plotOffset = plot.getPlotOffset();
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            if (crosshair.x != -1) {
+                ctx.strokeStyle = c.color;
+                ctx.lineWidth = c.lineWidth;
+                ctx.lineJoin = "round";
+
+                ctx.beginPath();
+                if (c.mode.indexOf("x") != -1) {
+                    ctx.moveTo(crosshair.x, 0);
+                    ctx.lineTo(crosshair.x, plot.height());
+                }
+                if (c.mode.indexOf("y") != -1) {
+                    ctx.moveTo(0, crosshair.y);
+                    ctx.lineTo(plot.width(), crosshair.y);
+                }
+                ctx.stroke();
+            }
+            ctx.restore();
+        });
+
+        plot.hooks.shutdown.push(function (plot, eventHolder) {
+            eventHolder.unbind("mouseout", onMouseOut);
+            eventHolder.unbind("mousemove", onMouseMove);
+        });
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'crosshair',
+        version: '1.0'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.crosshair.min.js
@@ -1,1 +1,1 @@
-
+(function(b){var a={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function c(h){var j={x:-1,y:-1,locked:false};h.setCrosshair=function e(l){if(!l){j.x=-1}else{var k=h.p2c(l);j.x=Math.max(0,Math.min(k.left,h.width()));j.y=Math.max(0,Math.min(k.top,h.height()))}h.triggerRedrawOverlay()};h.clearCrosshair=h.setCrosshair;h.lockCrosshair=function f(k){if(k){h.setCrosshair(k)}j.locked=true};h.unlockCrosshair=function g(){j.locked=false};function d(k){if(j.locked){return}if(j.x!=-1){j.x=-1;h.triggerRedrawOverlay()}}function i(k){if(j.locked){return}if(h.getSelection&&h.getSelection()){j.x=-1;return}var l=h.offset();j.x=Math.max(0,Math.min(k.pageX-l.left,h.width()));j.y=Math.max(0,Math.min(k.pageY-l.top,h.height()));h.triggerRedrawOverlay()}h.hooks.bindEvents.push(function(l,k){if(!l.getOptions().crosshair.mode){return}k.mouseout(d);k.mousemove(i)});h.hooks.drawOverlay.push(function(m,k){var n=m.getOptions().crosshair;if(!n.mode){return}var l=m.getPlotOffset();k.save();k.translate(l.left,l.top);if(j.x!=-1){k.strokeStyle=n.color;k.lineWidth=n.lineWidth;k.lineJoin="round";k.beginPath();if(n.mode.indexOf("x")!=-1){k.moveTo(j.x,0);k.lineTo(j.x,m.height())}if(n.mode.indexOf("y")!=-1){k.moveTo(0,j.y);k.lineTo(m.width(),j.y)}k.stroke()}k.restore()});h.hooks.shutdown.push(function(l,k){k.unbind("mouseout",d);k.unbind("mousemove",i)})}b.plot.plugins.push({init:c,options:a,name:"crosshair",version:"1.0"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.fillbetween.js
@@ -1,1 +1,184 @@
+/*
+Flot plugin for computing bottoms for filled line and bar charts.
 
+The case: you've got two series that you want to fill the area
+between. In Flot terms, you need to use one as the fill bottom of the
+other. You can specify the bottom of each data point as the third
+coordinate manually, or you can use this plugin to compute it for you.
+
+In order to name the other series, you need to give it an id, like this
+
+  var dataset = [
+       { data: [ ... ], id: "foo" } ,         // use default bottom
+       { data: [ ... ], fillBetween: "foo" }, // use first dataset as bottom
+       ];
+
+  $.plot($("#placeholder"), dataset, { line: { show: true, fill: true }});
+
+As a convenience, if the id given is a number that doesn't appear as
+an id in the series, it is interpreted as the index in the array
+instead (so fillBetween: 0 can also mean the first series).
+  
+Internally, the plugin modifies the datapoints in each series. For
+line series, extra data points might be inserted through
+interpolation. Note that at points where the bottom line is not
+defined (due to a null point or start/end of line), the current line
+will show a gap too. The algorithm comes from the jquery.flot.stack.js
+plugin, possibly some code could be shared.
+*/
+
+(function ($) {
+    var options = {
+        series: { fillBetween: null } // or number
+    };
+    
+    function init(plot) {
+        function findBottomSeries(s, allseries) {
+            var i;
+            for (i = 0; i < allseries.length; ++i) {
+                if (allseries[i].id == s.fillBetween)
+                    return allseries[i];
+            }
+
+            if (typeof s.fillBetween == "number") {
+                i = s.fillBetween;
+            
+                if (i < 0 || i >= allseries.length)
+                    return null;
+
+                return allseries[i];
+            }
+            
+            return null;
+        }
+        
+        function computeFillBottoms(plot, s, datapoints) {
+            if (s.fillBetween == null)
+                return;
+
+            var other = findBottomSeries(s, plot.getData());
+            if (!other)
+                return;
+
+            var ps = datapoints.pointsize,
+                points = datapoints.points,
+                otherps = other.datapoints.pointsize,
+                otherpoints = other.datapoints.points,
+                newpoints = [],
+                px, py, intery, qx, qy, bottom,
+                withlines = s.lines.show,
+                withbottom = ps > 2 && datapoints.format[2].y,
+                withsteps = withlines && s.lines.steps,
+                fromgap = true,
+                i = 0, j = 0, l;
+
+            while (true) {
+                if (i >= points.length)
+                    break;
+
+                l = newpoints.length;
+
+                if (points[i] == null) {
+                    // copy gaps
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(points[i + m]);
+                    i += ps;
+                }
+                else if (j >= otherpoints.length) {
+                    // for lines, we can't use the rest of the points
+                    if (!withlines) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                    }
+                    i += ps;
+                }
+                else if (otherpoints[j] == null) {
+                    // oops, got a gap
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(null);
+                    fromgap = true;
+                    j += otherps;
+                }
+                else {
+                    // cases where we actually got two points
+                    px = points[i];
+                    py = points[i + 1];
+                    qx = otherpoints[j];
+                    qy = otherpoints[j + 1];
+                    bottom = 0;
+
+                    if (px == qx) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+
+                        //newpoints[l + 1] += qy;
+                        bottom = qy;
+                        
+                        i += ps;
+                        j += otherps;
+                    }
+                    else if (px > qx) {
+                        // we got past point below, might need to
+                        // insert interpolated extra point
+                        if (withlines && i > 0 && points[i - ps] != null) {
+                            intery = py + (points[i - ps + 1] - py) * (qx - px) / (points[i - ps] - px);
+                            newpoints.push(qx);
+                            newpoints.push(intery)
+                            for (m = 2; m < ps; ++m)
+                                newpoints.push(points[i + m]);
+                            bottom = qy; 
+                        }
+
+                        j += otherps;
+                    }
+                    else { // px < qx
+                        if (fromgap && withlines) {
+                            // if we come from a gap, we just skip this point
+                            i += ps;
+                            continue;
+                        }
+                            
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                        
+                        // we might be able to interpolate a point below,
+                        // this can give us a better y
+                        if (withlines && j > 0 && otherpoints[j - otherps] != null)
+                            bottom = qy + (otherpoints[j - otherps + 1] - qy) * (px - qx) / (otherpoints[j - otherps] - qx);
+
+                        //newpoints[l + 1] += bottom;
+                        
+                        i += ps;
+                    }
+
+                    fromgap = false;
+                    
+                    if (l != newpoints.length && withbottom)
+                        newpoints[l + 2] = bottom;
+                }
+
+                // maintain the line steps invariant
+                if (withsteps && l != newpoints.length && l > 0
+                    && newpoints[l] != null
+                    && newpoints[l] != newpoints[l - ps]
+                    && newpoints[l + 1] != newpoints[l - ps + 1]) {
+                    for (m = 0; m < ps; ++m)
+                        newpoints[l + ps + m] = newpoints[l + m];
+                    newpoints[l + 1] = newpoints[l - ps + 1];
+                }
+            }
+
+            datapoints.points = newpoints;
+        }
+        
+        plot.hooks.processDatapoints.push(computeFillBottoms);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'fillbetween',
+        version: '1.0'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.fillbetween.min.js
@@ -1,1 +1,1 @@
-
+(function(b){var a={series:{fillBetween:null}};function c(f){function d(j,h){var g;for(g=0;g<h.length;++g){if(h[g].id==j.fillBetween){return h[g]}}if(typeof j.fillBetween=="number"){g=j.fillBetween;if(g<0||g>=h.length){return null}return h[g]}return null}function e(B,u,g){if(u.fillBetween==null){return}var p=d(u,B.getData());if(!p){return}var y=g.pointsize,E=g.points,h=p.datapoints.pointsize,x=p.datapoints.points,r=[],w,v,k,G,F,q,t=u.lines.show,o=y>2&&g.format[2].y,n=t&&u.lines.steps,D=true,C=0,A=0,z;while(true){if(C>=E.length){break}z=r.length;if(E[C]==null){for(m=0;m<y;++m){r.push(E[C+m])}C+=y}else{if(A>=x.length){if(!t){for(m=0;m<y;++m){r.push(E[C+m])}}C+=y}else{if(x[A]==null){for(m=0;m<y;++m){r.push(null)}D=true;A+=h}else{w=E[C];v=E[C+1];G=x[A];F=x[A+1];q=0;if(w==G){for(m=0;m<y;++m){r.push(E[C+m])}q=F;C+=y;A+=h}else{if(w>G){if(t&&C>0&&E[C-y]!=null){k=v+(E[C-y+1]-v)*(G-w)/(E[C-y]-w);r.push(G);r.push(k);for(m=2;m<y;++m){r.push(E[C+m])}q=F}A+=h}else{if(D&&t){C+=y;continue}for(m=0;m<y;++m){r.push(E[C+m])}if(t&&A>0&&x[A-h]!=null){q=F+(x[A-h+1]-F)*(w-G)/(x[A-h]-G)}C+=y}}D=false;if(z!=r.length&&o){r[z+2]=q}}}}if(n&&z!=r.length&&z>0&&r[z]!=null&&r[z]!=r[z-y]&&r[z+1]!=r[z-y+1]){for(m=0;m<y;++m){r[z+y+m]=r[z+m]}r[z+1]=r[z-y+1]}}g.points=r}f.hooks.processDatapoints.push(e)}b.plot.plugins.push({init:c,options:a,name:"fillbetween",version:"1.0"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.image.js
@@ -1,1 +1,239 @@
-
+/*
+Flot plugin for plotting images, e.g. useful for putting ticks on a
+prerendered complex visualization.
+
+The data syntax is [[image, x1, y1, x2, y2], ...] where (x1, y1) and
+(x2, y2) are where you intend the two opposite corners of the image to
+end up in the plot. Image must be a fully loaded Javascript image (you
+can make one with new Image()). If the image is not complete, it's
+skipped when plotting.
+
+There are two helpers included for retrieving images. The easiest work
+the way that you put in URLs instead of images in the data (like
+["myimage.png", 0, 0, 10, 10]), then call $.plot.image.loadData(data,
+options, callback) where data and options are the same as you pass in
+to $.plot. This loads the images, replaces the URLs in the data with
+the corresponding images and calls "callback" when all images are
+loaded (or failed loading). In the callback, you can then call $.plot
+with the data set. See the included example.
+
+A more low-level helper, $.plot.image.load(urls, callback) is also
+included. Given a list of URLs, it calls callback with an object
+mapping from URL to Image object when all images are loaded or have
+failed loading.
+
+Options for the plugin are
+
+  series: {
+      images: {
+          show: boolean
+          anchor: "corner" or "center"
+          alpha: [0,1]
+      }
+  }
+
+which can be specified for a specific series
+
+  $.plot($("#placeholder"), [{ data: [ ... ], images: { ... } ])
+
+Note that because the data format is different from usual data points,
+you can't use images with anything else in a specific data series.
+
+Setting "anchor" to "center" causes the pixels in the image to be
+anchored at the corner pixel centers inside of at the pixel corners,
+effectively letting half a pixel stick out to each side in the plot.
+
+
+A possible future direction could be support for tiling for large
+images (like Google Maps).
+
+*/
+
+(function ($) {
+    var options = {
+        series: {
+            images: {
+                show: false,
+                alpha: 1,
+                anchor: "corner" // or "center"
+            }
+        }
+    };
+
+    $.plot.image = {};
+
+    $.plot.image.loadDataImages = function (series, options, callback) {
+        var urls = [], points = [];
+
+        var defaultShow = options.series.images.show;
+        
+        $.each(series, function (i, s) {
+            if (!(defaultShow || s.images.show))
+                return;
+            
+            if (s.data)
+                s = s.data;
+
+            $.each(s, function (i, p) {
+                if (typeof p[0] == "string") {
+                    urls.push(p[0]);
+                    points.push(p);
+                }
+            });
+        });
+
+        $.plot.image.load(urls, function (loadedImages) {
+            $.each(points, function (i, p) {
+                var url = p[0];
+                if (loadedImages[url])
+                    p[0] = loadedImages[url];
+            });
+
+            callback();
+        });
+    }
+    
+    $.plot.image.load = function (urls, callback) {
+        var missing = urls.length, loaded = {};
+        if (missing == 0)
+            callback({});
+
+        $.each(urls, function (i, url) {
+            var handler = function () {
+                --missing;
+                
+                loaded[url] = this;
+                
+                if (missing == 0)
+                    callback(loaded);
+            };
+
+            $('<img />').load(handler).error(handler).attr('src', url);
+        });
+    }
+    
+    function drawSeries(plot, ctx, series) {
+        var plotOffset = plot.getPlotOffset();
+        
+        if (!series.images || !series.images.show)
+            return;
+        
+        var points = series.datapoints.points,
+            ps = series.datapoints.pointsize;
+        
+        for (var i = 0; i < points.length; i += ps) {
+            var img = points[i],
+                x1 = points[i + 1], y1 = points[i + 2],
+                x2 = points[i + 3], y2 = points[i + 4],
+                xaxis = series.xaxis, yaxis = series.yaxis,
+                tmp;
+
+            // actually we should check img.complete, but it
+            // appears to be a somewhat unreliable indicator in
+            // IE6 (false even after load event)
+            if (!img || img.width <= 0 || img.height <= 0)
+                continue;
+
+            if (x1 > x2) {
+                tmp = x2;
+                x2 = x1;
+                x1 = tmp;
+            }
+            if (y1 > y2) {
+                tmp = y2;
+                y2 = y1;
+                y1 = tmp;
+            }
+            
+            // if the anchor is at the center of the pixel, expand the 
+            // image by 1/2 pixel in each direction
+            if (series.images.anchor == "center") {
+                tmp = 0.5 * (x2-x1) / (img.width - 1);
+                x1 -= tmp;
+                x2 += tmp;
+                tmp = 0.5 * (y2-y1) / (img.height - 1);
+                y1 -= tmp;
+                y2 += tmp;
+            }
+            
+            // clip
+            if (x1 == x2 || y1 == y2 ||
+                x1 >= xaxis.max || x2 <= xaxis.min ||
+                y1 >= yaxis.max || y2 <= yaxis.min)
+                continue;
+
+            var sx1 = 0, sy1 = 0, sx2 = img.width, sy2 = img.height;
+            if (x1 < xaxis.min) {
+                sx1 += (sx2 - sx1) * (xaxis.min - x1) / (x2 - x1);
+                x1 = xaxis.min;
+            }
+
+            if (x2 > xaxis.max) {
+                sx2 += (sx2 - sx1) * (xaxis.max - x2) / (x2 - x1);
+                x2 = xaxis.max;
+            }
+
+            if (y1 < yaxis.min) {
+                sy2 += (sy1 - sy2) * (yaxis.min - y1) / (y2 - y1);
+                y1 = yaxis.min;
+            }
+
+            if (y2 > yaxis.max) {
+                sy1 += (sy1 - sy2) * (yaxis.max - y2) / (y2 - y1);
+                y2 = yaxis.max;
+            }
+            
+            x1 = xaxis.p2c(x1);
+            x2 = xaxis.p2c(x2);
+            y1 = yaxis.p2c(y1);
+            y2 = yaxis.p2c(y2);
+            
+            // the transformation may have swapped us
+            if (x1 > x2) {
+                tmp = x2;
+                x2 = x1;
+                x1 = tmp;
+            }
+            if (y1 > y2) {
+                tmp = y2;
+                y2 = y1;
+                y1 = tmp;
+            }
+
+            tmp = ctx.globalAlpha;
+            ctx.globalAlpha *= series.images.alpha;
+            ctx.drawImage(img,
+                          sx1, sy1, sx2 - sx1, sy2 - sy1,
+                          x1 + plotOffset.left, y1 + plotOffset.top,
+                          x2 - x1, y2 - y1);
+            ctx.globalAlpha = tmp;
+        }
+    }
+
+    function processRawData(plot, series, data, datapoints) {
+        if (!series.images.show)
+            return;
+
+        // format is Image, x1, y1, x2, y2 (opposite corners)
+        datapoints.format = [
+            { required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true }
+        ];
+    }
+    
+    function init(plot) {
+        plot.hooks.processRawData.push(processRawData);
+        plot.hooks.drawSeries.push(drawSeries);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'image',
+        version: '1.1'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.image.min.js
@@ -1,1 +1,1 @@
-
+(function(c){var a={series:{images:{show:false,alpha:1,anchor:"corner"}}};c.plot.image={};c.plot.image.loadDataImages=function(g,f,k){var j=[],h=[];var i=f.series.images.show;c.each(g,function(l,m){if(!(i||m.images.show)){return}if(m.data){m=m.data}c.each(m,function(n,o){if(typeof o[0]=="string"){j.push(o[0]);h.push(o)}})});c.plot.image.load(j,function(l){c.each(h,function(n,o){var m=o[0];if(l[m]){o[0]=l[m]}});k()})};c.plot.image.load=function(h,i){var g=h.length,f={};if(g==0){i({})}c.each(h,function(k,j){var l=function(){--g;f[j]=this;if(g==0){i(f)}};c("<img />").load(l).error(l).attr("src",j)})};function d(q,o,l){var m=q.getPlotOffset();if(!l.images||!l.images.show){return}var r=l.datapoints.points,n=l.datapoints.pointsize;for(var t=0;t<r.length;t+=n){var y=r[t],w=r[t+1],g=r[t+2],v=r[t+3],f=r[t+4],h=l.xaxis,u=l.yaxis,x;if(!y||y.width<=0||y.height<=0){continue}if(w>v){x=v;v=w;w=x}if(g>f){x=f;f=g;g=x}if(l.images.anchor=="center"){x=0.5*(v-w)/(y.width-1);w-=x;v+=x;x=0.5*(f-g)/(y.height-1);g-=x;f+=x}if(w==v||g==f||w>=h.max||v<=h.min||g>=u.max||f<=u.min){continue}var k=0,s=0,j=y.width,p=y.height;if(w<h.min){k+=(j-k)*(h.min-w)/(v-w);w=h.min}if(v>h.max){j+=(j-k)*(h.max-v)/(v-w);v=h.max}if(g<u.min){p+=(s-p)*(u.min-g)/(f-g);g=u.min}if(f>u.max){s+=(s-p)*(u.max-f)/(f-g);f=u.max}w=h.p2c(w);v=h.p2c(v);g=u.p2c(g);f=u.p2c(f);if(w>v){x=v;v=w;w=x}if(g>f){x=f;f=g;g=x}x=o.globalAlpha;o.globalAlpha*=l.images.alpha;o.drawImage(y,k,s,j-k,p-s,w+m.left,g+m.top,v-w,f-g);o.globalAlpha=x}}function b(i,f,g,h){if(!f.images.show){return}h.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function e(f){f.hooks.processRawData.push(b);f.hooks.drawSeries.push(d)}c.plot.plugins.push({init:e,options:a,name:"image",version:"1.1"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.js
@@ -1,1 +1,2600 @@
-
+/*! Javascript plotting library for jQuery, v. 0.7.
+ *
+ * Released under the MIT license by IOLA, December 2007.
+ *
+ */
+
+// first an inline dependency, jquery.colorhelpers.js, we inline it here
+// for convenience
+
+/* Plugin for jQuery for working with colors.
+ * 
+ * Version 1.1.
+ * 
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
+ */ 
+(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]+=I}return G.normalize()};G.scale=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]*=I}return G.normalize()};G.toString=function(){if(G.a>=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return K<J?J:(K>I?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
+
+// the actual Flot code
+(function($) {
+    function Plot(placeholder, data_, options_, plugins) {
+        // data is on the form:
+        //   [ series1, series2 ... ]
+        // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
+        // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
+        
+        var series = [],
+            options = {
+                // the color theme used for graphs
+                colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
+                legend: {
+                    show: true,
+                    noColumns: 1, // number of colums in legend table
+                    labelFormatter: null, // fn: string -> string
+                    labelBoxBorderColor: "#ccc", // border color for the little label boxes
+                    container: null, // container (as jQuery object) to put legend in, null means default on top of graph
+                    position: "ne", // position of default legend container within plot
+                    margin: 5, // distance from grid edge to default legend container within plot
+                    backgroundColor: null, // null means auto-detect
+                    backgroundOpacity: 0.85 // set to 0 to avoid background
+                },
+                xaxis: {
+                    show: null, // null = auto-detect, true = always, false = never
+                    position: "bottom", // or "top"
+                    mode: null, // null or "time"
+                    color: null, // base color, labels, ticks
+                    tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
+                    transform: null, // null or f: number -> number to transform axis
+                    inverseTransform: null, // if transform is set, this should be the inverse function
+                    min: null, // min. value to show, null means set automatically
+                    max: null, // max. value to show, null means set automatically
+                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
+                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
+                    tickFormatter: null, // fn: number -> string
+                    labelWidth: null, // size of tick labels in pixels
+                    labelHeight: null,
+                    reserveSpace: null, // whether to reserve space even if axis isn't shown
+                    tickLength: null, // size in pixels of ticks, or "full" for whole line
+                    alignTicksWithAxis: null, // axis number or null for no sync
+                    
+                    // mode specific options
+                    tickDecimals: null, // no. of decimals, null means auto
+                    tickSize: null, // number or [number, "unit"]
+                    minTickSize: null, // number or [number, "unit"]
+                    monthNames: null, // list of names of months
+                    timeformat: null, // format string to use
+                    twelveHourClock: false // 12 or 24 time in time mode
+                },
+                yaxis: {
+                    autoscaleMargin: 0.02,
+                    position: "left" // or "right"
+                },
+                xaxes: [],
+                yaxes: [],
+                series: {
+                    points: {
+                        show: false,
+                        radius: 3,
+                        lineWidth: 2, // in pixels
+                        fill: true,
+                        fillColor: "#ffffff",
+                        symbol: "circle" // or callback
+                    },
+                    lines: {
+                        // we don't put in show: false so we can see
+                        // whether lines were actively disabled 
+                        lineWidth: 2, // in pixels
+                        fill: false,
+                        fillColor: null,
+                        steps: false
+                    },
+                    bars: {
+                        show: false,
+                        lineWidth: 2, // in pixels
+                        barWidth: 1, // in units of the x axis
+                        fill: true,
+                        fillColor: null,
+                        align: "left", // or "center" 
+                        horizontal: false
+                    },
+                    shadowSize: 3
+                },
+                grid: {
+                    show: true,
+                    aboveData: false,
+                    color: "#545454", // primary color used for outline and labels
+                    backgroundColor: null, // null for transparent, else color
+                    borderColor: null, // set if different from the grid color
+                    tickColor: null, // color for the ticks, e.g. "rgba(0,0,0,0.15)"
+                    labelMargin: 5, // in pixels
+                    axisMargin: 8, // in pixels
+                    borderWidth: 2, // in pixels
+                    minBorderMargin: null, // in pixels, null means taken from points radius
+                    markings: null, // array of ranges or fn: axes -> array of ranges
+                    markingsColor: "#f4f4f4",
+                    markingsLineWidth: 2,
+                    // interactive stuff
+                    clickable: false,
+                    hoverable: false,
+                    autoHighlight: true, // highlight in case mouse is near
+                    mouseActiveRadius: 10 // how far the mouse can be away to activate an item
+                },
+                hooks: {}
+            },
+        canvas = null,      // the canvas for the plot itself
+        overlay = null,     // canvas for interactive stuff on top of plot
+        eventHolder = null, // jQuery object that events should be bound to
+        ctx = null, octx = null,
+        xaxes = [], yaxes = [],
+        plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
+        canvasWidth = 0, canvasHeight = 0,
+        plotWidth = 0, plotHeight = 0,
+        hooks = {
+            processOptions: [],
+            processRawData: [],
+            processDatapoints: [],
+            drawSeries: [],
+            draw: [],
+            bindEvents: [],
+            drawOverlay: [],
+            shutdown: []
+        },
+        plot = this;
+
+        // public functions
+        plot.setData = setData;
+        plot.setupGrid = setupGrid;
+        plot.draw = draw;
+        plot.getPlaceholder = function() { return placeholder; };
+        plot.getCanvas = function() { return canvas; };
+        plot.getPlotOffset = function() { return plotOffset; };
+        plot.width = function () { return plotWidth; };
+        plot.height = function () { return plotHeight; };
+        plot.offset = function () {
+            var o = eventHolder.offset();
+            o.left += plotOffset.left;
+            o.top += plotOffset.top;
+            return o;
+        };
+        plot.getData = function () { return series; };
+        plot.getAxes = function () {
+            var res = {}, i;
+            $.each(xaxes.concat(yaxes), function (_, axis) {
+                if (axis)
+                    res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis;
+            });
+            return res;
+        };
+        plot.getXAxes = function () { return xaxes; };
+        plot.getYAxes = function () { return yaxes; };
+        plot.c2p = canvasToAxisCoords;
+        plot.p2c = axisToCanvasCoords;
+        plot.getOptions = function () { return options; };
+        plot.highlight = highlight;
+        plot.unhighlight = unhighlight;
+        plot.triggerRedrawOverlay = triggerRedrawOverlay;
+        plot.pointOffset = function(point) {
+            return {
+                left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left),
+                top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top)
+            };
+        };
+        plot.shutdown = shutdown;
+        plot.resize = function () {
+            getCanvasDimensions();
+            resizeCanvas(canvas);
+            resizeCanvas(overlay);
+        };
+
+        // public attributes
+        plot.hooks = hooks;
+        
+        // initialize
+        initPlugins(plot);
+        parseOptions(options_);
+        setupCanvases();
+        setData(data_);
+        setupGrid();
+        draw();
+        bindEvents();
+
+
+        function executeHooks(hook, args) {
+            args = [plot].concat(args);
+            for (var i = 0; i < hook.length; ++i)
+                hook[i].apply(this, args);
+        }
+
+        function initPlugins() {
+            for (var i = 0; i < plugins.length; ++i) {
+                var p = plugins[i];
+                p.init(plot);
+                if (p.options)
+                    $.extend(true, options, p.options);
+            }
+        }
+        
+        function parseOptions(opts) {
+            var i;
+            
+            $.extend(true, options, opts);
+            
+            if (options.xaxis.color == null)
+                options.xaxis.color = options.grid.color;
+            if (options.yaxis.color == null)
+                options.yaxis.color = options.grid.color;
+            
+            if (options.xaxis.tickColor == null) // backwards-compatibility
+                options.xaxis.tickColor = options.grid.tickColor;
+            if (options.yaxis.tickColor == null) // backwards-compatibility
+                options.yaxis.tickColor = options.grid.tickColor;
+
+            if (options.grid.borderColor == null)
+                options.grid.borderColor = options.grid.color;
+            if (options.grid.tickColor == null)
+                options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString();
+            
+            // fill in defaults in axes, copy at least always the
+            // first as the rest of the code assumes it'll be there
+            for (i = 0; i < Math.max(1, options.xaxes.length); ++i)
+                options.xaxes[i] = $.extend(true, {}, options.xaxis, options.xaxes[i]);
+            for (i = 0; i < Math.max(1, options.yaxes.length); ++i)
+                options.yaxes[i] = $.extend(true, {}, options.yaxis, options.yaxes[i]);
+
+            // backwards compatibility, to be removed in future
+            if (options.xaxis.noTicks && options.xaxis.ticks == null)
+                options.xaxis.ticks = options.xaxis.noTicks;
+            if (options.yaxis.noTicks && options.yaxis.ticks == null)
+                options.yaxis.ticks = options.yaxis.noTicks;
+            if (options.x2axis) {
+                options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
+                options.xaxes[1].position = "top";
+            }
+            if (options.y2axis) {
+                options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
+                options.yaxes[1].position = "right";
+            }
+            if (options.grid.coloredAreas)
+                options.grid.markings = options.grid.coloredAreas;
+            if (options.grid.coloredAreasColor)
+                options.grid.markingsColor = options.grid.coloredAreasColor;
+            if (options.lines)
+                $.extend(true, options.series.lines, options.lines);
+            if (options.points)
+                $.extend(true, options.series.points, options.points);
+            if (options.bars)
+                $.extend(true, options.series.bars, options.bars);
+            if (options.shadowSize != null)
+                options.series.shadowSize = options.shadowSize;
+
+            // save options on axes for future reference
+            for (i = 0; i < options.xaxes.length; ++i)
+                getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
+            for (i = 0; i < options.yaxes.length; ++i)
+                getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i];
+
+            // add hooks from options
+            for (var n in hooks)
+                if (options.hooks[n] && options.hooks[n].length)
+                    hooks[n] = hooks[n].concat(options.hooks[n]);
+
+            executeHooks(hooks.processOptions, [options]);
+        }
+
+        function setData(d) {
+            series = parseData(d);
+            fillInSeriesOptions();
+            processData();
+        }
+        
+        function parseData(d) {
+            var res = [];
+            for (var i = 0; i < d.length; ++i) {
+                var s = $.extend(true, {}, options.series);
+
+                if (d[i].data != null) {
+                    s.data = d[i].data; // move the data instead of deep-copy
+                    delete d[i].data;
+
+                    $.extend(true, s, d[i]);
+
+                    d[i].data = s.data;
+                }
+                else
+                    s.data = d[i];
+                res.push(s);
+            }
+
+            return res;
+        }
+        
+        function axisNumber(obj, coord) {
+            var a = obj[coord + "axis"];
+            if (typeof a == "object") // if we got a real axis, extract number
+                a = a.n;
+            if (typeof a != "number")
+                a = 1; // default to first axis
+            return a;
+        }
+
+        function allAxes() {
+            // return flat array without annoying null entries
+            return $.grep(xaxes.concat(yaxes), function (a) { return a; });
+        }
+        
+        function canvasToAxisCoords(pos) {
+            // return an object with x/y corresponding to all used axes 
+            var res = {}, i, axis;
+            for (i = 0; i < xaxes.length; ++i) {
+                axis = xaxes[i];
+                if (axis && axis.used)
+                    res["x" + axis.n] = axis.c2p(pos.left);
+            }
+
+            for (i = 0; i < yaxes.length; ++i) {
+                axis = yaxes[i];
+                if (axis && axis.used)
+                    res["y" + axis.n] = axis.c2p(pos.top);
+            }
+            
+            if (res.x1 !== undefined)
+                res.x = res.x1;
+            if (res.y1 !== undefined)
+                res.y = res.y1;
+
+            return res;
+        }
+        
+        function axisToCanvasCoords(pos) {
+            // get canvas coords from the first pair of x/y found in pos
+            var res = {}, i, axis, key;
+
+            for (i = 0; i < xaxes.length; ++i) {
+                axis = xaxes[i];
+                if (axis && axis.used) {
+                    key = "x" + axis.n;
+                    if (pos[key] == null && axis.n == 1)
+                        key = "x";
+
+                    if (pos[key] != null) {
+                        res.left = axis.p2c(pos[key]);
+                        break;
+                    }
+                }
+            }
+            
+            for (i = 0; i < yaxes.length; ++i) {
+                axis = yaxes[i];
+                if (axis && axis.used) {
+                    key = "y" + axis.n;
+                    if (pos[key] == null && axis.n == 1)
+                        key = "y";
+
+                    if (pos[key] != null) {
+                        res.top = axis.p2c(pos[key]);
+                        break;
+                    }
+                }
+            }
+            
+            return res;
+        }
+        
+        function getOrCreateAxis(axes, number) {
+            if (!axes[number - 1])
+                axes[number - 1] = {
+                    n: number, // save the number for future reference
+                    direction: axes == xaxes ? "x" : "y",
+                    options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis)
+                };
+                
+            return axes[number - 1];
+        }
+
+        function fillInSeriesOptions() {
+            var i;
+            
+            // collect what we already got of colors
+            var neededColors = series.length,
+                usedColors = [],
+                assignedColors = [];
+            for (i = 0; i < series.length; ++i) {
+                var sc = series[i].color;
+                if (sc != null) {
+                    --neededColors;
+                    if (typeof sc == "number")
+                        assignedColors.push(sc);
+                    else
+                        usedColors.push($.color.parse(series[i].color));
+                }
+            }
+            
+            // we might need to generate more colors if higher indices
+            // are assigned
+            for (i = 0; i < assignedColors.length; ++i) {
+                neededColors = Math.max(neededColors, assignedColors[i] + 1);
+            }
+
+            // produce colors as needed
+            var colors = [], variation = 0;
+            i = 0;
+            while (colors.length < neededColors) {
+                var c;
+                if (options.colors.length == i) // check degenerate case
+                    c = $.color.make(100, 100, 100);
+                else
+                    c = $.color.parse(options.colors[i]);
+
+                // vary color if needed
+                var sign = variation % 2 == 1 ? -1 : 1;
+                c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2)
+
+                // FIXME: if we're getting to close to something else,
+                // we should probably skip this one
+                colors.push(c);
+                
+                ++i;
+                if (i >= options.colors.length) {
+                    i = 0;
+                    ++variation;
+                }
+            }
+
+            // fill in the options
+            var colori = 0, s;
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                
+                // assign colors
+                if (s.color == null) {
+                    s.color = colors[colori].toString();
+                    ++colori;
+                }
+                else if (typeof s.color == "number")
+                    s.color = colors[s.color].toString();
+
+                // turn on lines automatically in case nothing is set
+                if (s.lines.show == null) {
+                    var v, show = true;
+                    for (v in s)
+                        if (s[v] && s[v].show) {
+                            show = false;
+                            break;
+                        }
+                    if (show)
+                        s.lines.show = true;
+                }
+
+                // setup axes
+                s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x"));
+                s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y"));
+            }
+        }
+        
+        function processData() {
+            var topSentry = Number.POSITIVE_INFINITY,
+                bottomSentry = Number.NEGATIVE_INFINITY,
+                fakeInfinity = Number.MAX_VALUE,
+                i, j, k, m, length,
+                s, points, ps, x, y, axis, val, f, p;
+
+            function updateAxis(axis, min, max) {
+                if (min < axis.datamin && min != -fakeInfinity)
+                    axis.datamin = min;
+                if (max > axis.datamax && max != fakeInfinity)
+                    axis.datamax = max;
+            }
+
+            $.each(allAxes(), function (_, axis) {
+                // init axis
+                axis.datamin = topSentry;
+                axis.datamax = bottomSentry;
+                axis.used = false;
+            });
+            
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                s.datapoints = { points: [] };
+                
+                executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+            }
+            
+            // first pass: clean and copy data
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+
+                var data = s.data, format = s.datapoints.format;
+
+                if (!format) {
+                    format = [];
+                    // find out how to copy
+                    format.push({ x: true, number: true, required: true });
+                    format.push({ y: true, number: true, required: true });
+
+                    if (s.bars.show || (s.lines.show && s.lines.fill)) {
+                        format.push({ y: true, number: true, required: false, defaultValue: 0 });
+                        if (s.bars.horizontal) {
+                            delete format[format.length - 1].y;
+                            format[format.length - 1].x = true;
+                        }
+                    }
+                    
+                    s.datapoints.format = format;
+                }
+
+                if (s.datapoints.pointsize != null)
+                    continue; // already filled in
+
+                s.datapoints.pointsize = format.length;
+                
+                ps = s.datapoints.pointsize;
+                points = s.datapoints.points;
+
+                insertSteps = s.lines.show && s.lines.steps;
+                s.xaxis.used = s.yaxis.used = true;
+                
+                for (j = k = 0; j < data.length; ++j, k += ps) {
+                    p = data[j];
+
+                    var nullify = p == null;
+                    if (!nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = p[m];
+                            f = format[m];
+
+                            if (f) {
+                                if (f.number && val != null) {
+                                    val = +val; // convert to number
+                                    if (isNaN(val))
+                                        val = null;
+                                    else if (val == Infinity)
+                                        val = fakeInfinity;
+                                    else if (val == -Infinity)
+                                        val = -fakeInfinity;
+                                }
+
+                                if (val == null) {
+                                    if (f.required)
+                                        nullify = true;
+                                    
+                                    if (f.defaultValue != null)
+                                        val = f.defaultValue;
+                                }
+                            }
+                            
+                            points[k + m] = val;
+                        }
+                    }
+                    
+                    if (nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = points[k + m];
+                            if (val != null) {
+                                f = format[m];
+                                // extract min/max info
+                                if (f.x)
+                                    updateAxis(s.xaxis, val, val);
+                                if (f.y)
+                                    updateAxis(s.yaxis, val, val);
+                            }
+                            points[k + m] = null;
+                        }
+                    }
+                    else {
+                        // a little bit of line specific stuff that
+                        // perhaps shouldn't be here, but lacking
+                        // better means...
+                        if (insertSteps && k > 0
+                            && points[k - ps] != null
+                            && points[k - ps] != points[k]
+                            && points[k - ps + 1] != points[k + 1]) {
+                            // copy the point to make room for a middle point
+                            for (m = 0; m < ps; ++m)
+                                points[k + ps + m] = points[k + m];
+
+                            // middle point has same y
+                            points[k + 1] = points[k - ps + 1];
+
+                            // we've added a point, better reflect that
+                            k += ps;
+                        }
+                    }
+                }
+            }
+
+            // give the hooks a chance to run
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                
+                executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+            }
+
+            // second pass: find datamax/datamin for auto-scaling
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                points = s.datapoints.points,
+                ps = s.datapoints.pointsize;
+
+                var xmin = topSentry, ymin = topSentry,
+                    xmax = bottomSentry, ymax = bottomSentry;
+                
+                for (j = 0; j < points.length; j += ps) {
+                    if (points[j] == null)
+                        continue;
+
+                    for (m = 0; m < ps; ++m) {
+                        val = points[j + m];
+                        f = format[m];
+                        if (!f || val == fakeInfinity || val == -fakeInfinity)
+                            continue;
+                        
+                        if (f.x) {
+                            if (val < xmin)
+                                xmin = val;
+                            if (val > xmax)
+                                xmax = val;
+                        }
+                        if (f.y) {
+                            if (val < ymin)
+                                ymin = val;
+                            if (val > ymax)
+                                ymax = val;
+                        }
+                    }
+                }
+                
+                if (s.bars.show) {
+                    // make sure we got room for the bar on the dancing floor
+                    var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2;
+                    if (s.bars.horizontal) {
+                        ymin += delta;
+                        ymax += delta + s.bars.barWidth;
+                    }
+                    else {
+                        xmin += delta;
+                        xmax += delta + s.bars.barWidth;
+                    }
+                }
+                
+                updateAxis(s.xaxis, xmin, xmax);
+                updateAxis(s.yaxis, ymin, ymax);
+            }
+
+            $.each(allAxes(), function (_, axis) {
+                if (axis.datamin == topSentry)
+                    axis.datamin = null;
+                if (axis.datamax == bottomSentry)
+                    axis.datamax = null;
+            });
+        }
+
+        function makeCanvas(skipPositioning, cls) {
+            var c = document.createElement('canvas');
+            c.className = cls;
+            c.width = canvasWidth;
+            c.height = canvasHeight;
+                    
+            if (!skipPositioning)
+                $(c).css({ position: 'absolute', left: 0, top: 0 });
+                
+            $(c).appendTo(placeholder);
+                
+            if (!c.getContext) // excanvas hack
+                c = window.G_vmlCanvasManager.initElement(c);
+
+            // used for resetting in case we get replotted
+            c.getContext("2d").save();
+            
+            return c;
+        }
+
+        function getCanvasDimensions() {
+            canvasWidth = placeholder.width();
+            canvasHeight = placeholder.height();
+            
+            if (canvasWidth <= 0 || canvasHeight <= 0)
+                throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight;
+        }
+
+        function resizeCanvas(c) {
+            // resizing should reset the state (excanvas seems to be
+            // buggy though)
+            if (c.width != canvasWidth)
+                c.width = canvasWidth;
+
+            if (c.height != canvasHeight)
+                c.height = canvasHeight;
+
+            // so try to get back to the initial state (even if it's
+            // gone now, this should be safe according to the spec)
+            var cctx = c.getContext("2d");
+            cctx.restore();
+
+            // and save again
+            cctx.save();
+        }
+        
+        function setupCanvases() {
+            var reused,
+                existingCanvas = placeholder.children("canvas.base"),
+                existingOverlay = placeholder.children("canvas.overlay");
+
+            if (existingCanvas.length == 0 || existingOverlay == 0) {
+                // init everything
+                
+                placeholder.html(""); // make sure placeholder is clear
+            
+                placeholder.css({ padding: 0 }); // padding messes up the positioning
+                
+                if (placeholder.css("position") == 'static')
+                    placeholder.css("position", "relative"); // for positioning labels and overlay
+
+                getCanvasDimensions();
+                
+                canvas = makeCanvas(true, "base");
+                overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features
+
+                reused = false;
+            }
+            else {
+                // reuse existing elements
+
+                canvas = existingCanvas.get(0);
+                overlay = existingOverlay.get(0);
+
+                reused = true;
+            }
+
+            ctx = canvas.getContext("2d");
+            octx = overlay.getContext("2d");
+
+            // we include the canvas in the event holder too, because IE 7
+            // sometimes has trouble with the stacking order
+            eventHolder = $([overlay, canvas]);
+
+            if (reused) {
+                // run shutdown in the old plot object
+                placeholder.data("plot").shutdown();
+
+                // reset reused canvases
+                plot.resize();
+                
+                // make sure overlay pixels are cleared (canvas is cleared when we redraw)
+                octx.clearRect(0, 0, canvasWidth, canvasHeight);
+                
+                // then whack any remaining obvious garbage left
+                eventHolder.unbind();
+                placeholder.children().not([canvas, overlay]).remove();
+            }
+
+            // save in case we get replotted
+            placeholder.data("plot", plot);
+        }
+
+        function bindEvents() {
+            // bind events
+            if (options.grid.hoverable) {
+                eventHolder.mousemove(onMouseMove);
+                eventHolder.mouseleave(onMouseLeave);
+            }
+
+            if (options.grid.clickable)
+                eventHolder.click(onClick);
+
+            executeHooks(hooks.bindEvents, [eventHolder]);
+        }
+
+        function shutdown() {
+            if (redrawTimeout)
+                clearTimeout(redrawTimeout);
+            
+            eventHolder.unbind("mousemove", onMouseMove);
+            eventHolder.unbind("mouseleave", onMouseLeave);
+            eventHolder.unbind("click", onClick);
+            
+            executeHooks(hooks.shutdown, [eventHolder]);
+        }
+
+        function setTransformationHelpers(axis) {
+            // set helper functions on the axis, assumes plot area
+            // has been computed already
+            
+            function identity(x) { return x; }
+            
+            var s, m, t = axis.options.transform || identity,
+                it = axis.options.inverseTransform;
+            
+            // precompute how much the axis is scaling a point
+            // in canvas space
+            if (axis.direction == "x") {
+                s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
+                m = Math.min(t(axis.max), t(axis.min));
+            }
+            else {
+                s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
+                s = -s;
+                m = Math.max(t(axis.max), t(axis.min));
+            }
+
+            // data point to canvas coordinate
+            if (t == identity) // slight optimization
+                axis.p2c = function (p) { return (p - m) * s; };
+            else
+                axis.p2c = function (p) { return (t(p) - m) * s; };
+            // canvas coordinate to data point
+            if (!it)
+                axis.c2p = function (c) { return m + c / s; };
+            else
+                axis.c2p = function (c) { return it(m + c / s); };
+        }
+
+        function measureTickLabels(axis) {
+            var opts = axis.options, i, ticks = axis.ticks || [], labels = [],
+                l, w = opts.labelWidth, h = opts.labelHeight, dummyDiv;
+
+            function makeDummyDiv(labels, width) {
+                return $('<div style="position:absolute;top:-10000px;' + width + 'font-size:smaller">' +
+                         '<div class="' + axis.direction + 'Axis ' + axis.direction + axis.n + 'Axis">'
+                         + labels.join("") + '</div></div>')
+                    .appendTo(placeholder);
+            }
+            
+            if (axis.direction == "x") {
+                // to avoid measuring the widths of the labels (it's slow), we
+                // construct fixed-size boxes and put the labels inside
+                // them, we don't need the exact figures and the
+                // fixed-size box content is easy to center
+                if (w == null)
+                    w = Math.floor(canvasWidth / (ticks.length > 0 ? ticks.length : 1));
+
+                // measure x label heights
+                if (h == null) {
+                    labels = [];
+                    for (i = 0; i < ticks.length; ++i) {
+                        l = ticks[i].label;
+                        if (l)
+                            labels.push('<div class="tickLabel" style="float:left;width:' + w + 'px">' + l + '</div>');
+                    }
+
+                    if (labels.length > 0) {
+                        // stick them all in the same div and measure
+                        // collective height
+                        labels.push('<div style="clear:left"></div>');
+                        dummyDiv = makeDummyDiv(labels, "width:10000px;");
+                        h = dummyDiv.height();
+                        dummyDiv.remove();
+                    }
+                }
+            }
+            else if (w == null || h == null) {
+                // calculate y label dimensions
+                for (i = 0; i < ticks.length; ++i) {
+                    l = ticks[i].label;
+                    if (l)
+                        labels.push('<div class="tickLabel">' + l + '</div>');
+                }
+                
+                if (labels.length > 0) {
+                    dummyDiv = makeDummyDiv(labels, "");
+                    if (w == null)
+                        w = dummyDiv.children().width();
+                    if (h == null)
+                        h = dummyDiv.find("div.tickLabel").height();
+                    dummyDiv.remove();
+                }
+            }
+
+            if (w == null)
+                w = 0;
+            if (h == null)
+                h = 0;
+
+            axis.labelWidth = w;
+            axis.labelHeight = h;
+        }
+
+        function allocateAxisBoxFirstPhase(axis) {
+            // find the bounding box of the axis by looking at label
+            // widths/heights and ticks, make room by diminishing the
+            // plotOffset
+
+            var lw = axis.labelWidth,
+                lh = axis.labelHeight,
+                pos = axis.options.position,
+                tickLength = axis.options.tickLength,
+                axismargin = options.grid.axisMargin,
+                padding = options.grid.labelMargin,
+                all = axis.direction == "x" ? xaxes : yaxes,
+                index;
+
+            // determine axis margin
+            var samePosition = $.grep(all, function (a) {
+                return a && a.options.position == pos && a.reserveSpace;
+            });
+            if ($.inArray(axis, samePosition) == samePosition.length - 1)
+                axismargin = 0; // outermost
+
+            // determine tick length - if we're innermost, we can use "full"
+            if (tickLength == null)
+                tickLength = "full";
+
+            var sameDirection = $.grep(all, function (a) {
+                return a && a.reserveSpace;
+            });
+
+            var innermost = $.inArray(axis, sameDirection) == 0;
+            if (!innermost && tickLength == "full")
+                tickLength = 5;
+                
+            if (!isNaN(+tickLength))
+                padding += +tickLength;
+
+            // compute box
+            if (axis.direction == "x") {
+                lh += padding;
+                
+                if (pos == "bottom") {
+                    plotOffset.bottom += lh + axismargin;
+                    axis.box = { top: canvasHeight - plotOffset.bottom, height: lh };
+                }
+                else {
+                    axis.box = { top: plotOffset.top + axismargin, height: lh };
+                    plotOffset.top += lh + axismargin;
+                }
+            }
+            else {
+                lw += padding;
+                
+                if (pos == "left") {
+                    axis.box = { left: plotOffset.left + axismargin, width: lw };
+                    plotOffset.left += lw + axismargin;
+                }
+                else {
+                    plotOffset.right += lw + axismargin;
+                    axis.box = { left: canvasWidth - plotOffset.right, width: lw };
+                }
+            }
+
+             // save for future reference
+            axis.position = pos;
+            axis.tickLength = tickLength;
+            axis.box.padding = padding;
+            axis.innermost = innermost;
+        }
+
+        function allocateAxisBoxSecondPhase(axis) {
+            // set remaining bounding box coordinates
+            if (axis.direction == "x") {
+                axis.box.left = plotOffset.left;
+                axis.box.width = plotWidth;
+            }
+            else {
+                axis.box.top = plotOffset.top;
+                axis.box.height = plotHeight;
+            }
+        }
+        
+        function setupGrid() {
+            var i, axes = allAxes();
+
+            // first calculate the plot and axis box dimensions
+
+            $.each(axes, function (_, axis) {
+                axis.show = axis.options.show;
+                if (axis.show == null)
+                    axis.show = axis.used; // by default an axis is visible if it's got data
+                
+                axis.reserveSpace = axis.show || axis.options.reserveSpace;
+
+                setRange(axis);
+            });
+
+            allocatedAxes = $.grep(axes, function (axis) { return axis.reserveSpace; });
+
+            plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
+            if (options.grid.show) {
+                $.each(allocatedAxes, function (_, axis) {
+                    // make the ticks
+                    setupTickGeneration(axis);
+                    setTicks(axis);
+                    snapRangeToTicks(axis, axis.ticks);
+
+                    // find labelWidth/Height for axis
+                    measureTickLabels(axis);
+                });
+
+                // with all dimensions in house, we can compute the
+                // axis boxes, start from the outside (reverse order)
+                for (i = allocatedAxes.length - 1; i >= 0; --i)
+                    allocateAxisBoxFirstPhase(allocatedAxes[i]);
+
+                // make sure we've got enough space for things that
+                // might stick out
+                var minMargin = options.grid.minBorderMargin;
+                if (minMargin == null) {
+                    minMargin = 0;
+                    for (i = 0; i < series.length; ++i)
+                        minMargin = Math.max(minMargin, series[i].points.radius + series[i].points.lineWidth/2);
+                }
+                    
+                for (var a in plotOffset) {
+                    plotOffset[a] += options.grid.borderWidth;
+                    plotOffset[a] = Math.max(minMargin, plotOffset[a]);
+                }
+            }
+            
+            plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
+            plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
+
+            // now we got the proper plotWidth/Height, we can compute the scaling
+            $.each(axes, function (_, axis) {
+                setTransformationHelpers(axis);
+            });
+
+            if (options.grid.show) {
+                $.each(allocatedAxes, function (_, axis) {
+                    allocateAxisBoxSecondPhase(axis);
+                });
+
+                insertAxisLabels();
+            }
+            
+            insertLegend();
+        }
+        
+        function setRange(axis) {
+            var opts = axis.options,
+                min = +(opts.min != null ? opts.min : axis.datamin),
+                max = +(opts.max != null ? opts.max : axis.datamax),
+                delta = max - min;
+
+            if (delta == 0.0) {
+                // degenerate case
+                var widen = max == 0 ? 1 : 0.01;
+
+                if (opts.min == null)
+                    min -= widen;
+                // always widen max if we couldn't widen min to ensure we
+                // don't fall into min == max which doesn't work
+                if (opts.max == null || opts.min != null)
+                    max += widen;
+            }
+            else {
+                // consider autoscaling
+                var margin = opts.autoscaleMargin;
+                if (margin != null) {
+                    if (opts.min == null) {
+                        min -= delta * margin;
+                        // make sure we don't go below zero if all values
+                        // are positive
+                        if (min < 0 && axis.datamin != null && axis.datamin >= 0)
+                            min = 0;
+                    }
+                    if (opts.max == null) {
+                        max += delta * margin;
+                        if (max > 0 && axis.datamax != null && axis.datamax <= 0)
+                            max = 0;
+                    }
+                }
+            }
+            axis.min = min;
+            axis.max = max;
+        }
+
+        function setupTickGeneration(axis) {
+            var opts = axis.options;
+                
+            // estimate number of ticks
+            var noTicks;
+            if (typeof opts.ticks == "number" && opts.ticks > 0)
+                noTicks = opts.ticks;
+            else
+                // heuristic based on the model a*sqrt(x) fitted to
+                // some data points that seemed reasonable
+                noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? canvasWidth : canvasHeight);
+
+            var delta = (axis.max - axis.min) / noTicks,
+                size, generator, unit, formatter, i, magn, norm;
+
+            if (opts.mode == "time") {
+                // pretty handling of time
+                
+                // map of app. size of time units in milliseconds
+                var timeUnitSize = {
+                    "second": 1000,
+                    "minute": 60 * 1000,
+                    "hour": 60 * 60 * 1000,
+                    "day": 24 * 60 * 60 * 1000,
+                    "month": 30 * 24 * 60 * 60 * 1000,
+                    "year": 365.2425 * 24 * 60 * 60 * 1000
+                };
+
+
+                // the allowed tick sizes, after 1 year we use
+                // an integer algorithm
+                var spec = [
+                    [1, "second"], [2, "second"], [5, "second"], [10, "second"],
+                    [30, "second"], 
+                    [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
+                    [30, "minute"], 
+                    [1, "hour"], [2, "hour"], [4, "hour"],
+                    [8, "hour"], [12, "hour"],
+                    [1, "day"], [2, "day"], [3, "day"],
+                    [0.25, "month"], [0.5, "month"], [1, "month"],
+                    [2, "month"], [3, "month"], [6, "month"],
+                    [1, "year"]
+                ];
+
+                var minSize = 0;
+                if (opts.minTickSize != null) {
+                    if (typeof opts.tickSize == "number")
+                        minSize = opts.tickSize;
+                    else
+                        minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]];
+                }
+
+                for (var i = 0; i < spec.length - 1; ++i)
+                    if (delta < (spec[i][0] * timeUnitSize[spec[i][1]]
+                                 + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
+                       && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize)
+                        break;
+                size = spec[i][0];
+                unit = spec[i][1];
+                
+                // special-case the possibility of several years
+                if (unit == "year") {
+                    magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10));
+                    norm = (delta / timeUnitSize.year) / magn;
+                    if (norm < 1.5)
+                        size = 1;
+                    else if (norm < 3)
+                        size = 2;
+                    else if (norm < 7.5)
+                        size = 5;
+                    else
+                        size = 10;
+
+                    size *= magn;
+                }
+
+                axis.tickSize = opts.tickSize || [size, unit];
+                
+                generator = function(axis) {
+                    var ticks = [],
+                        tickSize = axis.tickSize[0], unit = axis.tickSize[1],
+                        d = new Date(axis.min);
+                    
+                    var step = tickSize * timeUnitSize[unit];
+
+                    if (unit == "second")
+                        d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize));
+                    if (unit == "minute")
+                        d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize));
+                    if (unit == "hour")
+                        d.setUTCHours(floorInBase(d.getUTCHours(), tickSize));
+                    if (unit == "month")
+                        d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
+                    if (unit == "year")
+                        d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
+                    
+                    // reset smaller components
+                    d.setUTCMilliseconds(0);
+                    if (step >= timeUnitSize.minute)
+                        d.setUTCSeconds(0);
+                    if (step >= timeUnitSize.hour)
+                        d.setUTCMinutes(0);
+                    if (step >= timeUnitSize.day)
+                        d.setUTCHours(0);
+                    if (step >= timeUnitSize.day * 4)
+                        d.setUTCDate(1);
+                    if (step >= timeUnitSize.year)
+                        d.setUTCMonth(0);
+
+
+                    var carry = 0, v = Number.NaN, prev;
+                    do {
+                        prev = v;
+                        v = d.getTime();
+                        ticks.push(v);
+                        if (unit == "month") {
+                            if (tickSize < 1) {
+                                // a bit complicated - we'll divide the month
+                                // up but we need to take care of fractions
+                                // so we don't end up in the middle of a day
+                                d.setUTCDate(1);
+                                var start = d.getTime();
+                                d.setUTCMonth(d.getUTCMonth() + 1);
+                                var end = d.getTime();
+                                d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
+                                carry = d.getUTCHours();
+                                d.setUTCHours(0);
+                            }
+                            else
+                                d.setUTCMonth(d.getUTCMonth() + tickSize);
+                        }
+                        else if (unit == "year") {
+                            d.setUTCFullYear(d.getUTCFullYear() + tickSize);
+                        }
+                        else
+                            d.setTime(v + step);
+                    } while (v < axis.max && v != prev);
+
+                    return ticks;
+                };
+
+                formatter = function (v, axis) {
+                    var d = new Date(v);
+
+                    // first check global format
+                    if (opts.timeformat != null)
+                        return $.plot.formatDate(d, opts.timeformat, opts.monthNames);
+                    
+                    var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+                    var span = axis.max - axis.min;
+                    var suffix = (opts.twelveHourClock) ? " %p" : "";
+                    
+                    if (t < timeUnitSize.minute)
+                        fmt = "%h:%M:%S" + suffix;
+                    else if (t < timeUnitSize.day) {
+                        if (span < 2 * timeUnitSize.day)
+                            fmt = "%h:%M" + suffix;
+                        else
+                            fmt = "%b %d %h:%M" + suffix;
+                    }
+                    else if (t < timeUnitSize.month)
+                        fmt = "%b %d";
+                    else if (t < timeUnitSize.year) {
+                        if (span < timeUnitSize.year)
+                            fmt = "%b";
+                        else
+                            fmt = "%b %y";
+                    }
+                    else
+                        fmt = "%y";
+                    
+                    return $.plot.formatDate(d, fmt, opts.monthNames);
+                };
+            }
+            else {
+                // pretty rounding of base-10 numbers
+                var maxDec = opts.tickDecimals;
+                var dec = -Math.floor(Math.log(delta) / Math.LN10);
+                if (maxDec != null && dec > maxDec)
+                    dec = maxDec;
+
+                magn = Math.pow(10, -dec);
+                norm = delta / magn; // norm is between 1.0 and 10.0
+                
+                if (norm < 1.5)
+                    size = 1;
+                else if (norm < 3) {
+                    size = 2;
+                    // special case for 2.5, requires an extra decimal
+                    if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+                        size = 2.5;
+                        ++dec;
+                    }
+                }
+                else if (norm < 7.5)
+                    size = 5;
+                else
+                    size = 10;
+
+                size *= magn;
+                
+                if (opts.minTickSize != null && size < opts.minTickSize)
+                    size = opts.minTickSize;
+
+                axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
+                axis.tickSize = opts.tickSize || size;
+
+                generator = function (axis) {
+                    var ticks = [];
+
+                    // spew out all possible ticks
+                    var start = floorInBase(axis.min, axis.tickSize),
+                        i = 0, v = Number.NaN, prev;
+                    do {
+                        prev = v;
+                        v = start + i * axis.tickSize;
+                        ticks.push(v);
+                        ++i;
+                    } while (v < axis.max && v != prev);
+                    return ticks;
+                };
+
+                formatter = function (v, axis) {
+                    return v.toFixed(axis.tickDecimals);
+                };
+            }
+
+            if (opts.alignTicksWithAxis != null) {
+                var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1];
+                if (otherAxis && otherAxis.used && otherAxis != axis) {
+                    // consider snapping min/max to outermost nice ticks
+                    var niceTicks = generator(axis);
+                    if (niceTicks.length > 0) {
+                        if (opts.min == null)
+                            axis.min = Math.min(axis.min, niceTicks[0]);
+                        if (opts.max == null && niceTicks.length > 1)
+                            axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]);
+                    }
+                    
+                    generator = function (axis) {
+                        // copy ticks, scaled to this axis
+                        var ticks = [], v, i;
+                        for (i = 0; i < otherAxis.ticks.length; ++i) {
+                            v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min);
+                            v = axis.min + v * (axis.max - axis.min);
+                            ticks.push(v);
+                        }
+                        return ticks;
+                    };
+                    
+                    // we might need an extra decimal since forced
+                    // ticks don't necessarily fit naturally
+                    if (axis.mode != "time" && opts.tickDecimals == null) {
+                        var extraDec = Math.max(0, -Math.floor(Math.log(delta) / Math.LN10) + 1),
+                            ts = generator(axis);
+
+                        // only proceed if the tick interval rounded
+                        // with an extra decimal doesn't give us a
+                        // zero at end
+                        if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec))))
+                            axis.tickDecimals = extraDec;
+                    }
+                }
+            }
+
+            axis.tickGenerator = generator;
+            if ($.isFunction(opts.tickFormatter))
+                axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); };
+            else
+                axis.tickFormatter = formatter;
+        }
+        
+        function setTicks(axis) {
+            var oticks = axis.options.ticks, ticks = [];
+            if (oticks == null || (typeof oticks == "number" && oticks > 0))
+                ticks = axis.tickGenerator(axis);
+            else if (oticks) {
+                if ($.isFunction(oticks))
+                    // generate the ticks
+                    ticks = oticks({ min: axis.min, max: axis.max });
+                else
+                    ticks = oticks;
+            }
+
+            // clean up/labelify the supplied ticks, copy them over
+            var i, v;
+            axis.ticks = [];
+            for (i = 0; i < ticks.length; ++i) {
+                var label = null;
+                var t = ticks[i];
+                if (typeof t == "object") {
+                    v = +t[0];
+                    if (t.length > 1)
+                        label = t[1];
+                }
+                else
+                    v = +t;
+                if (label == null)
+                    label = axis.tickFormatter(v, axis);
+                if (!isNaN(v))
+                    axis.ticks.push({ v: v, label: label });
+            }
+        }
+
+        function snapRangeToTicks(axis, ticks) {
+            if (axis.options.autoscaleMargin && ticks.length > 0) {
+                // snap to ticks
+                if (axis.options.min == null)
+                    axis.min = Math.min(axis.min, ticks[0].v);
+                if (axis.options.max == null && ticks.length > 1)
+                    axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
+            }
+        }
+      
+        function draw() {
+            ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+            var grid = options.grid;
+
+            // draw background, if any
+            if (grid.show && grid.backgroundColor)
+                drawBackground();
+            
+            if (grid.show && !grid.aboveData)
+                drawGrid();
+
+            for (var i = 0; i < series.length; ++i) {
+                executeHooks(hooks.drawSeries, [ctx, series[i]]);
+                drawSeries(series[i]);
+            }
+
+            executeHooks(hooks.draw, [ctx]);
+            
+            if (grid.show && grid.aboveData)
+                drawGrid();
+        }
+
+        function extractRange(ranges, coord) {
+            var axis, from, to, key, axes = allAxes();
+
+            for (i = 0; i < axes.length; ++i) {
+                axis = axes[i];
+                if (axis.direction == coord) {
+                    key = coord + axis.n + "axis";
+                    if (!ranges[key] && axis.n == 1)
+                        key = coord + "axis"; // support x1axis as xaxis
+                    if (ranges[key]) {
+                        from = ranges[key].from;
+                        to = ranges[key].to;
+                        break;
+                    }
+                }
+            }
+
+            // backwards-compat stuff - to be removed in future
+            if (!ranges[key]) {
+                axis = coord == "x" ? xaxes[0] : yaxes[0];
+                from = ranges[coord + "1"];
+                to = ranges[coord + "2"];
+            }
+
+            // auto-reverse as an added bonus
+            if (from != null && to != null && from > to) {
+                var tmp = from;
+                from = to;
+                to = tmp;
+            }
+            
+            return { from: from, to: to, axis: axis };
+        }
+        
+        function drawBackground() {
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+            ctx.fillRect(0, 0, plotWidth, plotHeight);
+            ctx.restore();
+        }
+
+        function drawGrid() {
+            var i;
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // draw markings
+            var markings = options.grid.markings;
+            if (markings) {
+                if ($.isFunction(markings)) {
+                    var axes = plot.getAxes();
+                    // xmin etc. is backwards compatibility, to be
+                    // removed in the future
+                    axes.xmin = axes.xaxis.min;
+                    axes.xmax = axes.xaxis.max;
+                    axes.ymin = axes.yaxis.min;
+                    axes.ymax = axes.yaxis.max;
+                    
+                    markings = markings(axes);
+                }
+
+                for (i = 0; i < markings.length; ++i) {
+                    var m = markings[i],
+                        xrange = extractRange(m, "x"),
+                        yrange = extractRange(m, "y");
+
+                    // fill in missing
+                    if (xrange.from == null)
+                        xrange.from = xrange.axis.min;
+                    if (xrange.to == null)
+                        xrange.to = xrange.axis.max;
+                    if (yrange.from == null)
+                        yrange.from = yrange.axis.min;
+                    if (yrange.to == null)
+                        yrange.to = yrange.axis.max;
+
+                    // clip
+                    if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
+                        yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
+                        continue;
+
+                    xrange.from = Math.max(xrange.from, xrange.axis.min);
+                    xrange.to = Math.min(xrange.to, xrange.axis.max);
+                    yrange.from = Math.max(yrange.from, yrange.axis.min);
+                    yrange.to = Math.min(yrange.to, yrange.axis.max);
+
+                    if (xrange.from == xrange.to && yrange.from == yrange.to)
+                        continue;
+
+                    // then draw
+                    xrange.from = xrange.axis.p2c(xrange.from);
+                    xrange.to = xrange.axis.p2c(xrange.to);
+                    yrange.from = yrange.axis.p2c(yrange.from);
+                    yrange.to = yrange.axis.p2c(yrange.to);
+                    
+                    if (xrange.from == xrange.to || yrange.from == yrange.to) {
+                        // draw line
+                        ctx.beginPath();
+                        ctx.strokeStyle = m.color || options.grid.markingsColor;
+                        ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth;
+                        ctx.moveTo(xrange.from, yrange.from);
+                        ctx.lineTo(xrange.to, yrange.to);
+                        ctx.stroke();
+                    }
+                    else {
+                        // fill area
+                        ctx.fillStyle = m.color || options.grid.markingsColor;
+                        ctx.fillRect(xrange.from, yrange.to,
+                                     xrange.to - xrange.from,
+                                     yrange.from - yrange.to);
+                    }
+                }
+            }
+            
+            // draw the ticks
+            var axes = allAxes(), bw = options.grid.borderWidth;
+
+            for (var j = 0; j < axes.length; ++j) {
+                var axis = axes[j], box = axis.box,
+                    t = axis.tickLength, x, y, xoff, yoff;
+                if (!axis.show || axis.ticks.length == 0)
+                    continue
+                
+                ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString();
+                ctx.lineWidth = 1;
+
+                // find the edges
+                if (axis.direction == "x") {
+                    x = 0;
+                    if (t == "full")
+                        y = (axis.position == "top" ? 0 : plotHeight);
+                    else
+                        y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0);
+                }
+                else {
+                    y = 0;
+                    if (t == "full")
+                        x = (axis.position == "left" ? 0 : plotWidth);
+                    else
+                        x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0);
+                }
+                
+                // draw tick bar
+                if (!axis.innermost) {
+                    ctx.beginPath();
+                    xoff = yoff = 0;
+                    if (axis.direction == "x")
+                        xoff = plotWidth;
+                    else
+                        yoff = plotHeight;
+                    
+                    if (ctx.lineWidth == 1) {
+                        x = Math.floor(x) + 0.5;
+                        y = Math.floor(y) + 0.5;
+                    }
+
+                    ctx.moveTo(x, y);
+                    ctx.lineTo(x + xoff, y + yoff);
+                    ctx.stroke();
+                }
+
+                // draw ticks
+                ctx.beginPath();
+                for (i = 0; i < axis.ticks.length; ++i) {
+                    var v = axis.ticks[i].v;
+                    
+                    xoff = yoff = 0;
+
+                    if (v < axis.min || v > axis.max
+                        // skip those lying on the axes if we got a border
+                        || (t == "full" && bw > 0
+                            && (v == axis.min || v == axis.max)))
+                        continue;
+
+                    if (axis.direction == "x") {
+                        x = axis.p2c(v);
+                        yoff = t == "full" ? -plotHeight : t;
+                        
+                        if (axis.position == "top")
+                            yoff = -yoff;
+                    }
+                    else {
+                        y = axis.p2c(v);
+                        xoff = t == "full" ? -plotWidth : t;
+                        
+                        if (axis.position == "left")
+                            xoff = -xoff;
+                    }
+
+                    if (ctx.lineWidth == 1) {
+                        if (axis.direction == "x")
+                            x = Math.floor(x) + 0.5;
+                        else
+                            y = Math.floor(y) + 0.5;
+                    }
+
+                    ctx.moveTo(x, y);
+                    ctx.lineTo(x + xoff, y + yoff);
+                }
+                
+                ctx.stroke();
+            }
+            
+            
+            // draw border
+            if (bw) {
+                ctx.lineWidth = bw;
+                ctx.strokeStyle = options.grid.borderColor;
+                ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
+            }
+
+            ctx.restore();
+        }
+
+        function insertAxisLabels() {
+            placeholder.find(".tickLabels").remove();
+            
+            var html = ['<div class="tickLabels" style="font-size:smaller">'];
+
+            var axes = allAxes();
+            for (var j = 0; j < axes.length; ++j) {
+                var axis = axes[j], box = axis.box;
+                if (!axis.show)
+                    continue;
+                //debug: html.push('<div style="position:absolute;opacity:0.10;background-color:red;left:' + box.left + 'px;top:' + box.top + 'px;width:' + box.width +  'px;height:' + box.height + 'px"></div>')
+                html.push('<div class="' + axis.direction + 'Axis ' + axis.direction + axis.n + 'Axis" style="color:' + axis.options.color + '">');
+                for (var i = 0; i < axis.ticks.length; ++i) {
+                    var tick = axis.ticks[i];
+                    if (!tick.label || tick.v < axis.min || tick.v > axis.max)
+                        continue;
+
+                    var pos = {}, align;
+                    
+                    if (axis.direction == "x") {
+                        align = "center";
+                        pos.left = Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2);
+                        if (axis.position == "bottom")
+                            pos.top = box.top + box.padding;
+                        else
+                            pos.bottom = canvasHeight - (box.top + box.height - box.padding);
+                    }
+                    else {
+                        pos.top = Math.round(plotOffset.top + axis.p2c(tick.v) - axis.labelHeight/2);
+                        if (axis.position == "left") {
+                            pos.right = canvasWidth - (box.left + box.width - box.padding)
+                            align = "right";
+                        }
+                        else {
+                            pos.left = box.left + box.padding;
+                            align = "left";
+                        }
+                    }
+
+                    pos.width = axis.labelWidth;
+
+                    var style = ["position:absolute", "text-align:" + align ];
+                    for (var a in pos)
+                        style.push(a + ":" + pos[a] + "px")
+                    
+                    html.push('<div class="tickLabel" style="' + style.join(';') + '">' + tick.label + '</div>');
+                }
+                html.push('</div>');
+            }
+
+            html.push('</div>');
+
+            placeholder.append(html.join(""));
+        }
+
+        function drawSeries(series) {
+            if (series.lines.show)
+                drawSeriesLines(series);
+            if (series.bars.show)
+                drawSeriesBars(series);
+            if (series.points.show)
+                drawSeriesPoints(series);
+        }
+        
+        function drawSeriesLines(series) {
+            function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    prevx = null, prevy = null;
+                
+                ctx.beginPath();
+                for (var i = ps; i < points.length; i += ps) {
+                    var x1 = points[i - ps], y1 = points[i - ps + 1],
+                        x2 = points[i], y2 = points[i + 1];
+                    
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min) {
+                        if (y2 < axisy.min)
+                            continue;   // line segment is outside
+                        // compute new intersection point
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min) {
+                        if (y1 < axisy.min)
+                            continue;
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max) {
+                        if (y2 > axisy.max)
+                            continue;
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max) {
+                        if (y1 > axisy.max)
+                            continue;
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (x1 != prevx || y1 != prevy)
+                        ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
+                    
+                    prevx = x2;
+                    prevy = y2;
+                    ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
+                }
+                ctx.stroke();
+            }
+
+            function plotLineArea(datapoints, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    bottom = Math.min(Math.max(0, axisy.min), axisy.max),
+                    i = 0, top, areaOpen = false,
+                    ypos = 1, segmentStart = 0, segmentEnd = 0;
+
+                // we process each segment in two turns, first forward
+                // direction to sketch out top, then once we hit the
+                // end we go backwards to sketch the bottom
+                while (true) {
+                    if (ps > 0 && i > points.length + ps)
+                        break;
+
+                    i += ps; // ps is negative if going backwards
+
+                    var x1 = points[i - ps],
+                        y1 = points[i - ps + ypos],
+                        x2 = points[i], y2 = points[i + ypos];
+
+                    if (areaOpen) {
+                        if (ps > 0 && x1 != null && x2 == null) {
+                            // at turning point
+                            segmentEnd = i;
+                            ps = -ps;
+                            ypos = 2;
+                            continue;
+                        }
+
+                        if (ps < 0 && i == segmentStart + ps) {
+                            // done with the reverse sweep
+                            ctx.fill();
+                            areaOpen = false;
+                            ps = -ps;
+                            ypos = 1;
+                            i = segmentStart = segmentEnd + ps;
+                            continue;
+                        }
+                    }
+
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip x values
+                    
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (!areaOpen) {
+                        // open area
+                        ctx.beginPath();
+                        ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
+                        areaOpen = true;
+                    }
+                    
+                    // now first check the case where both is outside
+                    if (y1 >= axisy.max && y2 >= axisy.max) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
+                        continue;
+                    }
+                    else if (y1 <= axisy.min && y2 <= axisy.min) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
+                        continue;
+                    }
+                    
+                    // else it's a bit more complicated, there might
+                    // be a flat maxed out rectangle first, then a
+                    // triangular cutout or reverse; to find these
+                    // keep track of the current x values
+                    var x1old = x1, x2old = x2;
+
+                    // clip the y values, without shortcutting, we
+                    // go through all cases in turn
+                    
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+                    // if the x value was changed we got a rectangle
+                    // to fill
+                    if (x1 != x1old) {
+                        ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
+                        // it goes to (x1, y1), but we fill that below
+                    }
+                    
+                    // fill triangular section, this sometimes result
+                    // in redundant points if (x1, y1) hasn't changed
+                    // from previous line to, but we just ignore that
+                    ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
+                    ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+
+                    // fill the other rectangle if it's there
+                    if (x2 != x2old) {
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+                        ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2));
+                    }
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+            ctx.lineJoin = "round";
+
+            var lw = series.lines.lineWidth,
+                sw = series.shadowSize;
+            // FIXME: consider another form of shadow when filling is turned on
+            if (lw > 0 && sw > 0) {
+                // draw shadow as a thick and thin line with transparency
+                ctx.lineWidth = sw;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                // position shadow at angle from the mid of line
+                var angle = Math.PI/18;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
+                ctx.lineWidth = sw/2;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
+            if (fillStyle) {
+                ctx.fillStyle = fillStyle;
+                plotLineArea(series.datapoints, series.xaxis, series.yaxis);
+            }
+
+            if (lw > 0)
+                plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function drawSeriesPoints(series) {
+            function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+
+                for (var i = 0; i < points.length; i += ps) {
+                    var x = points[i], y = points[i + 1];
+                    if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                        continue;
+                    
+                    ctx.beginPath();
+                    x = axisx.p2c(x);
+                    y = axisy.p2c(y) + offset;
+                    if (symbol == "circle")
+                        ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false);
+                    else
+                        symbol(ctx, x, y, radius, shadow);
+                    ctx.closePath();
+                    
+                    if (fillStyle) {
+                        ctx.fillStyle = fillStyle;
+                        ctx.fill();
+                    }
+                    ctx.stroke();
+                }
+            }
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            var lw = series.points.lineWidth,
+                sw = series.shadowSize,
+                radius = series.points.radius,
+                symbol = series.points.symbol;
+            if (lw > 0 && sw > 0) {
+                // draw shadow in two steps
+                var w = sw / 2;
+                ctx.lineWidth = w;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                plotPoints(series.datapoints, radius, null, w + w/2, true,
+                           series.xaxis, series.yaxis, symbol);
+
+                ctx.strokeStyle = "rgba(0,0,0,0.2)";
+                plotPoints(series.datapoints, radius, null, w/2, true,
+                           series.xaxis, series.yaxis, symbol);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            plotPoints(series.datapoints, radius,
+                       getFillStyle(series.points, series.color), 0, false,
+                       series.xaxis, series.yaxis, symbol);
+            ctx.restore();
+        }
+
+        function drawBar(x, y, b, barLeft, barRight, offset, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) {
+            var left, right, bottom, top,
+                drawLeft, drawRight, drawTop, drawBottom,
+                tmp;
+
+            // in horizontal mode, we start the bar from the left
+            // instead of from the bottom so it appears to be
+            // horizontal rather than vertical
+            if (horizontal) {
+                drawBottom = drawRight = drawTop = true;
+                drawLeft = false;
+                left = b;
+                right = x;
+                top = y + barLeft;
+                bottom = y + barRight;
+
+                // account for negative bars
+                if (right < left) {
+                    tmp = right;
+                    right = left;
+                    left = tmp;
+                    drawLeft = true;
+                    drawRight = false;
+                }
+            }
+            else {
+                drawLeft = drawRight = drawTop = true;
+                drawBottom = false;
+                left = x + barLeft;
+                right = x + barRight;
+                bottom = b;
+                top = y;
+
+                // account for negative bars
+                if (top < bottom) {
+                    tmp = top;
+                    top = bottom;
+                    bottom = tmp;
+                    drawBottom = true;
+                    drawTop = false;
+                }
+            }
+           
+            // clip
+            if (right < axisx.min || left > axisx.max ||
+                top < axisy.min || bottom > axisy.max)
+                return;
+            
+            if (left < axisx.min) {
+                left = axisx.min;
+                drawLeft = false;
+            }
+
+            if (right > axisx.max) {
+                right = axisx.max;
+                drawRight = false;
+            }
+
+            if (bottom < axisy.min) {
+                bottom = axisy.min;
+                drawBottom = false;
+            }
+            
+            if (top > axisy.max) {
+                top = axisy.max;
+                drawTop = false;
+            }
+
+            left = axisx.p2c(left);
+            bottom = axisy.p2c(bottom);
+            right = axisx.p2c(right);
+            top = axisy.p2c(top);
+            
+            // fill the bar
+            if (fillStyleCallback) {
+                c.beginPath();
+                c.moveTo(left, bottom);
+                c.lineTo(left, top);
+                c.lineTo(right, top);
+                c.lineTo(right, bottom);
+                c.fillStyle = fillStyleCallback(bottom, top);
+                c.fill();
+            }
+
+            // draw outline
+            if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) {
+                c.beginPath();
+
+                // FIXME: inline moveTo is buggy with excanvas
+                c.moveTo(left, bottom + offset);
+                if (drawLeft)
+                    c.lineTo(left, top + offset);
+                else
+                    c.moveTo(left, top + offset);
+                if (drawTop)
+                    c.lineTo(right, top + offset);
+                else
+                    c.moveTo(right, top + offset);
+                if (drawRight)
+                    c.lineTo(right, bottom + offset);
+                else
+                    c.moveTo(right, bottom + offset);
+                if (drawBottom)
+                    c.lineTo(left, bottom + offset);
+                else
+                    c.moveTo(left, bottom + offset);
+                c.stroke();
+            }
+        }
+        
+        function drawSeriesBars(series) {
+            function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+                
+                for (var i = 0; i < points.length; i += ps) {
+                    if (points[i] == null)
+                        continue;
+                    drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth);
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // FIXME: figure out a way to add shadows (for instance along the right edge)
+            ctx.lineWidth = series.bars.lineWidth;
+            ctx.strokeStyle = series.color;
+            var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2;
+            var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
+            plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, 0, fillStyleCallback, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function getFillStyle(filloptions, seriesColor, bottom, top) {
+            var fill = filloptions.fill;
+            if (!fill)
+                return null;
+
+            if (filloptions.fillColor)
+                return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
+            
+            var c = $.color.parse(seriesColor);
+            c.a = typeof fill == "number" ? fill : 0.4;
+            c.normalize();
+            return c.toString();
+        }
+        
+        function insertLegend() {
+            placeholder.find(".legend").remove();
+
+            if (!options.legend.show)
+                return;
+            
+            var fragments = [], rowStarted = false,
+                lf = options.legend.labelFormatter, s, label;
+            for (var i = 0; i < series.length; ++i) {
+                s = series[i];
+                label = s.label;
+                if (!label)
+                    continue;
+                
+                if (i % options.legend.noColumns == 0) {
+                    if (rowStarted)
+                        fragments.push('</tr>');
+                    fragments.push('<tr>');
+                    rowStarted = true;
+                }
+
+                if (lf)
+                    label = lf(label, s);
+                
+                fragments.push(
+                    '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + s.color + ';overflow:hidden"></div></div></td>' +
+                    '<td class="legendLabel">' + label + '</td>');
+            }
+            if (rowStarted)
+                fragments.push('</tr>');
+            
+            if (fragments.length == 0)
+                return;
+
+            var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>';
+            if (options.legend.container != null)
+                $(options.legend.container).html(table);
+            else {
+                var pos = "",
+                    p = options.legend.position,
+                    m = options.legend.margin;
+                if (m[0] == null)
+                    m = [m, m];
+                if (p.charAt(0) == "n")
+                    pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
+                else if (p.charAt(0) == "s")
+                    pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
+                if (p.charAt(1) == "e")
+                    pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
+                else if (p.charAt(1) == "w")
+                    pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
+                var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
+                if (options.legend.backgroundOpacity != 0.0) {
+                    // put in the transparent background
+                    // separately to avoid blended labels and
+                    // label boxes
+                    var c = options.legend.backgroundColor;
+                    if (c == null) {
+                        c = options.grid.backgroundColor;
+                        if (c && typeof c == "string")
+                            c = $.color.parse(c);
+                        else
+                            c = $.color.extract(legend, 'background-color');
+                        c.a = 1;
+                        c = c.toString();
+                    }
+                    var div = legend.children();
+                    $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
+                }
+            }
+        }
+
+
+        // interactive features
+        
+        var highlights = [],
+            redrawTimeout = null;
+        
+        // returns the data item the mouse is over, or null if none is found
+        function findNearbyItem(mouseX, mouseY, seriesFilter) {
+            var maxDistance = options.grid.mouseActiveRadius,
+                smallestDistance = maxDistance * maxDistance + 1,
+                item = null, foundPoint = false, i, j;
+
+            for (i = series.length - 1; i >= 0; --i) {
+                if (!seriesFilter(series[i]))
+                    continue;
+                
+                var s = series[i],
+                    axisx = s.xaxis,
+                    axisy = s.yaxis,
+                    points = s.datapoints.points,
+                    ps = s.datapoints.pointsize,
+                    mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
+                    my = axisy.c2p(mouseY),
+                    maxx = maxDistance / axisx.scale,
+                    maxy = maxDistance / axisy.scale;
+
+                // with inverse transforms, we can't use the maxx/maxy
+                // optimization, sadly
+                if (axisx.options.inverseTransform)
+                    maxx = Number.MAX_VALUE;
+                if (axisy.options.inverseTransform)
+                    maxy = Number.MAX_VALUE;
+                
+                if (s.lines.show || s.points.show) {
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1];
+                        if (x == null)
+                            continue;
+                        
+                        // For points and lines, the cursor must be within a
+                        // certain distance to the data point
+                        if (x - mx > maxx || x - mx < -maxx ||
+                            y - my > maxy || y - my < -maxy)
+                            continue;
+
+                        // We have to calculate distances in pixels, not in
+                        // data units, because the scales of the axes may be different
+                        var dx = Math.abs(axisx.p2c(x) - mouseX),
+                            dy = Math.abs(axisy.p2c(y) - mouseY),
+                            dist = dx * dx + dy * dy; // we save the sqrt
+
+                        // use <= to ensure last point takes precedence
+                        // (last generally means on top of)
+                        if (dist < smallestDistance) {
+                            smallestDistance = dist;
+                            item = [i, j / ps];
+                        }
+                    }
+                }
+                    
+                if (s.bars.show && !item) { // no other point can be nearby
+                    var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2,
+                        barRight = barLeft + s.bars.barWidth;
+                    
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1], b = points[j + 2];
+                        if (x == null)
+                            continue;
+  
+                        // for a bar graph, the cursor must be inside the bar
+                        if (series[i].bars.horizontal ? 
+                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) && 
+                             my >= y + barLeft && my <= y + barRight) :
+                            (mx >= x + barLeft && mx <= x + barRight &&
+                             my >= Math.min(b, y) && my <= Math.max(b, y)))
+                                item = [i, j / ps];
+                    }
+                }
+            }
+
+            if (item) {
+                i = item[0];
+                j = item[1];
+                ps = series[i].datapoints.pointsize;
+                
+                return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
+                         dataIndex: j,
+                         series: series[i],
+                         seriesIndex: i };
+            }
+            
+            return null;
+        }
+
+        function onMouseMove(e) {
+            if (options.grid.hoverable)
+                triggerClickHoverEvent("plothover", e,
+                                       function (s) { return s["hoverable"] != false; });
+        }
+
+        function onMouseLeave(e) {
+            if (options.grid.hoverable)
+                triggerClickHoverEvent("plothover", e,
+                                       function (s) { return false; });
+        }
+
+        function onClick(e) {
+            triggerClickHoverEvent("plotclick", e,
+                                   function (s) { return s["clickable"] != false; });
+        }
+
+        // trigger click or hover event (they send the same parameters
+        // so we share their code)
+        function triggerClickHoverEvent(eventname, event, seriesFilter) {
+            var offset = eventHolder.offset(),
+                canvasX = event.pageX - offset.left - plotOffset.left,
+                canvasY = event.pageY - offset.top - plotOffset.top,
+            pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
+
+            pos.pageX = event.pageX;
+            pos.pageY = event.pageY;
+
+            var item = findNearbyItem(canvasX, canvasY, seriesFilter);
+
+            if (item) {
+                // fill in mouse pos for any listeners out there
+                item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left);
+                item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top);
+            }
+
+            if (options.grid.autoHighlight) {
+                // clear auto-highlights
+                for (var i = 0; i < highlights.length; ++i) {
+                    var h = highlights[i];
+                    if (h.auto == eventname &&
+                        !(item && h.series == item.series &&
+                          h.point[0] == item.datapoint[0] &&
+                          h.point[1] == item.datapoint[1]))
+                        unhighlight(h.series, h.point);
+                }
+                
+                if (item)
+                    highlight(item.series, item.datapoint, eventname);
+            }
+            
+            placeholder.trigger(eventname, [ pos, item ]);
+        }
+
+        function triggerRedrawOverlay() {
+            if (!redrawTimeout)
+                redrawTimeout = setTimeout(drawOverlay, 30);
+        }
+
+        function drawOverlay() {
+            redrawTimeout = null;
+
+            // draw highlights
+            octx.save();
+            octx.clearRect(0, 0, canvasWidth, canvasHeight);
+            octx.translate(plotOffset.left, plotOffset.top);
+            
+            var i, hi;
+            for (i = 0; i < highlights.length; ++i) {
+                hi = highlights[i];
+
+                if (hi.series.bars.show)
+                    drawBarHighlight(hi.series, hi.point);
+                else
+                    drawPointHighlight(hi.series, hi.point);
+            }
+            octx.restore();
+            
+            executeHooks(hooks.drawOverlay, [octx]);
+        }
+        
+        function highlight(s, point, auto) {
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number") {
+                var ps = s.datapoints.pointsize;
+                point = s.datapoints.points.slice(ps * point, ps * (point + 1));
+            }
+
+            var i = indexOfHighlight(s, point);
+            if (i == -1) {
+                highlights.push({ series: s, point: point, auto: auto });
+
+                triggerRedrawOverlay();
+            }
+            else if (!auto)
+                highlights[i].auto = false;
+        }
+            
+        function unhighlight(s, point) {
+            if (s == null && point == null) {
+                highlights = [];
+                triggerRedrawOverlay();
+            }
+            
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number")
+                point = s.data[point];
+
+            var i = indexOfHighlight(s, point);
+            if (i != -1) {
+                highlights.splice(i, 1);
+
+                triggerRedrawOverlay();
+            }
+        }
+        
+        function indexOfHighlight(s, p) {
+            for (var i = 0; i < highlights.length; ++i) {
+                var h = highlights[i];
+                if (h.series == s && h.point[0] == p[0]
+                    && h.point[1] == p[1])
+                    return i;
+            }
+            return -1;
+        }
+        
+        function drawPointHighlight(series, point) {
+            var x = point[0], y = point[1],
+                axisx = series.xaxis, axisy = series.yaxis;
+            
+            if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                return;
+            
+            var pointRadius = series.points.radius + series.points.lineWidth / 2;
+            octx.lineWidth = pointRadius;
+            octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var radius = 1.5 * pointRadius,
+                x = axisx.p2c(x),
+                y = axisy.p2c(y);
+            
+            octx.beginPath();
+            if (series.points.symbol == "circle")
+                octx.arc(x, y, radius, 0, 2 * Math.PI, false);
+            else
+                series.points.symbol(octx, x, y, radius, false);
+            octx.closePath();
+            octx.stroke();
+        }
+
+        function drawBarHighlight(series, point) {
+            octx.lineWidth = series.bars.lineWidth;
+            octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var fillStyle = $.color.parse(series.color).scale('a', 0.5).toString();
+            var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2;
+            drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
+                    0, function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
+        }
+
+        function getColorOrGradient(spec, bottom, top, defaultColor) {
+            if (typeof spec == "string")
+                return spec;
+            else {
+                // assume this is a gradient spec; IE currently only
+                // supports a simple vertical gradient properly, so that's
+                // what we support too
+                var gradient = ctx.createLinearGradient(0, top, 0, bottom);
+                
+                for (var i = 0, l = spec.colors.length; i < l; ++i) {
+                    var c = spec.colors[i];
+                    if (typeof c != "string") {
+                        var co = $.color.parse(defaultColor);
+                        if (c.brightness != null)
+                            co = co.scale('rgb', c.brightness)
+                        if (c.opacity != null)
+                            co.a *= c.opacity;
+                        c = co.toString();
+                    }
+                    gradient.addColorStop(i / (l - 1), c);
+                }
+                
+                return gradient;
+            }
+        }
+    }
+
+    $.plot = function(placeholder, data, options) {
+        //var t0 = new Date();
+        var plot = new Plot($(placeholder), data, options, $.plot.plugins);
+        //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
+        return plot;
+    };
+
+    $.plot.version = "0.7";
+    
+    $.plot.plugins = [];
+
+    // returns a string with the date d formatted according to fmt
+    $.plot.formatDate = function(d, fmt, monthNames) {
+        var leftPad = function(n) {
+            n = "" + n;
+            return n.length == 1 ? "0" + n : n;
+        };
+        
+        var r = [];
+        var escape = false, padNext = false;
+        var hours = d.getUTCHours();
+        var isAM = hours < 12;
+        if (monthNames == null)
+            monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        if (fmt.search(/%p|%P/) != -1) {
+            if (hours > 12) {
+                hours = hours - 12;
+            } else if (hours == 0) {
+                hours = 12;
+            }
+        }
+        for (var i = 0; i < fmt.length; ++i) {
+            var c = fmt.charAt(i);
+            
+            if (escape) {
+                switch (c) {
+                case 'h': c = "" + hours; break;
+                case 'H': c = leftPad(hours); break;
+                case 'M': c = leftPad(d.getUTCMinutes()); break;
+                case 'S': c = leftPad(d.getUTCSeconds()); break;
+                case 'd': c = "" + d.getUTCDate(); break;
+                case 'm': c = "" + (d.getUTCMonth() + 1); break;
+                case 'y': c = "" + d.getUTCFullYear(); break;
+                case 'b': c = "" + monthNames[d.getUTCMonth()]; break;
+                case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
+                case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
+                case '0': c = ""; padNext = true; break;
+                }
+                if (c && padNext) {
+                    c = leftPad(c);
+                    padNext = false;
+                }
+                r.push(c);
+                if (!padNext)
+                    escape = false;
+            }
+            else {
+                if (c == "%")
+                    escape = true;
+                else
+                    r.push(c);
+            }
+        }
+        return r.join("");
+    };
+    
+    // round to nearby lower multiple of base
+    function floorInBase(n, base) {
+        return base * Math.floor(n / base);
+    }
+    
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.min.js
@@ -1,1 +1,6 @@
-
+/* Javascript plotting library for jQuery, v. 0.7.
+ *
+ * Released under the MIT license by IOLA, December 2007.
+ *
+ */
+(function(b){b.color={};b.color.make=function(d,e,g,f){var c={};c.r=d||0;c.g=e||0;c.b=g||0;c.a=f!=null?f:1;c.add=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]+=j}return c.normalize()};c.scale=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]*=j}return c.normalize()};c.toString=function(){if(c.a>=1){return"rgb("+[c.r,c.g,c.b].join(",")+")"}else{return"rgba("+[c.r,c.g,c.b,c.a].join(",")+")"}};c.normalize=function(){function h(k,j,l){return j<k?k:(j>l?l:j)}c.r=h(0,parseInt(c.r),255);c.g=h(0,parseInt(c.g),255);c.b=h(0,parseInt(c.b),255);c.a=h(0,c.a,1);return c};c.clone=function(){return b.color.make(c.r,c.b,c.g,c.a)};return c.normalize()};b.color.extract=function(d,e){var c;do{c=d.css(e).toLowerCase();if(c!=""&&c!="transparent"){break}d=d.parent()}while(!b.nodeName(d.get(0),"body"));if(c=="rgba(0, 0, 0, 0)"){c="transparent"}return b.color.parse(c)};b.color.parse=function(c){var d,f=b.color.make;if(d=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10))}if(d=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10),parseFloat(d[4]))}if(d=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55)}if(d=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55,parseFloat(d[4]))}if(d=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c)){return f(parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16))}if(d=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c)){return f(parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16))}var e=b.trim(c).toLowerCase();if(e=="transparent"){return f(255,255,255,0)}else{d=a[e]||[0,0,0];return f(d[0],d[1],d[2])}};var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function(c){function b(av,ai,J,af){var Q=[],O={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{show:null,position:"bottom",mode:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},az=null,ad=null,y=null,H=null,A=null,p=[],aw=[],q={left:0,right:0,top:0,bottom:0},G=0,I=0,h=0,w=0,ak={processOptions:[],processRawData:[],processDatapoints:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},aq=this;aq.setData=aj;aq.setupGrid=t;aq.draw=W;aq.getPlaceholder=function(){return av};aq.getCanvas=function(){return az};aq.getPlotOffset=function(){return q};aq.width=function(){return h};aq.height=function(){return w};aq.offset=function(){var aB=y.offset();aB.left+=q.left;aB.top+=q.top;return aB};aq.getData=function(){return Q};aq.getAxes=function(){var aC={},aB;c.each(p.concat(aw),function(aD,aE){if(aE){aC[aE.direction+(aE.n!=1?aE.n:"")+"axis"]=aE}});return aC};aq.getXAxes=function(){return p};aq.getYAxes=function(){return aw};aq.c2p=C;aq.p2c=ar;aq.getOptions=function(){return O};aq.highlight=x;aq.unhighlight=T;aq.triggerRedrawOverlay=f;aq.pointOffset=function(aB){return{left:parseInt(p[aA(aB,"x")-1].p2c(+aB.x)+q.left),top:parseInt(aw[aA(aB,"y")-1].p2c(+aB.y)+q.top)}};aq.shutdown=ag;aq.resize=function(){B();g(az);g(ad)};aq.hooks=ak;F(aq);Z(J);X();aj(ai);t();W();ah();function an(aD,aB){aB=[aq].concat(aB);for(var aC=0;aC<aD.length;++aC){aD[aC].apply(this,aB)}}function F(){for(var aB=0;aB<af.length;++aB){var aC=af[aB];aC.init(aq);if(aC.options){c.extend(true,O,aC.options)}}}function Z(aC){var aB;c.extend(true,O,aC);if(O.xaxis.color==null){O.xaxis.color=O.grid.color}if(O.yaxis.color==null){O.yaxis.color=O.grid.color}if(O.xaxis.tickColor==null){O.xaxis.tickColor=O.grid.tickColor}if(O.yaxis.tickColor==null){O.yaxis.tickColor=O.grid.tickColor}if(O.grid.borderColor==null){O.grid.borderColor=O.grid.color}if(O.grid.tickColor==null){O.grid.tickColor=c.color.parse(O.grid.color).scale("a",0.22).toString()}for(aB=0;aB<Math.max(1,O.xaxes.length);++aB){O.xaxes[aB]=c.extend(true,{},O.xaxis,O.xaxes[aB])}for(aB=0;aB<Math.max(1,O.yaxes.length);++aB){O.yaxes[aB]=c.extend(true,{},O.yaxis,O.yaxes[aB])}if(O.xaxis.noTicks&&O.xaxis.ticks==null){O.xaxis.ticks=O.xaxis.noTicks}if(O.yaxis.noTicks&&O.yaxis.ticks==null){O.yaxis.ticks=O.yaxis.noTicks}if(O.x2axis){O.xaxes[1]=c.extend(true,{},O.xaxis,O.x2axis);O.xaxes[1].position="top"}if(O.y2axis){O.yaxes[1]=c.extend(true,{},O.yaxis,O.y2axis);O.yaxes[1].position="right"}if(O.grid.coloredAreas){O.grid.markings=O.grid.coloredAreas}if(O.grid.coloredAreasColor){O.grid.markingsColor=O.grid.coloredAreasColor}if(O.lines){c.extend(true,O.series.lines,O.lines)}if(O.points){c.extend(true,O.series.points,O.points)}if(O.bars){c.extend(true,O.series.bars,O.bars)}if(O.shadowSize!=null){O.series.shadowSize=O.shadowSize}for(aB=0;aB<O.xaxes.length;++aB){V(p,aB+1).options=O.xaxes[aB]}for(aB=0;aB<O.yaxes.length;++aB){V(aw,aB+1).options=O.yaxes[aB]}for(var aD in ak){if(O.hooks[aD]&&O.hooks[aD].length){ak[aD]=ak[aD].concat(O.hooks[aD])}}an(ak.processOptions,[O])}function aj(aB){Q=Y(aB);ax();z()}function Y(aE){var aC=[];for(var aB=0;aB<aE.length;++aB){var aD=c.extend(true,{},O.series);if(aE[aB].data!=null){aD.data=aE[aB].data;delete aE[aB].data;c.extend(true,aD,aE[aB]);aE[aB].data=aD.data}else{aD.data=aE[aB]}aC.push(aD)}return aC}function aA(aC,aD){var aB=aC[aD+"axis"];if(typeof aB=="object"){aB=aB.n}if(typeof aB!="number"){aB=1}return aB}function m(){return c.grep(p.concat(aw),function(aB){return aB})}function C(aE){var aC={},aB,aD;for(aB=0;aB<p.length;++aB){aD=p[aB];if(aD&&aD.used){aC["x"+aD.n]=aD.c2p(aE.left)}}for(aB=0;aB<aw.length;++aB){aD=aw[aB];if(aD&&aD.used){aC["y"+aD.n]=aD.c2p(aE.top)}}if(aC.x1!==undefined){aC.x=aC.x1}if(aC.y1!==undefined){aC.y=aC.y1}return aC}function ar(aF){var aD={},aC,aE,aB;for(aC=0;aC<p.length;++aC){aE=p[aC];if(aE&&aE.used){aB="x"+aE.n;if(aF[aB]==null&&aE.n==1){aB="x"}if(aF[aB]!=null){aD.left=aE.p2c(aF[aB]);break}}}for(aC=0;aC<aw.length;++aC){aE=aw[aC];if(aE&&aE.used){aB="y"+aE.n;if(aF[aB]==null&&aE.n==1){aB="y"}if(aF[aB]!=null){aD.top=aE.p2c(aF[aB]);break}}}return aD}function V(aC,aB){if(!aC[aB-1]){aC[aB-1]={n:aB,direction:aC==p?"x":"y",options:c.extend(true,{},aC==p?O.xaxis:O.yaxis)}}return aC[aB-1]}function ax(){var aG;var aM=Q.length,aB=[],aE=[];for(aG=0;aG<Q.length;++aG){var aJ=Q[aG].color;if(aJ!=null){--aM;if(typeof aJ=="number"){aE.push(aJ)}else{aB.push(c.color.parse(Q[aG].color))}}}for(aG=0;aG<aE.length;++aG){aM=Math.max(aM,aE[aG]+1)}var aC=[],aF=0;aG=0;while(aC.length<aM){var aI;if(O.colors.length==aG){aI=c.color.make(100,100,100)}else{aI=c.color.parse(O.colors[aG])}var aD=aF%2==1?-1:1;aI.scale("rgb",1+aD*Math.ceil(aF/2)*0.2);aC.push(aI);++aG;if(aG>=O.colors.length){aG=0;++aF}}var aH=0,aN;for(aG=0;aG<Q.length;++aG){aN=Q[aG];if(aN.color==null){aN.color=aC[aH].toString();++aH}else{if(typeof aN.color=="number"){aN.color=aC[aN.color].toString()}}if(aN.lines.show==null){var aL,aK=true;for(aL in aN){if(aN[aL]&&aN[aL].show){aK=false;break}}if(aK){aN.lines.show=true}}aN.xaxis=V(p,aA(aN,"x"));aN.yaxis=V(aw,aA(aN,"y"))}}function z(){var aO=Number.POSITIVE_INFINITY,aI=Number.NEGATIVE_INFINITY,aB=Number.MAX_VALUE,aU,aS,aR,aN,aD,aJ,aT,aP,aH,aG,aC,a0,aX,aL;function aF(a3,a2,a1){if(a2<a3.datamin&&a2!=-aB){a3.datamin=a2}if(a1>a3.datamax&&a1!=aB){a3.datamax=a1}}c.each(m(),function(a1,a2){a2.datamin=aO;a2.datamax=aI;a2.used=false});for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aJ.datapoints={points:[]};an(ak.processRawData,[aJ,aJ.data,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];var aZ=aJ.data,aW=aJ.datapoints.format;if(!aW){aW=[];aW.push({x:true,number:true,required:true});aW.push({y:true,number:true,required:true});if(aJ.bars.show||(aJ.lines.show&&aJ.lines.fill)){aW.push({y:true,number:true,required:false,defaultValue:0});if(aJ.bars.horizontal){delete aW[aW.length-1].y;aW[aW.length-1].x=true}}aJ.datapoints.format=aW}if(aJ.datapoints.pointsize!=null){continue}aJ.datapoints.pointsize=aW.length;aP=aJ.datapoints.pointsize;aT=aJ.datapoints.points;insertSteps=aJ.lines.show&&aJ.lines.steps;aJ.xaxis.used=aJ.yaxis.used=true;for(aS=aR=0;aS<aZ.length;++aS,aR+=aP){aL=aZ[aS];var aE=aL==null;if(!aE){for(aN=0;aN<aP;++aN){a0=aL[aN];aX=aW[aN];if(aX){if(aX.number&&a0!=null){a0=+a0;if(isNaN(a0)){a0=null}else{if(a0==Infinity){a0=aB}else{if(a0==-Infinity){a0=-aB}}}}if(a0==null){if(aX.required){aE=true}if(aX.defaultValue!=null){a0=aX.defaultValue}}}aT[aR+aN]=a0}}if(aE){for(aN=0;aN<aP;++aN){a0=aT[aR+aN];if(a0!=null){aX=aW[aN];if(aX.x){aF(aJ.xaxis,a0,a0)}if(aX.y){aF(aJ.yaxis,a0,a0)}}aT[aR+aN]=null}}else{if(insertSteps&&aR>0&&aT[aR-aP]!=null&&aT[aR-aP]!=aT[aR]&&aT[aR-aP+1]!=aT[aR+1]){for(aN=0;aN<aP;++aN){aT[aR+aP+aN]=aT[aR+aN]}aT[aR+1]=aT[aR-aP+1];aR+=aP}}}}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];an(ak.processDatapoints,[aJ,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aT=aJ.datapoints.points,aP=aJ.datapoints.pointsize;var aK=aO,aQ=aO,aM=aI,aV=aI;for(aS=0;aS<aT.length;aS+=aP){if(aT[aS]==null){continue}for(aN=0;aN<aP;++aN){a0=aT[aS+aN];aX=aW[aN];if(!aX||a0==aB||a0==-aB){continue}if(aX.x){if(a0<aK){aK=a0}if(a0>aM){aM=a0}}if(aX.y){if(a0<aQ){aQ=a0}if(a0>aV){aV=a0}}}}if(aJ.bars.show){var aY=aJ.bars.align=="left"?0:-aJ.bars.barWidth/2;if(aJ.bars.horizontal){aQ+=aY;aV+=aY+aJ.bars.barWidth}else{aK+=aY;aM+=aY+aJ.bars.barWidth}}aF(aJ.xaxis,aK,aM);aF(aJ.yaxis,aQ,aV)}c.each(m(),function(a1,a2){if(a2.datamin==aO){a2.datamin=null}if(a2.datamax==aI){a2.datamax=null}})}function j(aB,aC){var aD=document.createElement("canvas");aD.className=aC;aD.width=G;aD.height=I;if(!aB){c(aD).css({position:"absolute",left:0,top:0})}c(aD).appendTo(av);if(!aD.getContext){aD=window.G_vmlCanvasManager.initElement(aD)}aD.getContext("2d").save();return aD}function B(){G=av.width();I=av.height();if(G<=0||I<=0){throw"Invalid dimensions for plot, width = "+G+", height = "+I}}function g(aC){if(aC.width!=G){aC.width=G}if(aC.height!=I){aC.height=I}var aB=aC.getContext("2d");aB.restore();aB.save()}function X(){var aC,aB=av.children("canvas.base"),aD=av.children("canvas.overlay");if(aB.length==0||aD==0){av.html("");av.css({padding:0});if(av.css("position")=="static"){av.css("position","relative")}B();az=j(true,"base");ad=j(false,"overlay");aC=false}else{az=aB.get(0);ad=aD.get(0);aC=true}H=az.getContext("2d");A=ad.getContext("2d");y=c([ad,az]);if(aC){av.data("plot").shutdown();aq.resize();A.clearRect(0,0,G,I);y.unbind();av.children().not([az,ad]).remove()}av.data("plot",aq)}function ah(){if(O.grid.hoverable){y.mousemove(aa);y.mouseleave(l)}if(O.grid.clickable){y.click(R)}an(ak.bindEvents,[y])}function ag(){if(M){clearTimeout(M)}y.unbind("mousemove",aa);y.unbind("mouseleave",l);y.unbind("click",R);an(ak.shutdown,[y])}function r(aG){function aC(aH){return aH}var aF,aB,aD=aG.options.transform||aC,aE=aG.options.inverseTransform;if(aG.direction=="x"){aF=aG.scale=h/Math.abs(aD(aG.max)-aD(aG.min));aB=Math.min(aD(aG.max),aD(aG.min))}else{aF=aG.scale=w/Math.abs(aD(aG.max)-aD(aG.min));aF=-aF;aB=Math.max(aD(aG.max),aD(aG.min))}if(aD==aC){aG.p2c=function(aH){return(aH-aB)*aF}}else{aG.p2c=function(aH){return(aD(aH)-aB)*aF}}if(!aE){aG.c2p=function(aH){return aB+aH/aF}}else{aG.c2p=function(aH){return aE(aB+aH/aF)}}}function L(aD){var aB=aD.options,aF,aJ=aD.ticks||[],aI=[],aE,aK=aB.labelWidth,aG=aB.labelHeight,aC;function aH(aM,aL){return c('<div style="position:absolute;top:-10000px;'+aL+'font-size:smaller"><div class="'+aD.direction+"Axis "+aD.direction+aD.n+'Axis">'+aM.join("")+"</div></div>").appendTo(av)}if(aD.direction=="x"){if(aK==null){aK=Math.floor(G/(aJ.length>0?aJ.length:1))}if(aG==null){aI=[];for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel" style="float:left;width:'+aK+'px">'+aE+"</div>")}}if(aI.length>0){aI.push('<div style="clear:left"></div>');aC=aH(aI,"width:10000px;");aG=aC.height();aC.remove()}}}else{if(aK==null||aG==null){for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel">'+aE+"</div>")}}if(aI.length>0){aC=aH(aI,"");if(aK==null){aK=aC.children().width()}if(aG==null){aG=aC.find("div.tickLabel").height()}aC.remove()}}}if(aK==null){aK=0}if(aG==null){aG=0}aD.labelWidth=aK;aD.labelHeight=aG}function au(aD){var aC=aD.labelWidth,aL=aD.labelHeight,aH=aD.options.position,aF=aD.options.tickLength,aG=O.grid.axisMargin,aJ=O.grid.labelMargin,aK=aD.direction=="x"?p:aw,aE;var aB=c.grep(aK,function(aN){return aN&&aN.options.position==aH&&aN.reserveSpace});if(c.inArray(aD,aB)==aB.length-1){aG=0}if(aF==null){aF="full"}var aI=c.grep(aK,function(aN){return aN&&aN.reserveSpace});var aM=c.inArray(aD,aI)==0;if(!aM&&aF=="full"){aF=5}if(!isNaN(+aF)){aJ+=+aF}if(aD.direction=="x"){aL+=aJ;if(aH=="bottom"){q.bottom+=aL+aG;aD.box={top:I-q.bottom,height:aL}}else{aD.box={top:q.top+aG,height:aL};q.top+=aL+aG}}else{aC+=aJ;if(aH=="left"){aD.box={left:q.left+aG,width:aC};q.left+=aC+aG}else{q.right+=aC+aG;aD.box={left:G-q.right,width:aC}}}aD.position=aH;aD.tickLength=aF;aD.box.padding=aJ;aD.innermost=aM}function U(aB){if(aB.direction=="x"){aB.box.left=q.left;aB.box.width=h}else{aB.box.top=q.top;aB.box.height=w}}function t(){var aC,aE=m();c.each(aE,function(aF,aG){aG.show=aG.options.show;if(aG.show==null){aG.show=aG.used}aG.reserveSpace=aG.show||aG.options.reserveSpace;n(aG)});allocatedAxes=c.grep(aE,function(aF){return aF.reserveSpace});q.left=q.right=q.top=q.bottom=0;if(O.grid.show){c.each(allocatedAxes,function(aF,aG){S(aG);P(aG);ap(aG,aG.ticks);L(aG)});for(aC=allocatedAxes.length-1;aC>=0;--aC){au(allocatedAxes[aC])}var aD=O.grid.minBorderMargin;if(aD==null){aD=0;for(aC=0;aC<Q.length;++aC){aD=Math.max(aD,Q[aC].points.radius+Q[aC].points.lineWidth/2)}}for(var aB in q){q[aB]+=O.grid.borderWidth;q[aB]=Math.max(aD,q[aB])}}h=G-q.left-q.right;w=I-q.bottom-q.top;c.each(aE,function(aF,aG){r(aG)});if(O.grid.show){c.each(allocatedAxes,function(aF,aG){U(aG)});k()}o()}function n(aE){var aF=aE.options,aD=+(aF.min!=null?aF.min:aE.datamin),aB=+(aF.max!=null?aF.max:aE.datamax),aH=aB-aD;if(aH==0){var aC=aB==0?1:0.01;if(aF.min==null){aD-=aC}if(aF.max==null||aF.min!=null){aB+=aC}}else{var aG=aF.autoscaleMargin;if(aG!=null){if(aF.min==null){aD-=aH*aG;if(aD<0&&aE.datamin!=null&&aE.datamin>=0){aD=0}}if(aF.max==null){aB+=aH*aG;if(aB>0&&aE.datamax!=null&&aE.datamax<=0){aB=0}}}}aE.min=aD;aE.max=aB}function S(aG){var aM=aG.options;var aH;if(typeof aM.ticks=="number"&&aM.ticks>0){aH=aM.ticks}else{aH=0.3*Math.sqrt(aG.direction=="x"?G:I)}var aT=(aG.max-aG.min)/aH,aO,aB,aN,aR,aS,aQ,aI;if(aM.mode=="time"){var aJ={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var aK=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var aC=0;if(aM.minTickSize!=null){if(typeof aM.tickSize=="number"){aC=aM.tickSize}else{aC=aM.minTickSize[0]*aJ[aM.minTickSize[1]]}}for(var aS=0;aS<aK.length-1;++aS){if(aT<(aK[aS][0]*aJ[aK[aS][1]]+aK[aS+1][0]*aJ[aK[aS+1][1]])/2&&aK[aS][0]*aJ[aK[aS][1]]>=aC){break}}aO=aK[aS][0];aN=aK[aS][1];if(aN=="year"){aQ=Math.pow(10,Math.floor(Math.log(aT/aJ.year)/Math.LN10));aI=(aT/aJ.year)/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ}aG.tickSize=aM.tickSize||[aO,aN];aB=function(aX){var a2=[],a0=aX.tickSize[0],a3=aX.tickSize[1],a1=new Date(aX.min);var aW=a0*aJ[a3];if(a3=="second"){a1.setUTCSeconds(a(a1.getUTCSeconds(),a0))}if(a3=="minute"){a1.setUTCMinutes(a(a1.getUTCMinutes(),a0))}if(a3=="hour"){a1.setUTCHours(a(a1.getUTCHours(),a0))}if(a3=="month"){a1.setUTCMonth(a(a1.getUTCMonth(),a0))}if(a3=="year"){a1.setUTCFullYear(a(a1.getUTCFullYear(),a0))}a1.setUTCMilliseconds(0);if(aW>=aJ.minute){a1.setUTCSeconds(0)}if(aW>=aJ.hour){a1.setUTCMinutes(0)}if(aW>=aJ.day){a1.setUTCHours(0)}if(aW>=aJ.day*4){a1.setUTCDate(1)}if(aW>=aJ.year){a1.setUTCMonth(0)}var a5=0,a4=Number.NaN,aY;do{aY=a4;a4=a1.getTime();a2.push(a4);if(a3=="month"){if(a0<1){a1.setUTCDate(1);var aV=a1.getTime();a1.setUTCMonth(a1.getUTCMonth()+1);var aZ=a1.getTime();a1.setTime(a4+a5*aJ.hour+(aZ-aV)*a0);a5=a1.getUTCHours();a1.setUTCHours(0)}else{a1.setUTCMonth(a1.getUTCMonth()+a0)}}else{if(a3=="year"){a1.setUTCFullYear(a1.getUTCFullYear()+a0)}else{a1.setTime(a4+aW)}}}while(a4<aX.max&&a4!=aY);return a2};aR=function(aV,aY){var a0=new Date(aV);if(aM.timeformat!=null){return c.plot.formatDate(a0,aM.timeformat,aM.monthNames)}var aW=aY.tickSize[0]*aJ[aY.tickSize[1]];var aX=aY.max-aY.min;var aZ=(aM.twelveHourClock)?" %p":"";if(aW<aJ.minute){fmt="%h:%M:%S"+aZ}else{if(aW<aJ.day){if(aX<2*aJ.day){fmt="%h:%M"+aZ}else{fmt="%b %d %h:%M"+aZ}}else{if(aW<aJ.month){fmt="%b %d"}else{if(aW<aJ.year){if(aX<aJ.year){fmt="%b"}else{fmt="%b %y"}}else{fmt="%y"}}}}return c.plot.formatDate(a0,fmt,aM.monthNames)}}else{var aU=aM.tickDecimals;var aP=-Math.floor(Math.log(aT)/Math.LN10);if(aU!=null&&aP>aU){aP=aU}aQ=Math.pow(10,-aP);aI=aT/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2;if(aI>2.25&&(aU==null||aP+1<=aU)){aO=2.5;++aP}}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ;if(aM.minTickSize!=null&&aO<aM.minTickSize){aO=aM.minTickSize}aG.tickDecimals=Math.max(0,aU!=null?aU:aP);aG.tickSize=aM.tickSize||aO;aB=function(aX){var aZ=[];var a0=a(aX.min,aX.tickSize),aW=0,aV=Number.NaN,aY;do{aY=aV;aV=a0+aW*aX.tickSize;aZ.push(aV);++aW}while(aV<aX.max&&aV!=aY);return aZ};aR=function(aV,aW){return aV.toFixed(aW.tickDecimals)}}if(aM.alignTicksWithAxis!=null){var aF=(aG.direction=="x"?p:aw)[aM.alignTicksWithAxis-1];if(aF&&aF.used&&aF!=aG){var aL=aB(aG);if(aL.length>0){if(aM.min==null){aG.min=Math.min(aG.min,aL[0])}if(aM.max==null&&aL.length>1){aG.max=Math.max(aG.max,aL[aL.length-1])}}aB=function(aX){var aY=[],aV,aW;for(aW=0;aW<aF.ticks.length;++aW){aV=(aF.ticks[aW].v-aF.min)/(aF.max-aF.min);aV=aX.min+aV*(aX.max-aX.min);aY.push(aV)}return aY};if(aG.mode!="time"&&aM.tickDecimals==null){var aE=Math.max(0,-Math.floor(Math.log(aT)/Math.LN10)+1),aD=aB(aG);if(!(aD.length>1&&/\..*0$/.test((aD[1]-aD[0]).toFixed(aE)))){aG.tickDecimals=aE}}}}aG.tickGenerator=aB;if(c.isFunction(aM.tickFormatter)){aG.tickFormatter=function(aV,aW){return""+aM.tickFormatter(aV,aW)}}else{aG.tickFormatter=aR}}function P(aF){var aH=aF.options.ticks,aG=[];if(aH==null||(typeof aH=="number"&&aH>0)){aG=aF.tickGenerator(aF)}else{if(aH){if(c.isFunction(aH)){aG=aH({min:aF.min,max:aF.max})}else{aG=aH}}}var aE,aB;aF.ticks=[];for(aE=0;aE<aG.length;++aE){var aC=null;var aD=aG[aE];if(typeof aD=="object"){aB=+aD[0];if(aD.length>1){aC=aD[1]}}else{aB=+aD}if(aC==null){aC=aF.tickFormatter(aB,aF)}if(!isNaN(aB)){aF.ticks.push({v:aB,label:aC})}}}function ap(aB,aC){if(aB.options.autoscaleMargin&&aC.length>0){if(aB.options.min==null){aB.min=Math.min(aB.min,aC[0].v)}if(aB.options.max==null&&aC.length>1){aB.max=Math.max(aB.max,aC[aC.length-1].v)}}}function W(){H.clearRect(0,0,G,I);var aC=O.grid;if(aC.show&&aC.backgroundColor){N()}if(aC.show&&!aC.aboveData){ac()}for(var aB=0;aB<Q.length;++aB){an(ak.drawSeries,[H,Q[aB]]);d(Q[aB])}an(ak.draw,[H]);if(aC.show&&aC.aboveData){ac()}}function D(aB,aI){var aE,aH,aG,aD,aF=m();for(i=0;i<aF.length;++i){aE=aF[i];if(aE.direction==aI){aD=aI+aE.n+"axis";if(!aB[aD]&&aE.n==1){aD=aI+"axis"}if(aB[aD]){aH=aB[aD].from;aG=aB[aD].to;break}}}if(!aB[aD]){aE=aI=="x"?p[0]:aw[0];aH=aB[aI+"1"];aG=aB[aI+"2"]}if(aH!=null&&aG!=null&&aH>aG){var aC=aH;aH=aG;aG=aC}return{from:aH,to:aG,axis:aE}}function N(){H.save();H.translate(q.left,q.top);H.fillStyle=am(O.grid.backgroundColor,w,0,"rgba(255, 255, 255, 0)");H.fillRect(0,0,h,w);H.restore()}function ac(){var aF;H.save();H.translate(q.left,q.top);var aH=O.grid.markings;if(aH){if(c.isFunction(aH)){var aK=aq.getAxes();aK.xmin=aK.xaxis.min;aK.xmax=aK.xaxis.max;aK.ymin=aK.yaxis.min;aK.ymax=aK.yaxis.max;aH=aH(aK)}for(aF=0;aF<aH.length;++aF){var aD=aH[aF],aC=D(aD,"x"),aI=D(aD,"y");if(aC.from==null){aC.from=aC.axis.min}if(aC.to==null){aC.to=aC.axis.max}if(aI.from==null){aI.from=aI.axis.min}if(aI.to==null){aI.to=aI.axis.max}if(aC.to<aC.axis.min||aC.from>aC.axis.max||aI.to<aI.axis.min||aI.from>aI.axis.max){continue}aC.from=Math.max(aC.from,aC.axis.min);aC.to=Math.min(aC.to,aC.axis.max);aI.from=Math.max(aI.from,aI.axis.min);aI.to=Math.min(aI.to,aI.axis.max);if(aC.from==aC.to&&aI.from==aI.to){continue}aC.from=aC.axis.p2c(aC.from);aC.to=aC.axis.p2c(aC.to);aI.from=aI.axis.p2c(aI.from);aI.to=aI.axis.p2c(aI.to);if(aC.from==aC.to||aI.from==aI.to){H.beginPath();H.strokeStyle=aD.color||O.grid.markingsColor;H.lineWidth=aD.lineWidth||O.grid.markingsLineWidth;H.moveTo(aC.from,aI.from);H.lineTo(aC.to,aI.to);H.stroke()}else{H.fillStyle=aD.color||O.grid.markingsColor;H.fillRect(aC.from,aI.to,aC.to-aC.from,aI.from-aI.to)}}}var aK=m(),aM=O.grid.borderWidth;for(var aE=0;aE<aK.length;++aE){var aB=aK[aE],aG=aB.box,aQ=aB.tickLength,aN,aL,aP,aJ;if(!aB.show||aB.ticks.length==0){continue}H.strokeStyle=aB.options.tickColor||c.color.parse(aB.options.color).scale("a",0.22).toString();H.lineWidth=1;if(aB.direction=="x"){aN=0;if(aQ=="full"){aL=(aB.position=="top"?0:w)}else{aL=aG.top-q.top+(aB.position=="top"?aG.height:0)}}else{aL=0;if(aQ=="full"){aN=(aB.position=="left"?0:h)}else{aN=aG.left-q.left+(aB.position=="left"?aG.width:0)}}if(!aB.innermost){H.beginPath();aP=aJ=0;if(aB.direction=="x"){aP=h}else{aJ=w}if(H.lineWidth==1){aN=Math.floor(aN)+0.5;aL=Math.floor(aL)+0.5}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ);H.stroke()}H.beginPath();for(aF=0;aF<aB.ticks.length;++aF){var aO=aB.ticks[aF].v;aP=aJ=0;if(aO<aB.min||aO>aB.max||(aQ=="full"&&aM>0&&(aO==aB.min||aO==aB.max))){continue}if(aB.direction=="x"){aN=aB.p2c(aO);aJ=aQ=="full"?-w:aQ;if(aB.position=="top"){aJ=-aJ}}else{aL=aB.p2c(aO);aP=aQ=="full"?-h:aQ;if(aB.position=="left"){aP=-aP}}if(H.lineWidth==1){if(aB.direction=="x"){aN=Math.floor(aN)+0.5}else{aL=Math.floor(aL)+0.5}}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ)}H.stroke()}if(aM){H.lineWidth=aM;H.strokeStyle=O.grid.borderColor;H.strokeRect(-aM/2,-aM/2,h+aM,w+aM)}H.restore()}function k(){av.find(".tickLabels").remove();var aG=['<div class="tickLabels" style="font-size:smaller">'];var aJ=m();for(var aD=0;aD<aJ.length;++aD){var aC=aJ[aD],aF=aC.box;if(!aC.show){continue}aG.push('<div class="'+aC.direction+"Axis "+aC.direction+aC.n+'Axis" style="color:'+aC.options.color+'">');for(var aE=0;aE<aC.ticks.length;++aE){var aH=aC.ticks[aE];if(!aH.label||aH.v<aC.min||aH.v>aC.max){continue}var aK={},aI;if(aC.direction=="x"){aI="center";aK.left=Math.round(q.left+aC.p2c(aH.v)-aC.labelWidth/2);if(aC.position=="bottom"){aK.top=aF.top+aF.padding}else{aK.bottom=I-(aF.top+aF.height-aF.padding)}}else{aK.top=Math.round(q.top+aC.p2c(aH.v)-aC.labelHeight/2);if(aC.position=="left"){aK.right=G-(aF.left+aF.width-aF.padding);aI="right"}else{aK.left=aF.left+aF.padding;aI="left"}}aK.width=aC.labelWidth;var aB=["position:absolute","text-align:"+aI];for(var aL in aK){aB.push(aL+":"+aK[aL]+"px")}aG.push('<div class="tickLabel" style="'+aB.join(";")+'">'+aH.label+"</div>")}aG.push("</div>")}aG.push("</div>");av.append(aG.join(""))}function d(aB){if(aB.lines.show){at(aB)}if(aB.bars.show){e(aB)}if(aB.points.show){ao(aB)}}function at(aE){function aD(aP,aQ,aI,aU,aT){var aV=aP.points,aJ=aP.pointsize,aN=null,aM=null;H.beginPath();for(var aO=aJ;aO<aV.length;aO+=aJ){var aL=aV[aO-aJ],aS=aV[aO-aJ+1],aK=aV[aO],aR=aV[aO+1];if(aL==null||aK==null){continue}if(aS<=aR&&aS<aT.min){if(aR<aT.min){continue}aL=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.min}else{if(aR<=aS&&aR<aT.min){if(aS<aT.min){continue}aK=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.min}}if(aS>=aR&&aS>aT.max){if(aR>aT.max){continue}aL=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.max}else{if(aR>=aS&&aR>aT.max){if(aS>aT.max){continue}aK=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.max}}if(aL<=aK&&aL<aU.min){if(aK<aU.min){continue}aS=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.min}else{if(aK<=aL&&aK<aU.min){if(aL<aU.min){continue}aR=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.min}}if(aL>=aK&&aL>aU.max){if(aK>aU.max){continue}aS=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.max}else{if(aK>=aL&&aK>aU.max){if(aL>aU.max){continue}aR=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.max}}if(aL!=aN||aS!=aM){H.moveTo(aU.p2c(aL)+aQ,aT.p2c(aS)+aI)}aN=aK;aM=aR;H.lineTo(aU.p2c(aK)+aQ,aT.p2c(aR)+aI)}H.stroke()}function aF(aI,aQ,aP){var aW=aI.points,aV=aI.pointsize,aN=Math.min(Math.max(0,aP.min),aP.max),aX=0,aU,aT=false,aM=1,aL=0,aR=0;while(true){if(aV>0&&aX>aW.length+aV){break}aX+=aV;var aZ=aW[aX-aV],aK=aW[aX-aV+aM],aY=aW[aX],aJ=aW[aX+aM];if(aT){if(aV>0&&aZ!=null&&aY==null){aR=aX;aV=-aV;aM=2;continue}if(aV<0&&aX==aL+aV){H.fill();aT=false;aV=-aV;aM=1;aX=aL=aR+aV;continue}}if(aZ==null||aY==null){continue}if(aZ<=aY&&aZ<aQ.min){if(aY<aQ.min){continue}aK=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.min}else{if(aY<=aZ&&aY<aQ.min){if(aZ<aQ.min){continue}aJ=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.min}}if(aZ>=aY&&aZ>aQ.max){if(aY>aQ.max){continue}aK=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.max}else{if(aY>=aZ&&aY>aQ.max){if(aZ>aQ.max){continue}aJ=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.max}}if(!aT){H.beginPath();H.moveTo(aQ.p2c(aZ),aP.p2c(aN));aT=true}if(aK>=aP.max&&aJ>=aP.max){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.max));H.lineTo(aQ.p2c(aY),aP.p2c(aP.max));continue}else{if(aK<=aP.min&&aJ<=aP.min){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.min));H.lineTo(aQ.p2c(aY),aP.p2c(aP.min));continue}}var aO=aZ,aS=aY;if(aK<=aJ&&aK<aP.min&&aJ>=aP.min){aZ=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.min}else{if(aJ<=aK&&aJ<aP.min&&aK>=aP.min){aY=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.min}}if(aK>=aJ&&aK>aP.max&&aJ<=aP.max){aZ=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.max}else{if(aJ>=aK&&aJ>aP.max&&aK<=aP.max){aY=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.max}}if(aZ!=aO){H.lineTo(aQ.p2c(aO),aP.p2c(aK))}H.lineTo(aQ.p2c(aZ),aP.p2c(aK));H.lineTo(aQ.p2c(aY),aP.p2c(aJ));if(aY!=aS){H.lineTo(aQ.p2c(aY),aP.p2c(aJ));H.lineTo(aQ.p2c(aS),aP.p2c(aJ))}}}H.save();H.translate(q.left,q.top);H.lineJoin="round";var aG=aE.lines.lineWidth,aB=aE.shadowSize;if(aG>0&&aB>0){H.lineWidth=aB;H.strokeStyle="rgba(0,0,0,0.1)";var aH=Math.PI/18;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/2),Math.cos(aH)*(aG/2+aB/2),aE.xaxis,aE.yaxis);H.lineWidth=aB/2;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/4),Math.cos(aH)*(aG/2+aB/4),aE.xaxis,aE.yaxis)}H.lineWidth=aG;H.strokeStyle=aE.color;var aC=ae(aE.lines,aE.color,0,w);if(aC){H.fillStyle=aC;aF(aE.datapoints,aE.xaxis,aE.yaxis)}if(aG>0){aD(aE.datapoints,0,0,aE.xaxis,aE.yaxis)}H.restore()}function ao(aE){function aH(aN,aM,aU,aK,aS,aT,aQ,aJ){var aR=aN.points,aI=aN.pointsize;for(var aL=0;aL<aR.length;aL+=aI){var aP=aR[aL],aO=aR[aL+1];if(aP==null||aP<aT.min||aP>aT.max||aO<aQ.min||aO>aQ.max){continue}H.beginPath();aP=aT.p2c(aP);aO=aQ.p2c(aO)+aK;if(aJ=="circle"){H.arc(aP,aO,aM,0,aS?Math.PI:Math.PI*2,false)}else{aJ(H,aP,aO,aM,aS)}H.closePath();if(aU){H.fillStyle=aU;H.fill()}H.stroke()}}H.save();H.translate(q.left,q.top);var aG=aE.points.lineWidth,aC=aE.shadowSize,aB=aE.points.radius,aF=aE.points.symbol;if(aG>0&&aC>0){var aD=aC/2;H.lineWidth=aD;H.strokeStyle="rgba(0,0,0,0.1)";aH(aE.datapoints,aB,null,aD+aD/2,true,aE.xaxis,aE.yaxis,aF);H.strokeStyle="rgba(0,0,0,0.2)";aH(aE.datapoints,aB,null,aD/2,true,aE.xaxis,aE.yaxis,aF)}H.lineWidth=aG;H.strokeStyle=aE.color;aH(aE.datapoints,aB,ae(aE.points,aE.color),0,false,aE.xaxis,aE.yaxis,aF);H.restore()}function E(aN,aM,aV,aI,aQ,aF,aD,aL,aK,aU,aR,aC){var aE,aT,aJ,aP,aG,aB,aO,aH,aS;if(aR){aH=aB=aO=true;aG=false;aE=aV;aT=aN;aP=aM+aI;aJ=aM+aQ;if(aT<aE){aS=aT;aT=aE;aE=aS;aG=true;aB=false}}else{aG=aB=aO=true;aH=false;aE=aN+aI;aT=aN+aQ;aJ=aV;aP=aM;if(aP<aJ){aS=aP;aP=aJ;aJ=aS;aH=true;aO=false}}if(aT<aL.min||aE>aL.max||aP<aK.min||aJ>aK.max){return}if(aE<aL.min){aE=aL.min;aG=false}if(aT>aL.max){aT=aL.max;aB=false}if(aJ<aK.min){aJ=aK.min;aH=false}if(aP>aK.max){aP=aK.max;aO=false}aE=aL.p2c(aE);aJ=aK.p2c(aJ);aT=aL.p2c(aT);aP=aK.p2c(aP);if(aD){aU.beginPath();aU.moveTo(aE,aJ);aU.lineTo(aE,aP);aU.lineTo(aT,aP);aU.lineTo(aT,aJ);aU.fillStyle=aD(aJ,aP);aU.fill()}if(aC>0&&(aG||aB||aO||aH)){aU.beginPath();aU.moveTo(aE,aJ+aF);if(aG){aU.lineTo(aE,aP+aF)}else{aU.moveTo(aE,aP+aF)}if(aO){aU.lineTo(aT,aP+aF)}else{aU.moveTo(aT,aP+aF)}if(aB){aU.lineTo(aT,aJ+aF)}else{aU.moveTo(aT,aJ+aF)}if(aH){aU.lineTo(aE,aJ+aF)}else{aU.moveTo(aE,aJ+aF)}aU.stroke()}}function e(aD){function aC(aJ,aI,aL,aG,aK,aN,aM){var aO=aJ.points,aF=aJ.pointsize;for(var aH=0;aH<aO.length;aH+=aF){if(aO[aH]==null){continue}E(aO[aH],aO[aH+1],aO[aH+2],aI,aL,aG,aK,aN,aM,H,aD.bars.horizontal,aD.bars.lineWidth)}}H.save();H.translate(q.left,q.top);H.lineWidth=aD.bars.lineWidth;H.strokeStyle=aD.color;var aB=aD.bars.align=="left"?0:-aD.bars.barWidth/2;var aE=aD.bars.fill?function(aF,aG){return ae(aD.bars,aD.color,aF,aG)}:null;aC(aD.datapoints,aB,aB+aD.bars.barWidth,0,aE,aD.xaxis,aD.yaxis);H.restore()}function ae(aD,aB,aC,aF){var aE=aD.fill;if(!aE){return null}if(aD.fillColor){return am(aD.fillColor,aC,aF,aB)}var aG=c.color.parse(aB);aG.a=typeof aE=="number"?aE:0.4;aG.normalize();return aG.toString()}function o(){av.find(".legend").remove();if(!O.legend.show){return}var aH=[],aF=false,aN=O.legend.labelFormatter,aM,aJ;for(var aE=0;aE<Q.length;++aE){aM=Q[aE];aJ=aM.label;if(!aJ){continue}if(aE%O.legend.noColumns==0){if(aF){aH.push("</tr>")}aH.push("<tr>");aF=true}if(aN){aJ=aN(aJ,aM)}aH.push('<td class="legendColorBox"><div style="border:1px solid '+O.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+aM.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+aJ+"</td>")}if(aF){aH.push("</tr>")}if(aH.length==0){return}var aL='<table style="font-size:smaller;color:'+O.grid.color+'">'+aH.join("")+"</table>";if(O.legend.container!=null){c(O.legend.container).html(aL)}else{var aI="",aC=O.legend.position,aD=O.legend.margin;if(aD[0]==null){aD=[aD,aD]}if(aC.charAt(0)=="n"){aI+="top:"+(aD[1]+q.top)+"px;"}else{if(aC.charAt(0)=="s"){aI+="bottom:"+(aD[1]+q.bottom)+"px;"}}if(aC.charAt(1)=="e"){aI+="right:"+(aD[0]+q.right)+"px;"}else{if(aC.charAt(1)=="w"){aI+="left:"+(aD[0]+q.left)+"px;"}}var aK=c('<div class="legend">'+aL.replace('style="','style="position:absolute;'+aI+";")+"</div>").appendTo(av);if(O.legend.backgroundOpacity!=0){var aG=O.legend.backgroundColor;if(aG==null){aG=O.grid.backgroundColor;if(aG&&typeof aG=="string"){aG=c.color.parse(aG)}else{aG=c.color.extract(aK,"background-color")}aG.a=1;aG=aG.toString()}var aB=aK.children();c('<div style="position:absolute;width:'+aB.width()+"px;height:"+aB.height()+"px;"+aI+"background-color:"+aG+';"> </div>').prependTo(aK).css("opacity",O.legend.backgroundOpacity)}}}var ab=[],M=null;function K(aI,aG,aD){var aO=O.grid.mouseActiveRadius,a0=aO*aO+1,aY=null,aR=false,aW,aU;for(aW=Q.length-1;aW>=0;--aW){if(!aD(Q[aW])){continue}var aP=Q[aW],aH=aP.xaxis,aF=aP.yaxis,aV=aP.datapoints.points,aT=aP.datapoints.pointsize,aQ=aH.c2p(aI),aN=aF.c2p(aG),aC=aO/aH.scale,aB=aO/aF.scale;if(aH.options.inverseTransform){aC=Number.MAX_VALUE}if(aF.options.inverseTransform){aB=Number.MAX_VALUE}if(aP.lines.show||aP.points.show){for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1];if(aK==null){continue}if(aK-aQ>aC||aK-aQ<-aC||aJ-aN>aB||aJ-aN<-aB){continue}var aM=Math.abs(aH.p2c(aK)-aI),aL=Math.abs(aF.p2c(aJ)-aG),aS=aM*aM+aL*aL;if(aS<a0){a0=aS;aY=[aW,aU/aT]}}}if(aP.bars.show&&!aY){var aE=aP.bars.align=="left"?0:-aP.bars.barWidth/2,aX=aE+aP.bars.barWidth;for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1],aZ=aV[aU+2];if(aK==null){continue}if(Q[aW].bars.horizontal?(aQ<=Math.max(aZ,aK)&&aQ>=Math.min(aZ,aK)&&aN>=aJ+aE&&aN<=aJ+aX):(aQ>=aK+aE&&aQ<=aK+aX&&aN>=Math.min(aZ,aJ)&&aN<=Math.max(aZ,aJ))){aY=[aW,aU/aT]}}}}if(aY){aW=aY[0];aU=aY[1];aT=Q[aW].datapoints.pointsize;return{datapoint:Q[aW].datapoints.points.slice(aU*aT,(aU+1)*aT),dataIndex:aU,series:Q[aW],seriesIndex:aW}}return null}function aa(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return aC.hoverable!=false})}}function l(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return false})}}function R(aB){u("plotclick",aB,function(aC){return aC.clickable!=false})}function u(aC,aB,aD){var aE=y.offset(),aH=aB.pageX-aE.left-q.left,aF=aB.pageY-aE.top-q.top,aJ=C({left:aH,top:aF});aJ.pageX=aB.pageX;aJ.pageY=aB.pageY;var aK=K(aH,aF,aD);if(aK){aK.pageX=parseInt(aK.series.xaxis.p2c(aK.datapoint[0])+aE.left+q.left);aK.pageY=parseInt(aK.series.yaxis.p2c(aK.datapoint[1])+aE.top+q.top)}if(O.grid.autoHighlight){for(var aG=0;aG<ab.length;++aG){var aI=ab[aG];if(aI.auto==aC&&!(aK&&aI.series==aK.series&&aI.point[0]==aK.datapoint[0]&&aI.point[1]==aK.datapoint[1])){T(aI.series,aI.point)}}if(aK){x(aK.series,aK.datapoint,aC)}}av.trigger(aC,[aJ,aK])}function f(){if(!M){M=setTimeout(s,30)}}function s(){M=null;A.save();A.clearRect(0,0,G,I);A.translate(q.left,q.top);var aC,aB;for(aC=0;aC<ab.length;++aC){aB=ab[aC];if(aB.series.bars.show){v(aB.series,aB.point)}else{ay(aB.series,aB.point)}}A.restore();an(ak.drawOverlay,[A])}function x(aD,aB,aF){if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){var aE=aD.datapoints.pointsize;aB=aD.datapoints.points.slice(aE*aB,aE*(aB+1))}var aC=al(aD,aB);if(aC==-1){ab.push({series:aD,point:aB,auto:aF});f()}else{if(!aF){ab[aC].auto=false}}}function T(aD,aB){if(aD==null&&aB==null){ab=[];f()}if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){aB=aD.data[aB]}var aC=al(aD,aB);if(aC!=-1){ab.splice(aC,1);f()}}function al(aD,aE){for(var aB=0;aB<ab.length;++aB){var aC=ab[aB];if(aC.series==aD&&aC.point[0]==aE[0]&&aC.point[1]==aE[1]){return aB}}return -1}function ay(aE,aD){var aC=aD[0],aI=aD[1],aH=aE.xaxis,aG=aE.yaxis;if(aC<aH.min||aC>aH.max||aI<aG.min||aI>aG.max){return}var aF=aE.points.radius+aE.points.lineWidth/2;A.lineWidth=aF;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aB=1.5*aF,aC=aH.p2c(aC),aI=aG.p2c(aI);A.beginPath();if(aE.points.symbol=="circle"){A.arc(aC,aI,aB,0,2*Math.PI,false)}else{aE.points.symbol(A,aC,aI,aB,false)}A.closePath();A.stroke()}function v(aE,aB){A.lineWidth=aE.bars.lineWidth;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aD=c.color.parse(aE.color).scale("a",0.5).toString();var aC=aE.bars.align=="left"?0:-aE.bars.barWidth/2;E(aB[0],aB[1],aB[2]||0,aC,aC+aE.bars.barWidth,0,function(){return aD},aE.xaxis,aE.yaxis,A,aE.bars.horizontal,aE.bars.lineWidth)}function am(aJ,aB,aH,aC){if(typeof aJ=="string"){return aJ}else{var aI=H.createLinearGradient(0,aH,0,aB);for(var aE=0,aD=aJ.colors.length;aE<aD;++aE){var aF=aJ.colors[aE];if(typeof aF!="string"){var aG=c.color.parse(aC);if(aF.brightness!=null){aG=aG.scale("rgb",aF.brightness)}if(aF.opacity!=null){aG.a*=aF.opacity}aF=aG.toString()}aI.addColorStop(aE/(aD-1),aF)}return aI}}}c.plot=function(g,e,d){var f=new b(c(g),e,d,c.plot.plugins);return f};c.plot.version="0.7";c.plot.plugins=[];c.plot.formatDate=function(l,f,h){var o=function(d){d=""+d;return d.length==1?"0"+d:d};var e=[];var p=false,j=false;var n=l.getUTCHours();var k=n<12;if(h==null){h=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(f.search(/%p|%P/)!=-1){if(n>12){n=n-12}else{if(n==0){n=12}}}for(var g=0;g<f.length;++g){var m=f.charAt(g);if(p){switch(m){case"h":m=""+n;break;case"H":m=o(n);break;case"M":m=o(l.getUTCMinutes());break;case"S":m=o(l.getUTCSeconds());break;case"d":m=""+l.getUTCDate();break;case"m":m=""+(l.getUTCMonth()+1);break;case"y":m=""+l.getUTCFullYear();break;case"b":m=""+h[l.getUTCMonth()];break;case"p":m=(k)?("am"):("pm");break;case"P":m=(k)?("AM"):("PM");break;case"0":m="";j=true;break}if(m&&j){m=o(m);j=false}e.push(m);if(!j){p=false}}else{if(m=="%"){p=true}else{e.push(m)}}}return e.join("")};function a(e,d){return d*Math.floor(e/d)}})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.navigate.js
@@ -1,1 +1,337 @@
-
+/*
+Flot plugin for adding panning and zooming capabilities to a plot.
+
+The default behaviour is double click and scrollwheel up/down to zoom
+in, drag to pan. The plugin defines plot.zoom({ center }),
+plot.zoomOut() and plot.pan(offset) so you easily can add custom
+controls. It also fires a "plotpan" and "plotzoom" event when
+something happens, useful for synchronizing plots.
+
+Options:
+
+  zoom: {
+    interactive: false
+    trigger: "dblclick" // or "click" for single click
+    amount: 1.5         // 2 = 200% (zoom in), 0.5 = 50% (zoom out)
+  }
+  
+  pan: {
+    interactive: false
+    cursor: "move"      // CSS mouse cursor value used when dragging, e.g. "pointer"
+    frameRate: 20
+  }
+
+  xaxis, yaxis, x2axis, y2axis: {
+    zoomRange: null  // or [number, number] (min range, max range) or false
+    panRange: null   // or [number, number] (min, max) or false
+  }
+  
+"interactive" enables the built-in drag/click behaviour. If you enable
+interactive for pan, then you'll have a basic plot that supports
+moving around; the same for zoom.
+
+"amount" specifies the default amount to zoom in (so 1.5 = 150%)
+relative to the current viewport.
+
+"cursor" is a standard CSS mouse cursor string used for visual
+feedback to the user when dragging.
+
+"frameRate" specifies the maximum number of times per second the plot
+will update itself while the user is panning around on it (set to null
+to disable intermediate pans, the plot will then not update until the
+mouse button is released).
+
+"zoomRange" is the interval in which zooming can happen, e.g. with
+zoomRange: [1, 100] the zoom will never scale the axis so that the
+difference between min and max is smaller than 1 or larger than 100.
+You can set either end to null to ignore, e.g. [1, null]. If you set
+zoomRange to false, zooming on that axis will be disabled.
+
+"panRange" confines the panning to stay within a range, e.g. with
+panRange: [-10, 20] panning stops at -10 in one end and at 20 in the
+other. Either can be null, e.g. [-10, null]. If you set
+panRange to false, panning on that axis will be disabled.
+
+Example API usage:
+
+  plot = $.plot(...);
+  
+  // zoom default amount in on the pixel (10, 20) 
+  plot.zoom({ center: { left: 10, top: 20 } });
+
+  // zoom out again
+  plot.zoomOut({ center: { left: 10, top: 20 } });
+
+  // zoom 200% in on the pixel (10, 20) 
+  plot.zoom({ amount: 2, center: { left: 10, top: 20 } });
+  
+  // pan 100 pixels to the left and 20 down
+  plot.pan({ left: -100, top: 20 })
+
+Here, "center" specifies where the center of the zooming should
+happen. Note that this is defined in pixel space, not the space of the
+data points (you can use the p2c helpers on the axes in Flot to help
+you convert between these).
+
+"amount" is the amount to zoom the viewport relative to the current
+range, so 1 is 100% (i.e. no change), 1.5 is 150% (zoom in), 0.7 is
+70% (zoom out). You can set the default in the options.
+  
+*/
+
+
+// First two dependencies, jquery.event.drag.js and
+// jquery.mousewheel.js, we put them inline here to save people the
+// effort of downloading them.
+
+/*
+jquery.event.drag.js ~ v1.5 ~ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)  
+Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-LICENSE.txt
+*/
+(function(E){E.fn.drag=function(L,K,J){if(K){this.bind("dragstart",L)}if(J){this.bind("dragend",J)}return !L?this.trigger("drag"):this.bind("drag",K?K:L)};var A=E.event,B=A.special,F=B.drag={not:":input",distance:0,which:1,dragging:false,setup:function(J){J=E.extend({distance:F.distance,which:F.which,not:F.not},J||{});J.distance=I(J.distance);A.add(this,"mousedown",H,J);if(this.attachEvent){this.attachEvent("ondragstart",D)}},teardown:function(){A.remove(this,"mousedown",H);if(this===F.dragging){F.dragging=F.proxy=false}G(this,true);if(this.detachEvent){this.detachEvent("ondragstart",D)}}};B.dragstart=B.dragend={setup:function(){},teardown:function(){}};function H(L){var K=this,J,M=L.data||{};if(M.elem){K=L.dragTarget=M.elem;L.dragProxy=F.proxy||K;L.cursorOffsetX=M.pageX-M.left;L.cursorOffsetY=M.pageY-M.top;L.offsetX=L.pageX-L.cursorOffsetX;L.offsetY=L.pageY-L.cursorOffsetY}else{if(F.dragging||(M.which>0&&L.which!=M.which)||E(L.target).is(M.not)){return }}switch(L.type){case"mousedown":E.extend(M,E(K).offset(),{elem:K,target:L.target,pageX:L.pageX,pageY:L.pageY});A.add(document,"mousemove mouseup",H,M);G(K,false);F.dragging=null;return false;case !F.dragging&&"mousemove":if(I(L.pageX-M.pageX)+I(L.pageY-M.pageY)<M.distance){break}L.target=M.target;J=C(L,"dragstart",K);if(J!==false){F.dragging=K;F.proxy=L.dragProxy=E(J||K)[0]}case"mousemove":if(F.dragging){J=C(L,"drag",K);if(B.drop){B.drop.allowed=(J!==false);B.drop.handler(L)}if(J!==false){break}L.type="mouseup"}case"mouseup":A.remove(document,"mousemove mouseup",H);if(F.dragging){if(B.drop){B.drop.handler(L)}C(L,"dragend",K)}G(K,true);F.dragging=F.proxy=M.elem=false;break}return true}function C(M,K,L){M.type=K;var J=E.event.handle.call(L,M);return J===false?false:J||M.result}function I(J){return Math.pow(J,2)}function D(){return(F.dragging===false)}function G(K,J){if(!K){return }K.unselectable=J?"off":"on";K.onselectstart=function(){return J};if(K.style){K.style.MozUserSelect=J?"":"none"}}})(jQuery);
+
+
+/* jquery.mousewheel.min.js
+ * Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ *
+ * Version: 3.0.2
+ * 
+ * Requires: 1.2.2+
+ */
+(function(c){var a=["DOMMouseScroll","mousewheel"];c.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var d=a.length;d;){this.addEventListener(a[--d],b,false)}}else{this.onmousewheel=b}},teardown:function(){if(this.removeEventListener){for(var d=a.length;d;){this.removeEventListener(a[--d],b,false)}}else{this.onmousewheel=null}}};c.fn.extend({mousewheel:function(d){return d?this.bind("mousewheel",d):this.trigger("mousewheel")},unmousewheel:function(d){return this.unbind("mousewheel",d)}});function b(f){var d=[].slice.call(arguments,1),g=0,e=true;f=c.event.fix(f||window.event);f.type="mousewheel";if(f.wheelDelta){g=f.wheelDelta/120}if(f.detail){g=-f.detail/3}d.unshift(f,g);return c.event.handle.apply(this,d)}})(jQuery);
+
+
+
+
+(function ($) {
+    var options = {
+        xaxis: {
+            zoomRange: null, // or [number, number] (min range, max range)
+            panRange: null // or [number, number] (min, max)
+        },
+        zoom: {
+            interactive: false,
+            trigger: "dblclick", // or "click" for single click
+            amount: 1.5 // how much to zoom relative to current position, 2 = 200% (zoom in), 0.5 = 50% (zoom out)
+        },
+        pan: {
+            interactive: false,
+            cursor: "move",
+            frameRate: 20
+        }
+    };
+
+    function init(plot) {
+        function onZoomClick(e, zoomOut) {
+            var c = plot.offset();
+            c.left = e.pageX - c.left;
+            c.top = e.pageY - c.top;
+            if (zoomOut)
+                plot.zoomOut({ center: c });
+            else
+                plot.zoom({ center: c });
+        }
+
+        function onMouseWheel(e, delta) {
+            onZoomClick(e, delta < 0);
+            return false;
+        }
+        
+        var prevCursor = 'default', prevPageX = 0, prevPageY = 0,
+            panTimeout = null;
+
+        function onDragStart(e) {
+            if (e.which != 1)  // only accept left-click
+                return false;
+            var c = plot.getPlaceholder().css('cursor');
+            if (c)
+                prevCursor = c;
+            plot.getPlaceholder().css('cursor', plot.getOptions().pan.cursor);
+            prevPageX = e.pageX;
+            prevPageY = e.pageY;
+        }
+        
+        function onDrag(e) {
+            var frameRate = plot.getOptions().pan.frameRate;
+            if (panTimeout || !frameRate)
+                return;
+
+            panTimeout = setTimeout(function () {
+                plot.pan({ left: prevPageX - e.pageX,
+                           top: prevPageY - e.pageY });
+                prevPageX = e.pageX;
+                prevPageY = e.pageY;
+                                                    
+                panTimeout = null;
+            }, 1 / frameRate * 1000);
+        }
+
+        function onDragEnd(e) {
+            if (panTimeout) {
+                clearTimeout(panTimeout);
+                panTimeout = null;
+            }
+                    
+            plot.getPlaceholder().css('cursor', prevCursor);
+            plot.pan({ left: prevPageX - e.pageX,
+                       top: prevPageY - e.pageY });
+        }
+        
+        function bindEvents(plot, eventHolder) {
+            var o = plot.getOptions();
+            if (o.zoom.interactive) {
+                eventHolder[o.zoom.trigger](onZoomClick);
+                eventHolder.mousewheel(onMouseWheel);
+            }
+
+            if (o.pan.interactive) {
+                eventHolder.bind("dragstart", { distance: 10 }, onDragStart);
+                eventHolder.bind("drag", onDrag);
+                eventHolder.bind("dragend", onDragEnd);
+            }
+        }
+
+        plot.zoomOut = function (args) {
+            if (!args)
+                args = {};
+            
+            if (!args.amount)
+                args.amount = plot.getOptions().zoom.amount
+
+            args.amount = 1 / args.amount;
+            plot.zoom(args);
+        }
+        
+        plot.zoom = function (args) {
+            if (!args)
+                args = {};
+            
+            var c = args.center,
+                amount = args.amount || plot.getOptions().zoom.amount,
+                w = plot.width(), h = plot.height();
+
+            if (!c)
+                c = { left: w / 2, top: h / 2 };
+                
+            var xf = c.left / w,
+                yf = c.top / h,
+                minmax = {
+                    x: {
+                        min: c.left - xf * w / amount,
+                        max: c.left + (1 - xf) * w / amount
+                    },
+                    y: {
+                        min: c.top - yf * h / amount,
+                        max: c.top + (1 - yf) * h / amount
+                    }
+                };
+
+            $.each(plot.getAxes(), function(_, axis) {
+                var opts = axis.options,
+                    min = minmax[axis.direction].min,
+                    max = minmax[axis.direction].max,
+                    zr = opts.zoomRange;
+
+                if (zr === false) // no zooming on this axis
+                    return;
+                    
+                min = axis.c2p(min);
+                max = axis.c2p(max);
+                if (min > max) {
+                    // make sure min < max
+                    var tmp = min;
+                    min = max;
+                    max = tmp;
+                }
+
+                var range = max - min;
+                if (zr &&
+                    ((zr[0] != null && range < zr[0]) ||
+                     (zr[1] != null && range > zr[1])))
+                    return;
+            
+                opts.min = min;
+                opts.max = max;
+            });
+            
+            plot.setupGrid();
+            plot.draw();
+            
+            if (!args.preventEvent)
+                plot.getPlaceholder().trigger("plotzoom", [ plot ]);
+        }
+
+        plot.pan = function (args) {
+            var delta = {
+                x: +args.left,
+                y: +args.top
+            };
+
+            if (isNaN(delta.x))
+                delta.x = 0;
+            if (isNaN(delta.y))
+                delta.y = 0;
+
+            $.each(plot.getAxes(), function (_, axis) {
+                var opts = axis.options,
+                    min, max, d = delta[axis.direction];
+
+                min = axis.c2p(axis.p2c(axis.min) + d),
+                max = axis.c2p(axis.p2c(axis.max) + d);
+
+                var pr = opts.panRange;
+                if (pr === false) // no panning on this axis
+                    return;
+                
+                if (pr) {
+                    // check whether we hit the wall
+                    if (pr[0] != null && pr[0] > min) {
+                        d = pr[0] - min;
+                        min += d;
+                        max += d;
+                    }
+                    
+                    if (pr[1] != null && pr[1] < max) {
+                        d = pr[1] - max;
+                        min += d;
+                        max += d;
+                    }
+                }
+                
+                opts.min = min;
+                opts.max = max;
+            });
+            
+            plot.setupGrid();
+            plot.draw();
+            
+            if (!args.preventEvent)
+                plot.getPlaceholder().trigger("plotpan", [ plot ]);
+        }
+
+        function shutdown(plot, eventHolder) {
+            eventHolder.unbind(plot.getOptions().zoom.trigger, onZoomClick);
+            eventHolder.unbind("mousewheel", onMouseWheel);
+            eventHolder.unbind("dragstart", onDragStart);
+            eventHolder.unbind("drag", onDrag);
+            eventHolder.unbind("dragend", onDragEnd);
+            if (panTimeout)
+                clearTimeout(panTimeout);
+        }
+        
+        plot.hooks.bindEvents.push(bindEvents);
+        plot.hooks.shutdown.push(shutdown);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'navigate',
+        version: '1.3'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.navigate.min.js
@@ -1,1 +1,1 @@
-
+(function(i){i.fn.drag=function(j,k,l){if(k){this.bind("dragstart",j)}if(l){this.bind("dragend",l)}return !j?this.trigger("drag"):this.bind("drag",k?k:j)};var d=i.event,c=d.special,h=c.drag={not:":input",distance:0,which:1,dragging:false,setup:function(j){j=i.extend({distance:h.distance,which:h.which,not:h.not},j||{});j.distance=e(j.distance);d.add(this,"mousedown",f,j);if(this.attachEvent){this.attachEvent("ondragstart",a)}},teardown:function(){d.remove(this,"mousedown",f);if(this===h.dragging){h.dragging=h.proxy=false}g(this,true);if(this.detachEvent){this.detachEvent("ondragstart",a)}}};c.dragstart=c.dragend={setup:function(){},teardown:function(){}};function f(j){var k=this,l,m=j.data||{};if(m.elem){k=j.dragTarget=m.elem;j.dragProxy=h.proxy||k;j.cursorOffsetX=m.pageX-m.left;j.cursorOffsetY=m.pageY-m.top;j.offsetX=j.pageX-j.cursorOffsetX;j.offsetY=j.pageY-j.cursorOffsetY}else{if(h.dragging||(m.which>0&&j.which!=m.which)||i(j.target).is(m.not)){return}}switch(j.type){case"mousedown":i.extend(m,i(k).offset(),{elem:k,target:j.target,pageX:j.pageX,pageY:j.pageY});d.add(document,"mousemove mouseup",f,m);g(k,false);h.dragging=null;return false;case !h.dragging&&"mousemove":if(e(j.pageX-m.pageX)+e(j.pageY-m.pageY)<m.distance){break}j.target=m.target;l=b(j,"dragstart",k);if(l!==false){h.dragging=k;h.proxy=j.dragProxy=i(l||k)[0]}case"mousemove":if(h.dragging){l=b(j,"drag",k);if(c.drop){c.drop.allowed=(l!==false);c.drop.handler(j)}if(l!==false){break}j.type="mouseup"}case"mouseup":d.remove(document,"mousemove mouseup",f);if(h.dragging){if(c.drop){c.drop.handler(j)}b(j,"dragend",k)}g(k,true);h.dragging=h.proxy=m.elem=false;break}return true}function b(m,k,j){m.type=k;var l=i.event.handle.call(j,m);return l===false?false:l||m.result}function e(j){return Math.pow(j,2)}function a(){return(h.dragging===false)}function g(j,k){if(!j){return}j.unselectable=k?"off":"on";j.onselectstart=function(){return k};if(j.style){j.style.MozUserSelect=k?"":"none"}}})(jQuery);(function(f){var e=["DOMMouseScroll","mousewheel"];f.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var a=e.length;a;){this.addEventListener(e[--a],d,false)}}else{this.onmousewheel=d}},teardown:function(){if(this.removeEventListener){for(var a=e.length;a;){this.removeEventListener(e[--a],d,false)}}else{this.onmousewheel=null}}};f.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}});function d(b){var h=[].slice.call(arguments,1),a=0,c=true;b=f.event.fix(b||window.event);b.type="mousewheel";if(b.wheelDelta){a=b.wheelDelta/120}if(b.detail){a=-b.detail/3}h.unshift(b,a);return f.event.handle.apply(this,h)}})(jQuery);(function(b){var a={xaxis:{zoomRange:null,panRange:null},zoom:{interactive:false,trigger:"dblclick",amount:1.5},pan:{interactive:false,cursor:"move",frameRate:20}};function c(o){function m(q,p){var r=o.offset();r.left=q.pageX-r.left;r.top=q.pageY-r.top;if(p){o.zoomOut({center:r})}else{o.zoom({center:r})}}function d(p,q){m(p,q<0);return false}var i="default",g=0,e=0,n=null;function f(p){if(p.which!=1){return false}var q=o.getPlaceholder().css("cursor");if(q){i=q}o.getPlaceholder().css("cursor",o.getOptions().pan.cursor);g=p.pageX;e=p.pageY}function j(q){var p=o.getOptions().pan.frameRate;if(n||!p){return}n=setTimeout(function(){o.pan({left:g-q.pageX,top:e-q.pageY});g=q.pageX;e=q.pageY;n=null},1/p*1000)}function h(p){if(n){clearTimeout(n);n=null}o.getPlaceholder().css("cursor",i);o.pan({left:g-p.pageX,top:e-p.pageY})}function l(q,p){var r=q.getOptions();if(r.zoom.interactive){p[r.zoom.trigger](m);p.mousewheel(d)}if(r.pan.interactive){p.bind("dragstart",{distance:10},f);p.bind("drag",j);p.bind("dragend",h)}}o.zoomOut=function(p){if(!p){p={}}if(!p.amount){p.amount=o.getOptions().zoom.amount}p.amount=1/p.amount;o.zoom(p)};o.zoom=function(q){if(!q){q={}}var x=q.center,r=q.amount||o.getOptions().zoom.amount,p=o.width(),t=o.height();if(!x){x={left:p/2,top:t/2}}var s=x.left/p,v=x.top/t,u={x:{min:x.left-s*p/r,max:x.left+(1-s)*p/r},y:{min:x.top-v*t/r,max:x.top+(1-v)*t/r}};b.each(o.getAxes(),function(z,C){var D=C.options,B=u[C.direction].min,w=u[C.direction].max,E=D.zoomRange;if(E===false){return}B=C.c2p(B);w=C.c2p(w);if(B>w){var A=B;B=w;w=A}var y=w-B;if(E&&((E[0]!=null&&y<E[0])||(E[1]!=null&&y>E[1]))){return}D.min=B;D.max=w});o.setupGrid();o.draw();if(!q.preventEvent){o.getPlaceholder().trigger("plotzoom",[o])}};o.pan=function(p){var q={x:+p.left,y:+p.top};if(isNaN(q.x)){q.x=0}if(isNaN(q.y)){q.y=0}b.each(o.getAxes(),function(s,u){var v=u.options,t,r,w=q[u.direction];t=u.c2p(u.p2c(u.min)+w),r=u.c2p(u.p2c(u.max)+w);var x=v.panRange;if(x===false){return}if(x){if(x[0]!=null&&x[0]>t){w=x[0]-t;t+=w;r+=w}if(x[1]!=null&&x[1]<r){w=x[1]-r;t+=w;r+=w}}v.min=t;v.max=r});o.setupGrid();o.draw();if(!p.preventEvent){o.getPlaceholder().trigger("plotpan",[o])}};function k(q,p){p.unbind(q.getOptions().zoom.trigger,m);p.unbind("mousewheel",d);p.unbind("dragstart",f);p.unbind("drag",j);p.unbind("dragend",h);if(n){clearTimeout(n)}}o.hooks.bindEvents.push(l);o.hooks.shutdown.push(k)}b.plot.plugins.push({init:c,options:a,name:"navigate",version:"1.3"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.pie.js
@@ -1,1 +1,751 @@
+/*

+Flot plugin for rendering pie charts. The plugin assumes the data is 

+coming is as a single data value for each series, and each of those 

+values is a positive value or zero (negative numbers don't make 

+any sense and will cause strange effects). The data values do 

+NOT need to be passed in as percentage values because it 

+internally calculates the total and percentages.

+

+* Created by Brian Medendorp, June 2009

+* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars

+

+* Changes:

+	2009-10-22: lineJoin set to round

+	2009-10-23: IE full circle fix, donut

+	2009-11-11: Added basic hover from btburnett3 - does not work in IE, and center is off in Chrome and Opera

+	2009-11-17: Added IE hover capability submitted by Anthony Aragues

+	2009-11-18: Added bug fix submitted by Xavi Ivars (issues with arrays when other JS libraries are included as well)

+		

+

+Available options are:

+series: {

+	pie: {

+		show: true/false

+		radius: 0-1 for percentage of fullsize, or a specified pixel length, or 'auto'

+		innerRadius: 0-1 for percentage of fullsize or a specified pixel length, for creating a donut effect

+		startAngle: 0-2 factor of PI used for starting angle (in radians) i.e 3/2 starts at the top, 0 and 2 have the same result

+		tilt: 0-1 for percentage to tilt the pie, where 1 is no tilt, and 0 is completely flat (nothing will show)

+		offset: {

+			top: integer value to move the pie up or down

+			left: integer value to move the pie left or right, or 'auto'

+		},

+		stroke: {

+			color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#FFF')

+			width: integer pixel width of the stroke

+		},

+		label: {

+			show: true/false, or 'auto'

+			formatter:  a user-defined function that modifies the text/style of the label text

+			radius: 0-1 for percentage of fullsize, or a specified pixel length

+			background: {

+				color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#000')

+				opacity: 0-1

+			},

+			threshold: 0-1 for the percentage value at which to hide labels (if they're too small)

+		},

+		combine: {

+			threshold: 0-1 for the percentage value at which to combine slices (if they're too small)

+			color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#CCC'), if null, the plugin will automatically use the color of the first slice to be combined

+			label: any text value of what the combined slice should be labeled

+		}

+		highlight: {

+			opacity: 0-1

+		}

+	}

+}

+

+More detail and specific examples can be found in the included HTML file.

+

+*/

+

+(function ($) 

+{

+	function init(plot) // this is the "body" of the plugin

+	{

+		var canvas = null;

+		var target = null;

+		var maxRadius = null;

+		var centerLeft = null;

+		var centerTop = null;

+		var total = 0;

+		var redraw = true;

+		var redrawAttempts = 10;

+		var shrink = 0.95;

+		var legendWidth = 0;

+		var processed = false;

+		var raw = false;

+		

+		// interactive variables	

+		var highlights = [];	

+	

+		// add hook to determine if pie plugin in enabled, and then perform necessary operations

+		plot.hooks.processOptions.push(checkPieEnabled);

+		plot.hooks.bindEvents.push(bindEvents);	

+

+		// check to see if the pie plugin is enabled

+		function checkPieEnabled(plot, options)

+		{

+			if (options.series.pie.show)

+			{

+				//disable grid

+				options.grid.show = false;

+				

+				// set labels.show

+				if (options.series.pie.label.show=='auto')

+					if (options.legend.show)

+						options.series.pie.label.show = false;

+					else

+						options.series.pie.label.show = true;

+				

+				// set radius

+				if (options.series.pie.radius=='auto')

+					if (options.series.pie.label.show)

+						options.series.pie.radius = 3/4;

+					else

+						options.series.pie.radius = 1;

+						

+				// ensure sane tilt

+				if (options.series.pie.tilt>1)

+					options.series.pie.tilt=1;

+				if (options.series.pie.tilt<0)

+					options.series.pie.tilt=0;

+			

+				// add processData hook to do transformations on the data

+				plot.hooks.processDatapoints.push(processDatapoints);

+				plot.hooks.drawOverlay.push(drawOverlay);	

+				

+				// add draw hook

+				plot.hooks.draw.push(draw);

+			}

+		}

+	

+		// bind hoverable events

+		function bindEvents(plot, eventHolder) 		

+		{		

+			var options = plot.getOptions();

+			

+			if (options.series.pie.show && options.grid.hoverable)

+				eventHolder.unbind('mousemove').mousemove(onMouseMove);

+				

+			if (options.series.pie.show && options.grid.clickable)

+				eventHolder.unbind('click').click(onClick);

+		}	

+		

+

+		// debugging function that prints out an object

+		function alertObject(obj)

+		{

+			var msg = '';

+			function traverse(obj, depth)

+			{

+				if (!depth)

+					depth = 0;

+				for (var i = 0; i < obj.length; ++i)

+				{

+					for (var j=0; j<depth; j++)

+						msg += '\t';

+				

+					if( typeof obj[i] == "object")

+					{	// its an object

+						msg += ''+i+':\n';

+						traverse(obj[i], depth+1);

+					}

+					else

+					{	// its a value

+						msg += ''+i+': '+obj[i]+'\n';

+					}

+				}

+			}

+			traverse(obj);

+			alert(msg);

+		}

+		

+		function calcTotal(data)

+		{

+			for (var i = 0; i < data.length; ++i)

+			{

+				var item = parseFloat(data[i].data[0][1]);

+				if (item)

+					total += item;

+			}

+		}	

+		

+		function processDatapoints(plot, series, data, datapoints) 

+		{	

+			if (!processed)

+			{

+				processed = true;

+			

+				canvas = plot.getCanvas();

+				target = $(canvas).parent();

+				options = plot.getOptions();

+			

+				plot.setData(combine(plot.getData()));

+			}

+		}

+		

+		function setupPie()

+		{

+			legendWidth = target.children().filter('.legend').children().width();

+		

+			// calculate maximum radius and center point

+			maxRadius =  Math.min(canvas.width,(canvas.height/options.series.pie.tilt))/2;

+			centerTop = (canvas.height/2)+options.series.pie.offset.top;

+			centerLeft = (canvas.width/2);

+			

+			if (options.series.pie.offset.left=='auto')

+				if (options.legend.position.match('w'))

+					centerLeft += legendWidth/2;

+				else

+					centerLeft -= legendWidth/2;

+			else

+				centerLeft += options.series.pie.offset.left;

+					

+			if (centerLeft<maxRadius)

+				centerLeft = maxRadius;

+			else if (centerLeft>canvas.width-maxRadius)

+				centerLeft = canvas.width-maxRadius;

+		}

+		

+		function fixData(data)

+		{

+			for (var i = 0; i < data.length; ++i)

+			{

+				if (typeof(data[i].data)=='number')

+					data[i].data = [[1,data[i].data]];

+				else if (typeof(data[i].data)=='undefined' || typeof(data[i].data[0])=='undefined')

+				{

+					if (typeof(data[i].data)!='undefined' && typeof(data[i].data.label)!='undefined')

+						data[i].label = data[i].data.label; // fix weirdness coming from flot

+					data[i].data = [[1,0]];

+					

+				}

+			}

+			return data;

+		}

+		

+		function combine(data)

+		{

+			data = fixData(data);

+			calcTotal(data);

+			var combined = 0;

+			var numCombined = 0;

+			var color = options.series.pie.combine.color;

+			

+			var newdata = [];

+			for (var i = 0; i < data.length; ++i)

+			{

+				// make sure its a number

+				data[i].data[0][1] = parseFloat(data[i].data[0][1]);

+				if (!data[i].data[0][1])

+					data[i].data[0][1] = 0;

+					

+				if (data[i].data[0][1]/total<=options.series.pie.combine.threshold)

+				{

+					combined += data[i].data[0][1];

+					numCombined++;

+					if (!color)

+						color = data[i].color;

+				}				

+				else

+				{

+					newdata.push({

+						data: [[1,data[i].data[0][1]]], 

+						color: data[i].color, 

+						label: data[i].label,

+						angle: (data[i].data[0][1]*(Math.PI*2))/total,

+						percent: (data[i].data[0][1]/total*100)

+					});

+				}

+			}

+			if (numCombined>0)

+				newdata.push({

+					data: [[1,combined]], 

+					color: color, 

+					label: options.series.pie.combine.label,

+					angle: (combined*(Math.PI*2))/total,

+					percent: (combined/total*100)

+				});

+			return newdata;

+		}		

+		

+		function draw(plot, newCtx)

+		{

+			if (!target) return; // if no series were passed

+			ctx = newCtx;

+		

+			setupPie();

+			var slices = plot.getData();

+		

+			var attempts = 0;

+			while (redraw && attempts<redrawAttempts)

+			{

+				redraw = false;

+				if (attempts>0)

+					maxRadius *= shrink;

+				attempts += 1;

+				clear();

+				if (options.series.pie.tilt<=0.8)

+					drawShadow();

+				drawPie();

+			}

+			if (attempts >= redrawAttempts) {

+				clear();

+				target.prepend('<div class="error">Could not draw pie with labels contained inside canvas</div>');

+			}

+			

+			if ( plot.setSeries && plot.insertLegend )

+			{

+				plot.setSeries(slices);

+				plot.insertLegend();

+			}

+			

+			// we're actually done at this point, just defining internal functions at this point

+			

+			function clear()

+			{

+				ctx.clearRect(0,0,canvas.width,canvas.height);

+				target.children().filter('.pieLabel, .pieLabelBackground').remove();

+			}

+			

+			function drawShadow()

+			{

+				var shadowLeft = 5;

+				var shadowTop = 15;

+				var edge = 10;

+				var alpha = 0.02;

+			

+				// set radius

+				if (options.series.pie.radius>1)

+					var radius = options.series.pie.radius;

+				else

+					var radius = maxRadius * options.series.pie.radius;

+					

+				if (radius>=(canvas.width/2)-shadowLeft || radius*options.series.pie.tilt>=(canvas.height/2)-shadowTop || radius<=edge)

+					return;	// shadow would be outside canvas, so don't draw it

+			

+				ctx.save();

+				ctx.translate(shadowLeft,shadowTop);

+				ctx.globalAlpha = alpha;

+				ctx.fillStyle = '#000';

+

+				// center and rotate to starting position

+				ctx.translate(centerLeft,centerTop);

+				ctx.scale(1, options.series.pie.tilt);

+				

+				//radius -= edge;

+				for (var i=1; i<=edge; i++)

+				{

+					ctx.beginPath();

+					ctx.arc(0,0,radius,0,Math.PI*2,false);

+					ctx.fill();

+					radius -= i;

+				}	

+				

+				ctx.restore();

+			}

+			

+			function drawPie()

+			{

+				startAngle = Math.PI*options.series.pie.startAngle;

+				

+				// set radius

+				if (options.series.pie.radius>1)

+					var radius = options.series.pie.radius;

+				else

+					var radius = maxRadius * options.series.pie.radius;

+				

+				// center and rotate to starting position

+				ctx.save();

+				ctx.translate(centerLeft,centerTop);

+				ctx.scale(1, options.series.pie.tilt);

+				//ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera

+				

+				// draw slices

+				ctx.save();

+				var currentAngle = startAngle;

+				for (var i = 0; i < slices.length; ++i)

+				{

+					slices[i].startAngle = currentAngle;

+					drawSlice(slices[i].angle, slices[i].color, true);

+				}

+				ctx.restore();

+				

+				// draw slice outlines

+				ctx.save();

+				ctx.lineWidth = options.series.pie.stroke.width;

+				currentAngle = startAngle;

+				for (var i = 0; i < slices.length; ++i)

+					drawSlice(slices[i].angle, options.series.pie.stroke.color, false);

+				ctx.restore();

+					

+				// draw donut hole

+				drawDonutHole(ctx);

+				

+				// draw labels

+				if (options.series.pie.label.show)

+					drawLabels();

+				

+				// restore to original state

+				ctx.restore();

+				

+				function drawSlice(angle, color, fill)

+				{	

+					if (angle<=0)

+						return;

+				

+					if (fill)

+						ctx.fillStyle = color;

+					else

+					{

+						ctx.strokeStyle = color;

+						ctx.lineJoin = 'round';

+					}

+						

+					ctx.beginPath();

+					if (Math.abs(angle - Math.PI*2) > 0.000000001)

+						ctx.moveTo(0,0); // Center of the pie

+					else if ($.browser.msie)

+						angle -= 0.0001;

+					//ctx.arc(0,0,radius,0,angle,false); // This doesn't work properly in Opera

+					ctx.arc(0,0,radius,currentAngle,currentAngle+angle,false);

+					ctx.closePath();

+					//ctx.rotate(angle); // This doesn't work properly in Opera

+					currentAngle += angle;

+					

+					if (fill)

+						ctx.fill();

+					else

+						ctx.stroke();

+				}

+				

+				function drawLabels()

+				{

+					var currentAngle = startAngle;

+					

+					// set radius

+					if (options.series.pie.label.radius>1)

+						var radius = options.series.pie.label.radius;

+					else

+						var radius = maxRadius * options.series.pie.label.radius;

+					

+					for (var i = 0; i < slices.length; ++i)

+					{

+						if (slices[i].percent >= options.series.pie.label.threshold*100)

+							drawLabel(slices[i], currentAngle, i);

+						currentAngle += slices[i].angle;

+					}

+					

+					function drawLabel(slice, startAngle, index)

+					{

+						if (slice.data[0][1]==0)

+							return;

+							

+						// format label text

+						var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;

+						if (lf)

+							text = lf(slice.label, slice);

+						else

+							text = slice.label;

+						if (plf)

+							text = plf(text, slice);

+							

+						var halfAngle = ((startAngle+slice.angle) + startAngle)/2;

+						var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);

+						var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;

+						

+						var html = '<span class="pieLabel" id="pieLabel'+index+'" style="position:absolute;top:' + y + 'px;left:' + x + 'px;">' + text + "</span>";

+						target.append(html);

+						var label = target.children('#pieLabel'+index);

+						var labelTop = (y - label.height()/2);

+						var labelLeft = (x - label.width()/2);

+						label.css('top', labelTop);

+						label.css('left', labelLeft);

+						

+						// check to make sure that the label is not outside the canvas

+						if (0-labelTop>0 || 0-labelLeft>0 || canvas.height-(labelTop+label.height())<0 || canvas.width-(labelLeft+label.width())<0)

+							redraw = true;

+						

+						if (options.series.pie.label.background.opacity != 0) {

+							// put in the transparent background separately to avoid blended labels and label boxes

+							var c = options.series.pie.label.background.color;

+							if (c == null) {

+								c = slice.color;

+							}

+							var pos = 'top:'+labelTop+'px;left:'+labelLeft+'px;';

+							$('<div class="pieLabelBackground" style="position:absolute;width:' + label.width() + 'px;height:' + label.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').insertBefore(label).css('opacity', options.series.pie.label.background.opacity);

+						}

+					} // end individual label function

+				} // end drawLabels function

+			} // end drawPie function

+		} // end draw function

+		

+		// Placed here because it needs to be accessed from multiple locations 

+		function drawDonutHole(layer)

+		{

+			// draw donut hole

+			if(options.series.pie.innerRadius > 0)

+			{

+				// subtract the center

+				layer.save();

+				innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;

+				layer.globalCompositeOperation = 'destination-out'; // this does not work with excanvas, but it will fall back to using the stroke color

+				layer.beginPath();

+				layer.fillStyle = options.series.pie.stroke.color;

+				layer.arc(0,0,innerRadius,0,Math.PI*2,false);

+				layer.fill();

+				layer.closePath();

+				layer.restore();

+				

+				// add inner stroke

+				layer.save();

+				layer.beginPath();

+				layer.strokeStyle = options.series.pie.stroke.color;

+				layer.arc(0,0,innerRadius,0,Math.PI*2,false);

+				layer.stroke();

+				layer.closePath();

+				layer.restore();

+				// TODO: add extra shadow inside hole (with a mask) if the pie is tilted.

+			}

+		}

+		

+		//-- Additional Interactive related functions --

+		

+		function isPointInPoly(poly, pt)

+		{

+			for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)

+				((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))

+				&& (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])

+				&& (c = !c);

+			return c;

+		}

+		

+		function findNearbySlice(mouseX, mouseY)

+		{

+			var slices = plot.getData(),

+				options = plot.getOptions(),

+				radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;

+			

+			for (var i = 0; i < slices.length; ++i) 

+			{

+				var s = slices[i];	

+				

+				if(s.pie.show)

+				{

+					ctx.save();

+					ctx.beginPath();

+					ctx.moveTo(0,0); // Center of the pie

+					//ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.

+					ctx.arc(0,0,radius,s.startAngle,s.startAngle+s.angle,false);

+					ctx.closePath();

+					x = mouseX-centerLeft;

+					y = mouseY-centerTop;

+					if(ctx.isPointInPath)

+					{

+						if (ctx.isPointInPath(mouseX-centerLeft, mouseY-centerTop))

+						{

+							//alert('found slice!');

+							ctx.restore();

+							return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};

+						}

+					}

+					else

+					{

+						// excanvas for IE doesn;t support isPointInPath, this is a workaround. 

+						p1X = (radius * Math.cos(s.startAngle));

+						p1Y = (radius * Math.sin(s.startAngle));

+						p2X = (radius * Math.cos(s.startAngle+(s.angle/4)));

+						p2Y = (radius * Math.sin(s.startAngle+(s.angle/4)));

+						p3X = (radius * Math.cos(s.startAngle+(s.angle/2)));

+						p3Y = (radius * Math.sin(s.startAngle+(s.angle/2)));

+						p4X = (radius * Math.cos(s.startAngle+(s.angle/1.5)));

+						p4Y = (radius * Math.sin(s.startAngle+(s.angle/1.5)));

+						p5X = (radius * Math.cos(s.startAngle+s.angle));

+						p5Y = (radius * Math.sin(s.startAngle+s.angle));

+						arrPoly = [[0,0],[p1X,p1Y],[p2X,p2Y],[p3X,p3Y],[p4X,p4Y],[p5X,p5Y]];

+						arrPoint = [x,y];

+						// TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?

+						if(isPointInPoly(arrPoly, arrPoint))

+						{

+							ctx.restore();

+							return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};

+						}			

+					}

+					ctx.restore();

+				}

+			}

+			

+			return null;

+		}

+

+		function onMouseMove(e) 

+		{

+			triggerClickHoverEvent('plothover', e);

+		}

+		

+        function onClick(e) 

+		{

+			triggerClickHoverEvent('plotclick', e);

+        }

+

+		// trigger click or hover event (they send the same parameters so we share their code)

+		function triggerClickHoverEvent(eventname, e) 

+		{

+			var offset = plot.offset(),

+				canvasX = parseInt(e.pageX - offset.left),

+				canvasY =  parseInt(e.pageY - offset.top),

+				item = findNearbySlice(canvasX, canvasY);

+			

+			if (options.grid.autoHighlight) 

+			{

+				// clear auto-highlights

+				for (var i = 0; i < highlights.length; ++i) 

+				{

+					var h = highlights[i];

+					if (h.auto == eventname && !(item && h.series == item.series))

+						unhighlight(h.series);

+				}

+			}

+			

+			// highlight the slice

+			if (item) 

+			    highlight(item.series, eventname);

+				

+			// trigger any hover bind events

+			var pos = { pageX: e.pageX, pageY: e.pageY };

+			target.trigger(eventname, [ pos, item ]);	

+		}

+

+		function highlight(s, auto) 

+		{

+			if (typeof s == "number")

+				s = series[s];

+

+			var i = indexOfHighlight(s);

+			if (i == -1) 

+			{

+				highlights.push({ series: s, auto: auto });

+				plot.triggerRedrawOverlay();

+			}

+			else if (!auto)

+				highlights[i].auto = false;

+		}

+

+		function unhighlight(s) 

+		{

+			if (s == null) 

+			{

+				highlights = [];

+				plot.triggerRedrawOverlay();

+			}

+			

+			if (typeof s == "number")

+				s = series[s];

+

+			var i = indexOfHighlight(s);

+			if (i != -1) 

+			{

+				highlights.splice(i, 1);

+				plot.triggerRedrawOverlay();

+			}

+		}

+

+		function indexOfHighlight(s) 

+		{

+			for (var i = 0; i < highlights.length; ++i) 

+			{

+				var h = highlights[i];

+				if (h.series == s)

+					return i;

+			}

+			return -1;

+		}

+

+		function drawOverlay(plot, octx) 

+		{

+			//alert(options.series.pie.radius);

+			var options = plot.getOptions();

+			//alert(options.series.pie.radius);

+			

+			var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;

+

+			octx.save();

+			octx.translate(centerLeft, centerTop);

+			octx.scale(1, options.series.pie.tilt);

+			

+			for (i = 0; i < highlights.length; ++i) 

+				drawHighlight(highlights[i].series);

+			

+			drawDonutHole(octx);

+

+			octx.restore();

+

+			function drawHighlight(series) 

+			{

+				if (series.angle < 0) return;

+				

+				//octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();

+				octx.fillStyle = "rgba(255, 255, 255, "+options.series.pie.highlight.opacity+")"; // this is temporary until we have access to parseColor

+				

+				octx.beginPath();

+				if (Math.abs(series.angle - Math.PI*2) > 0.000000001)

+					octx.moveTo(0,0); // Center of the pie

+				octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle,false);

+				octx.closePath();

+				octx.fill();

+			}

+			

+		}	

+		

+	} // end init (plugin body)

+	

+	// define pie specific options and their default values

+	var options = {

+		series: {

+			pie: {

+				show: false,

+				radius: 'auto',	// actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)

+				innerRadius:0, /* for donut */

+				startAngle: 3/2,

+				tilt: 1,

+				offset: {

+					top: 0,

+					left: 'auto'

+				},

+				stroke: {

+					color: '#FFF',

+					width: 1

+				},

+				label: {

+					show: 'auto',

+					formatter: function(label, slice){

+						return '<div style="font-size:x-small;text-align:center;padding:2px;color:'+slice.color+';">'+label+'<br/>'+Math.round(slice.percent)+'%</div>';

+					},	// formatter function

+					radius: 1,	// radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)

+					background: {

+						color: null,

+						opacity: 0

+					},

+					threshold: 0	// percentage at which to hide the label (i.e. the slice is too narrow)

+				},

+				combine: {

+					threshold: -1,	// percentage at which to combine little slices into one larger slice

+					color: null,	// color to give the new slice (auto-generated if null)

+					label: 'Other'	// label to give the new slice

+				},

+				highlight: {

+					//color: '#FFF',		// will add this functionality once parseColor is available

+					opacity: 0.5

+				}

+			}

+		}

+	};

+    

+	$.plot.plugins.push({

+		init: init,

+		options: options,

+		name: "pie",

+		version: "1.0"

+	});

+})(jQuery);

 

--- /dev/null
+++ b/lib/flot/jquery.flot.pie.min.js
@@ -1,1 +1,1 @@
-
+(function(b){function c(D){var h=null;var L=null;var n=null;var B=null;var p=null;var M=0;var F=true;var o=10;var w=0.95;var A=0;var d=false;var z=false;var j=[];D.hooks.processOptions.push(g);D.hooks.bindEvents.push(e);function g(O,N){if(N.series.pie.show){N.grid.show=false;if(N.series.pie.label.show=="auto"){if(N.legend.show){N.series.pie.label.show=false}else{N.series.pie.label.show=true}}if(N.series.pie.radius=="auto"){if(N.series.pie.label.show){N.series.pie.radius=3/4}else{N.series.pie.radius=1}}if(N.series.pie.tilt>1){N.series.pie.tilt=1}if(N.series.pie.tilt<0){N.series.pie.tilt=0}O.hooks.processDatapoints.push(E);O.hooks.drawOverlay.push(H);O.hooks.draw.push(r)}}function e(P,N){var O=P.getOptions();if(O.series.pie.show&&O.grid.hoverable){N.unbind("mousemove").mousemove(t)}if(O.series.pie.show&&O.grid.clickable){N.unbind("click").click(l)}}function G(O){var P="";function N(S,T){if(!T){T=0}for(var R=0;R<S.length;++R){for(var Q=0;Q<T;Q++){P+="\t"}if(typeof S[R]=="object"){P+=""+R+":\n";N(S[R],T+1)}else{P+=""+R+": "+S[R]+"\n"}}}N(O);alert(P)}function q(P){for(var N=0;N<P.length;++N){var O=parseFloat(P[N].data[0][1]);if(O){M+=O}}}function E(Q,N,O,P){if(!d){d=true;h=Q.getCanvas();L=b(h).parent();a=Q.getOptions();Q.setData(K(Q.getData()))}}function I(){A=L.children().filter(".legend").children().width();n=Math.min(h.width,(h.height/a.series.pie.tilt))/2;p=(h.height/2)+a.series.pie.offset.top;B=(h.width/2);if(a.series.pie.offset.left=="auto"){if(a.legend.position.match("w")){B+=A/2}else{B-=A/2}}else{B+=a.series.pie.offset.left}if(B<n){B=n}else{if(B>h.width-n){B=h.width-n}}}function v(O){for(var N=0;N<O.length;++N){if(typeof(O[N].data)=="number"){O[N].data=[[1,O[N].data]]}else{if(typeof(O[N].data)=="undefined"||typeof(O[N].data[0])=="undefined"){if(typeof(O[N].data)!="undefined"&&typeof(O[N].data.label)!="undefined"){O[N].label=O[N].data.label}O[N].data=[[1,0]]}}}return O}function K(Q){Q=v(Q);q(Q);var P=0;var S=0;var N=a.series.pie.combine.color;var R=[];for(var O=0;O<Q.length;++O){Q[O].data[0][1]=parseFloat(Q[O].data[0][1]);if(!Q[O].data[0][1]){Q[O].data[0][1]=0}if(Q[O].data[0][1]/M<=a.series.pie.combine.threshold){P+=Q[O].data[0][1];S++;if(!N){N=Q[O].color}}else{R.push({data:[[1,Q[O].data[0][1]]],color:Q[O].color,label:Q[O].label,angle:(Q[O].data[0][1]*(Math.PI*2))/M,percent:(Q[O].data[0][1]/M*100)})}}if(S>0){R.push({data:[[1,P]],color:N,label:a.series.pie.combine.label,angle:(P*(Math.PI*2))/M,percent:(P/M*100)})}return R}function r(S,Q){if(!L){return}ctx=Q;I();var T=S.getData();var P=0;while(F&&P<o){F=false;if(P>0){n*=w}P+=1;N();if(a.series.pie.tilt<=0.8){O()}R()}if(P>=o){N();L.prepend('<div class="error">Could not draw pie with labels contained inside canvas</div>')}if(S.setSeries&&S.insertLegend){S.setSeries(T);S.insertLegend()}function N(){ctx.clearRect(0,0,h.width,h.height);L.children().filter(".pieLabel, .pieLabelBackground").remove()}function O(){var Z=5;var Y=15;var W=10;var X=0.02;if(a.series.pie.radius>1){var U=a.series.pie.radius}else{var U=n*a.series.pie.radius}if(U>=(h.width/2)-Z||U*a.series.pie.tilt>=(h.height/2)-Y||U<=W){return}ctx.save();ctx.translate(Z,Y);ctx.globalAlpha=X;ctx.fillStyle="#000";ctx.translate(B,p);ctx.scale(1,a.series.pie.tilt);for(var V=1;V<=W;V++){ctx.beginPath();ctx.arc(0,0,U,0,Math.PI*2,false);ctx.fill();U-=V}ctx.restore()}function R(){startAngle=Math.PI*a.series.pie.startAngle;if(a.series.pie.radius>1){var U=a.series.pie.radius}else{var U=n*a.series.pie.radius}ctx.save();ctx.translate(B,p);ctx.scale(1,a.series.pie.tilt);ctx.save();var Y=startAngle;for(var W=0;W<T.length;++W){T[W].startAngle=Y;X(T[W].angle,T[W].color,true)}ctx.restore();ctx.save();ctx.lineWidth=a.series.pie.stroke.width;Y=startAngle;for(var W=0;W<T.length;++W){X(T[W].angle,a.series.pie.stroke.color,false)}ctx.restore();J(ctx);if(a.series.pie.label.show){V()}ctx.restore();function X(ab,Z,aa){if(ab<=0){return}if(aa){ctx.fillStyle=Z}else{ctx.strokeStyle=Z;ctx.lineJoin="round"}ctx.beginPath();if(Math.abs(ab-Math.PI*2)>1e-9){ctx.moveTo(0,0)}else{if(b.browser.msie){ab-=0.0001}}ctx.arc(0,0,U,Y,Y+ab,false);ctx.closePath();Y+=ab;if(aa){ctx.fill()}else{ctx.stroke()}}function V(){var ac=startAngle;if(a.series.pie.label.radius>1){var Z=a.series.pie.label.radius}else{var Z=n*a.series.pie.label.radius}for(var ab=0;ab<T.length;++ab){if(T[ab].percent>=a.series.pie.label.threshold*100){aa(T[ab],ac,ab)}ac+=T[ab].angle}function aa(ap,ai,ag){if(ap.data[0][1]==0){return}var ar=a.legend.labelFormatter,aq,ae=a.series.pie.label.formatter;if(ar){aq=ar(ap.label,ap)}else{aq=ap.label}if(ae){aq=ae(aq,ap)}var aj=((ai+ap.angle)+ai)/2;var ao=B+Math.round(Math.cos(aj)*Z);var am=p+Math.round(Math.sin(aj)*Z)*a.series.pie.tilt;var af='<span class="pieLabel" id="pieLabel'+ag+'" style="position:absolute;top:'+am+"px;left:"+ao+'px;">'+aq+"</span>";L.append(af);var an=L.children("#pieLabel"+ag);var ad=(am-an.height()/2);var ah=(ao-an.width()/2);an.css("top",ad);an.css("left",ah);if(0-ad>0||0-ah>0||h.height-(ad+an.height())<0||h.width-(ah+an.width())<0){F=true}if(a.series.pie.label.background.opacity!=0){var ak=a.series.pie.label.background.color;if(ak==null){ak=ap.color}var al="top:"+ad+"px;left:"+ah+"px;";b('<div class="pieLabelBackground" style="position:absolute;width:'+an.width()+"px;height:"+an.height()+"px;"+al+"background-color:"+ak+';"> </div>').insertBefore(an).css("opacity",a.series.pie.label.background.opacity)}}}}}function J(N){if(a.series.pie.innerRadius>0){N.save();innerRadius=a.series.pie.innerRadius>1?a.series.pie.innerRadius:n*a.series.pie.innerRadius;N.globalCompositeOperation="destination-out";N.beginPath();N.fillStyle=a.series.pie.stroke.color;N.arc(0,0,innerRadius,0,Math.PI*2,false);N.fill();N.closePath();N.restore();N.save();N.beginPath();N.strokeStyle=a.series.pie.stroke.color;N.arc(0,0,innerRadius,0,Math.PI*2,false);N.stroke();N.closePath();N.restore()}}function s(Q,R){for(var S=false,P=-1,N=Q.length,O=N-1;++P<N;O=P){((Q[P][1]<=R[1]&&R[1]<Q[O][1])||(Q[O][1]<=R[1]&&R[1]<Q[P][1]))&&(R[0]<(Q[O][0]-Q[P][0])*(R[1]-Q[P][1])/(Q[O][1]-Q[P][1])+Q[P][0])&&(S=!S)}return S}function u(R,P){var T=D.getData(),O=D.getOptions(),N=O.series.pie.radius>1?O.series.pie.radius:n*O.series.pie.radius;for(var Q=0;Q<T.length;++Q){var S=T[Q];if(S.pie.show){ctx.save();ctx.beginPath();ctx.moveTo(0,0);ctx.arc(0,0,N,S.startAngle,S.startAngle+S.angle,false);ctx.closePath();x=R-B;y=P-p;if(ctx.isPointInPath){if(ctx.isPointInPath(R-B,P-p)){ctx.restore();return{datapoint:[S.percent,S.data],dataIndex:0,series:S,seriesIndex:Q}}}else{p1X=(N*Math.cos(S.startAngle));p1Y=(N*Math.sin(S.startAngle));p2X=(N*Math.cos(S.startAngle+(S.angle/4)));p2Y=(N*Math.sin(S.startAngle+(S.angle/4)));p3X=(N*Math.cos(S.startAngle+(S.angle/2)));p3Y=(N*Math.sin(S.startAngle+(S.angle/2)));p4X=(N*Math.cos(S.startAngle+(S.angle/1.5)));p4Y=(N*Math.sin(S.startAngle+(S.angle/1.5)));p5X=(N*Math.cos(S.startAngle+S.angle));p5Y=(N*Math.sin(S.startAngle+S.angle));arrPoly=[[0,0],[p1X,p1Y],[p2X,p2Y],[p3X,p3Y],[p4X,p4Y],[p5X,p5Y]];arrPoint=[x,y];if(s(arrPoly,arrPoint)){ctx.restore();return{datapoint:[S.percent,S.data],dataIndex:0,series:S,seriesIndex:Q}}}ctx.restore()}}return null}function t(N){m("plothover",N)}function l(N){m("plotclick",N)}function m(N,T){var O=D.offset(),R=parseInt(T.pageX-O.left),P=parseInt(T.pageY-O.top),V=u(R,P);if(a.grid.autoHighlight){for(var Q=0;Q<j.length;++Q){var S=j[Q];if(S.auto==N&&!(V&&S.series==V.series)){f(S.series)}}}if(V){k(V.series,N)}var U={pageX:T.pageX,pageY:T.pageY};L.trigger(N,[U,V])}function k(O,P){if(typeof O=="number"){O=series[O]}var N=C(O);if(N==-1){j.push({series:O,auto:P});D.triggerRedrawOverlay()}else{if(!P){j[N].auto=false}}}function f(O){if(O==null){j=[];D.triggerRedrawOverlay()}if(typeof O=="number"){O=series[O]}var N=C(O);if(N!=-1){j.splice(N,1);D.triggerRedrawOverlay()}}function C(P){for(var N=0;N<j.length;++N){var O=j[N];if(O.series==P){return N}}return -1}function H(Q,R){var P=Q.getOptions();var N=P.series.pie.radius>1?P.series.pie.radius:n*P.series.pie.radius;R.save();R.translate(B,p);R.scale(1,P.series.pie.tilt);for(i=0;i<j.length;++i){O(j[i].series)}J(R);R.restore();function O(S){if(S.angle<0){return}R.fillStyle="rgba(255, 255, 255, "+P.series.pie.highlight.opacity+")";R.beginPath();if(Math.abs(S.angle-Math.PI*2)>1e-9){R.moveTo(0,0)}R.arc(0,0,N,S.startAngle,S.startAngle+S.angle,false);R.closePath();R.fill()}}}var a={series:{pie:{show:false,radius:"auto",innerRadius:0,startAngle:3/2,tilt:1,offset:{top:0,left:"auto"},stroke:{color:"#FFF",width:1},label:{show:"auto",formatter:function(d,e){return'<div style="font-size:x-small;text-align:center;padding:2px;color:'+e.color+';">'+d+"<br/>"+Math.round(e.percent)+"%</div>"},radius:1,background:{color:null,opacity:0},threshold:0},combine:{threshold:-1,color:null,label:"Other"},highlight:{opacity:0.5}}}};b.plot.plugins.push({init:c,options:a,name:"pie",version:"1.0"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.resize.js
@@ -1,1 +1,61 @@
+/*
+Flot plugin for automatically redrawing plots when the placeholder
+size changes, e.g. on window resizes.
 
+It works by listening for changes on the placeholder div (through the
+jQuery resize event plugin) - if the size changes, it will redraw the
+plot.
+
+There are no options. If you need to disable the plugin for some
+plots, you can just fix the size of their placeholders.
+*/
+
+
+/* Inline dependency: 
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this);
+
+
+(function ($) {
+    var options = { }; // no options
+
+    function init(plot) {
+        function onResize() {
+            var placeholder = plot.getPlaceholder();
+
+            // somebody might have hidden us and we can't plot
+            // when we don't have the dimensions
+            if (placeholder.width() == 0 || placeholder.height() == 0)
+                return;
+
+            plot.resize();
+            plot.setupGrid();
+            plot.draw();
+        }
+        
+        function bindEvents(plot, eventHolder) {
+            plot.getPlaceholder().resize(onResize);
+        }
+
+        function shutdown(plot, eventHolder) {
+            plot.getPlaceholder().unbind("resize", onResize);
+        }
+        
+        plot.hooks.bindEvents.push(bindEvents);
+        plot.hooks.shutdown.push(shutdown);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'resize',
+        version: '1.0'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.resize.min.js
@@ -1,1 +1,1 @@
-
+(function(n,p,u){var w=n([]),s=n.resize=n.extend(n.resize,{}),o,l="setTimeout",m="resize",t=m+"-special-event",v="delay",r="throttleWindow";s[v]=250;s[r]=true;n.event.special[m]={setup:function(){if(!s[r]&&this[l]){return false}var a=n(this);w=w.add(a);n.data(this,t,{w:a.width(),h:a.height()});if(w.length===1){q()}},teardown:function(){if(!s[r]&&this[l]){return false}var a=n(this);w=w.not(a);a.removeData(t);if(!w.length){clearTimeout(o)}},add:function(b){if(!s[r]&&this[l]){return false}var c;function a(d,h,g){var f=n(this),e=n.data(this,t);e.w=h!==u?h:f.width();e.h=g!==u?g:f.height();c.apply(this,arguments)}if(n.isFunction(b)){c=b;return a}else{c=b.handler;b.handler=a}}};function q(){o=p[l](function(){w.each(function(){var d=n(this),a=d.width(),b=d.height(),c=n.data(this,t);if(a!==c.w||b!==c.h){d.trigger(m,[c.w=a,c.h=b])}});q()},s[v])}})(jQuery,this);(function(b){var a={};function c(f){function e(){var h=f.getPlaceholder();if(h.width()==0||h.height()==0){return}f.resize();f.setupGrid();f.draw()}function g(i,h){i.getPlaceholder().resize(e)}function d(i,h){i.getPlaceholder().unbind("resize",e)}f.hooks.bindEvents.push(g);f.hooks.shutdown.push(d)}b.plot.plugins.push({init:c,options:a,name:"resize",version:"1.0"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.selection.js
@@ -1,1 +1,345 @@
-
+/*
+Flot plugin for selecting regions.
+
+The plugin defines the following options:
+
+  selection: {
+    mode: null or "x" or "y" or "xy",
+    color: color
+  }
+
+Selection support is enabled by setting the mode to one of "x", "y" or
+"xy". In "x" mode, the user will only be able to specify the x range,
+similarly for "y" mode. For "xy", the selection becomes a rectangle
+where both ranges can be specified. "color" is color of the selection
+(if you need to change the color later on, you can get to it with
+plot.getOptions().selection.color).
+
+When selection support is enabled, a "plotselected" event will be
+emitted on the DOM element you passed into the plot function. The
+event handler gets a parameter with the ranges selected on the axes,
+like this:
+
+  placeholder.bind("plotselected", function(event, ranges) {
+    alert("You selected " + ranges.xaxis.from + " to " + ranges.xaxis.to)
+    // similar for yaxis - with multiple axes, the extra ones are in
+    // x2axis, x3axis, ...
+  });
+
+The "plotselected" event is only fired when the user has finished
+making the selection. A "plotselecting" event is fired during the
+process with the same parameters as the "plotselected" event, in case
+you want to know what's happening while it's happening,
+
+A "plotunselected" event with no arguments is emitted when the user
+clicks the mouse to remove the selection.
+
+The plugin allso adds the following methods to the plot object:
+
+- setSelection(ranges, preventEvent)
+
+  Set the selection rectangle. The passed in ranges is on the same
+  form as returned in the "plotselected" event. If the selection mode
+  is "x", you should put in either an xaxis range, if the mode is "y"
+  you need to put in an yaxis range and both xaxis and yaxis if the
+  selection mode is "xy", like this:
+
+    setSelection({ xaxis: { from: 0, to: 10 }, yaxis: { from: 40, to: 60 } });
+
+  setSelection will trigger the "plotselected" event when called. If
+  you don't want that to happen, e.g. if you're inside a
+  "plotselected" handler, pass true as the second parameter. If you
+  are using multiple axes, you can specify the ranges on any of those,
+  e.g. as x2axis/x3axis/... instead of xaxis, the plugin picks the
+  first one it sees.
+  
+- clearSelection(preventEvent)
+
+  Clear the selection rectangle. Pass in true to avoid getting a
+  "plotunselected" event.
+
+- getSelection()
+
+  Returns the current selection in the same format as the
+  "plotselected" event. If there's currently no selection, the
+  function returns null.
+
+*/
+
+(function ($) {
+    function init(plot) {
+        var selection = {
+                first: { x: -1, y: -1}, second: { x: -1, y: -1},
+                show: false,
+                active: false
+            };
+
+        // FIXME: The drag handling implemented here should be
+        // abstracted out, there's some similar code from a library in
+        // the navigation plugin, this should be massaged a bit to fit
+        // the Flot cases here better and reused. Doing this would
+        // make this plugin much slimmer.
+        var savedhandlers = {};
+
+        var mouseUpHandler = null;
+        
+        function onMouseMove(e) {
+            if (selection.active) {
+                updateSelection(e);
+                
+                plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
+            }
+        }
+
+        function onMouseDown(e) {
+            if (e.which != 1)  // only accept left-click
+                return;
+            
+            // cancel out any text selections
+            document.body.focus();
+
+            // prevent text selection and drag in old-school browsers
+            if (document.onselectstart !== undefined && savedhandlers.onselectstart == null) {
+                savedhandlers.onselectstart = document.onselectstart;
+                document.onselectstart = function () { return false; };
+            }
+            if (document.ondrag !== undefined && savedhandlers.ondrag == null) {
+                savedhandlers.ondrag = document.ondrag;
+                document.ondrag = function () { return false; };
+            }
+
+            setSelectionPos(selection.first, e);
+
+            selection.active = true;
+
+            // this is a bit silly, but we have to use a closure to be
+            // able to whack the same handler again
+            mouseUpHandler = function (e) { onMouseUp(e); };
+            
+            $(document).one("mouseup", mouseUpHandler);
+        }
+
+        function onMouseUp(e) {
+            mouseUpHandler = null;
+            
+            // revert drag stuff for old-school browsers
+            if (document.onselectstart !== undefined)
+                document.onselectstart = savedhandlers.onselectstart;
+            if (document.ondrag !== undefined)
+                document.ondrag = savedhandlers.ondrag;
+
+            // no more dragging
+            selection.active = false;
+            updateSelection(e);
+
+            if (selectionIsSane())
+                triggerSelectedEvent();
+            else {
+                // this counts as a clear
+                plot.getPlaceholder().trigger("plotunselected", [ ]);
+                plot.getPlaceholder().trigger("plotselecting", [ null ]);
+            }
+
+            return false;
+        }
+
+        function getSelection() {
+            if (!selectionIsSane())
+                return null;
+
+            var r = {}, c1 = selection.first, c2 = selection.second;
+            $.each(plot.getAxes(), function (name, axis) {
+                if (axis.used) {
+                    var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]); 
+                    r[name] = { from: Math.min(p1, p2), to: Math.max(p1, p2) };
+                }
+            });
+            return r;
+        }
+
+        function triggerSelectedEvent() {
+            var r = getSelection();
+
+            plot.getPlaceholder().trigger("plotselected", [ r ]);
+
+            // backwards-compat stuff, to be removed in future
+            if (r.xaxis && r.yaxis)
+                plot.getPlaceholder().trigger("selected", [ { x1: r.xaxis.from, y1: r.yaxis.from, x2: r.xaxis.to, y2: r.yaxis.to } ]);
+        }
+
+        function clamp(min, value, max) {
+            return value < min ? min: (value > max ? max: value);
+        }
+
+        function setSelectionPos(pos, e) {
+            var o = plot.getOptions();
+            var offset = plot.getPlaceholder().offset();
+            var plotOffset = plot.getPlotOffset();
+            pos.x = clamp(0, e.pageX - offset.left - plotOffset.left, plot.width());
+            pos.y = clamp(0, e.pageY - offset.top - plotOffset.top, plot.height());
+
+            if (o.selection.mode == "y")
+                pos.x = pos == selection.first ? 0 : plot.width();
+
+            if (o.selection.mode == "x")
+                pos.y = pos == selection.first ? 0 : plot.height();
+        }
+
+        function updateSelection(pos) {
+            if (pos.pageX == null)
+                return;
+
+            setSelectionPos(selection.second, pos);
+            if (selectionIsSane()) {
+                selection.show = true;
+                plot.triggerRedrawOverlay();
+            }
+            else
+                clearSelection(true);
+        }
+
+        function clearSelection(preventEvent) {
+            if (selection.show) {
+                selection.show = false;
+                plot.triggerRedrawOverlay();
+                if (!preventEvent)
+                    plot.getPlaceholder().trigger("plotunselected", [ ]);
+            }
+        }
+
+        // function taken from markings support in Flot
+        function extractRange(ranges, coord) {
+            var axis, from, to, key, axes = plot.getAxes();
+
+            for (var k in axes) {
+                axis = axes[k];
+                if (axis.direction == coord) {
+                    key = coord + axis.n + "axis";
+                    if (!ranges[key] && axis.n == 1)
+                        key = coord + "axis"; // support x1axis as xaxis
+                    if (ranges[key]) {
+                        from = ranges[key].from;
+                        to = ranges[key].to;
+                        break;
+                    }
+                }
+            }
+
+            // backwards-compat stuff - to be removed in future
+            if (!ranges[key]) {
+                axis = coord == "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
+                from = ranges[coord + "1"];
+                to = ranges[coord + "2"];
+            }
+
+            // auto-reverse as an added bonus
+            if (from != null && to != null && from > to) {
+                var tmp = from;
+                from = to;
+                to = tmp;
+            }
+            
+            return { from: from, to: to, axis: axis };
+        }
+        
+        function setSelection(ranges, preventEvent) {
+            var axis, range, o = plot.getOptions();
+
+            if (o.selection.mode == "y") {
+                selection.first.x = 0;
+                selection.second.x = plot.width();
+            }
+            else {
+                range = extractRange(ranges, "x");
+
+                selection.first.x = range.axis.p2c(range.from);
+                selection.second.x = range.axis.p2c(range.to);
+            }
+
+            if (o.selection.mode == "x") {
+                selection.first.y = 0;
+                selection.second.y = plot.height();
+            }
+            else {
+                range = extractRange(ranges, "y");
+
+                selection.first.y = range.axis.p2c(range.from);
+                selection.second.y = range.axis.p2c(range.to);
+            }
+
+            selection.show = true;
+            plot.triggerRedrawOverlay();
+            if (!preventEvent && selectionIsSane())
+                triggerSelectedEvent();
+        }
+
+        function selectionIsSane() {
+            var minSize = 5;
+            return Math.abs(selection.second.x - selection.first.x) >= minSize &&
+                Math.abs(selection.second.y - selection.first.y) >= minSize;
+        }
+
+        plot.clearSelection = clearSelection;
+        plot.setSelection = setSelection;
+        plot.getSelection = getSelection;
+
+        plot.hooks.bindEvents.push(function(plot, eventHolder) {
+            var o = plot.getOptions();
+            if (o.selection.mode != null) {
+                eventHolder.mousemove(onMouseMove);
+                eventHolder.mousedown(onMouseDown);
+            }
+        });
+
+
+        plot.hooks.drawOverlay.push(function (plot, ctx) {
+            // draw selection
+            if (selection.show && selectionIsSane()) {
+                var plotOffset = plot.getPlotOffset();
+                var o = plot.getOptions();
+
+                ctx.save();
+                ctx.translate(plotOffset.left, plotOffset.top);
+
+                var c = $.color.parse(o.selection.color);
+
+                ctx.strokeStyle = c.scale('a', 0.8).toString();
+                ctx.lineWidth = 1;
+                ctx.lineJoin = "round";
+                ctx.fillStyle = c.scale('a', 0.4).toString();
+
+                var x = Math.min(selection.first.x, selection.second.x),
+                    y = Math.min(selection.first.y, selection.second.y),
+                    w = Math.abs(selection.second.x - selection.first.x),
+                    h = Math.abs(selection.second.y - selection.first.y);
+
+                ctx.fillRect(x, y, w, h);
+                ctx.strokeRect(x, y, w, h);
+
+                ctx.restore();
+            }
+        });
+        
+        plot.hooks.shutdown.push(function (plot, eventHolder) {
+            eventHolder.unbind("mousemove", onMouseMove);
+            eventHolder.unbind("mousedown", onMouseDown);
+            
+            if (mouseUpHandler)
+                $(document).unbind("mouseup", mouseUpHandler);
+        });
+
+    }
+
+    $.plot.plugins.push({
+        init: init,
+        options: {
+            selection: {
+                mode: null, // one of null, "x", "y" or "xy"
+                color: "#e8cfac"
+            }
+        },
+        name: 'selection',
+        version: '1.1'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.selection.min.js
@@ -1,1 +1,1 @@
-
+(function(a){function b(k){var p={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var m={};var r=null;function e(s){if(p.active){l(s);k.getPlaceholder().trigger("plotselecting",[g()])}}function n(s){if(s.which!=1){return}document.body.focus();if(document.onselectstart!==undefined&&m.onselectstart==null){m.onselectstart=document.onselectstart;document.onselectstart=function(){return false}}if(document.ondrag!==undefined&&m.ondrag==null){m.ondrag=document.ondrag;document.ondrag=function(){return false}}d(p.first,s);p.active=true;r=function(t){j(t)};a(document).one("mouseup",r)}function j(s){r=null;if(document.onselectstart!==undefined){document.onselectstart=m.onselectstart}if(document.ondrag!==undefined){document.ondrag=m.ondrag}p.active=false;l(s);if(f()){i()}else{k.getPlaceholder().trigger("plotunselected",[]);k.getPlaceholder().trigger("plotselecting",[null])}return false}function g(){if(!f()){return null}var u={},t=p.first,s=p.second;a.each(k.getAxes(),function(v,w){if(w.used){var y=w.c2p(t[w.direction]),x=w.c2p(s[w.direction]);u[v]={from:Math.min(y,x),to:Math.max(y,x)}}});return u}function i(){var s=g();k.getPlaceholder().trigger("plotselected",[s]);if(s.xaxis&&s.yaxis){k.getPlaceholder().trigger("selected",[{x1:s.xaxis.from,y1:s.yaxis.from,x2:s.xaxis.to,y2:s.yaxis.to}])}}function h(t,u,s){return u<t?t:(u>s?s:u)}function d(w,t){var v=k.getOptions();var u=k.getPlaceholder().offset();var s=k.getPlotOffset();w.x=h(0,t.pageX-u.left-s.left,k.width());w.y=h(0,t.pageY-u.top-s.top,k.height());if(v.selection.mode=="y"){w.x=w==p.first?0:k.width()}if(v.selection.mode=="x"){w.y=w==p.first?0:k.height()}}function l(s){if(s.pageX==null){return}d(p.second,s);if(f()){p.show=true;k.triggerRedrawOverlay()}else{q(true)}}function q(s){if(p.show){p.show=false;k.triggerRedrawOverlay();if(!s){k.getPlaceholder().trigger("plotunselected",[])}}}function c(s,w){var t,y,z,A,x=k.getAxes();for(var u in x){t=x[u];if(t.direction==w){A=w+t.n+"axis";if(!s[A]&&t.n==1){A=w+"axis"}if(s[A]){y=s[A].from;z=s[A].to;break}}}if(!s[A]){t=w=="x"?k.getXAxes()[0]:k.getYAxes()[0];y=s[w+"1"];z=s[w+"2"]}if(y!=null&&z!=null&&y>z){var v=y;y=z;z=v}return{from:y,to:z,axis:t}}function o(t,s){var v,u,w=k.getOptions();if(w.selection.mode=="y"){p.first.x=0;p.second.x=k.width()}else{u=c(t,"x");p.first.x=u.axis.p2c(u.from);p.second.x=u.axis.p2c(u.to)}if(w.selection.mode=="x"){p.first.y=0;p.second.y=k.height()}else{u=c(t,"y");p.first.y=u.axis.p2c(u.from);p.second.y=u.axis.p2c(u.to)}p.show=true;k.triggerRedrawOverlay();if(!s&&f()){i()}}function f(){var s=5;return Math.abs(p.second.x-p.first.x)>=s&&Math.abs(p.second.y-p.first.y)>=s}k.clearSelection=q;k.setSelection=o;k.getSelection=g;k.hooks.bindEvents.push(function(t,s){var u=t.getOptions();if(u.selection.mode!=null){s.mousemove(e);s.mousedown(n)}});k.hooks.drawOverlay.push(function(v,D){if(p.show&&f()){var t=v.getPlotOffset();var s=v.getOptions();D.save();D.translate(t.left,t.top);var z=a.color.parse(s.selection.color);D.strokeStyle=z.scale("a",0.8).toString();D.lineWidth=1;D.lineJoin="round";D.fillStyle=z.scale("a",0.4).toString();var B=Math.min(p.first.x,p.second.x),A=Math.min(p.first.y,p.second.y),C=Math.abs(p.second.x-p.first.x),u=Math.abs(p.second.y-p.first.y);D.fillRect(B,A,C,u);D.strokeRect(B,A,C,u);D.restore()}});k.hooks.shutdown.push(function(t,s){s.unbind("mousemove",e);s.unbind("mousedown",n);if(r){a(document).unbind("mouseup",r)}})}a.plot.plugins.push({init:b,options:{selection:{mode:null,color:"#e8cfac"}},name:"selection",version:"1.1"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.stack.js
@@ -1,1 +1,185 @@
+/*
+Flot plugin for stacking data sets, i.e. putting them on top of each
+other, for accumulative graphs.
 
+The plugin assumes the data is sorted on x (or y if stacking
+horizontally). For line charts, it is assumed that if a line has an
+undefined gap (from a null point), then the line above it should have
+the same gap - insert zeros instead of "null" if you want another
+behaviour. This also holds for the start and end of the chart. Note
+that stacking a mix of positive and negative values in most instances
+doesn't make sense (so it looks weird).
+
+Two or more series are stacked when their "stack" attribute is set to
+the same key (which can be any number or string or just "true"). To
+specify the default stack, you can set
+
+  series: {
+    stack: null or true or key (number/string)
+  }
+
+or specify it for a specific series
+
+  $.plot($("#placeholder"), [{ data: [ ... ], stack: true }])
+  
+The stacking order is determined by the order of the data series in
+the array (later series end up on top of the previous).
+
+Internally, the plugin modifies the datapoints in each series, adding
+an offset to the y value. For line series, extra data points are
+inserted through interpolation. If there's a second y value, it's also
+adjusted (e.g for bar charts or filled areas).
+*/
+
+(function ($) {
+    var options = {
+        series: { stack: null } // or number/string
+    };
+    
+    function init(plot) {
+        function findMatchingSeries(s, allseries) {
+            var res = null
+            for (var i = 0; i < allseries.length; ++i) {
+                if (s == allseries[i])
+                    break;
+                
+                if (allseries[i].stack == s.stack)
+                    res = allseries[i];
+            }
+            
+            return res;
+        }
+        
+        function stackData(plot, s, datapoints) {
+            if (s.stack == null)
+                return;
+
+            var other = findMatchingSeries(s, plot.getData());
+            if (!other)
+                return;
+
+            var ps = datapoints.pointsize,
+                points = datapoints.points,
+                otherps = other.datapoints.pointsize,
+                otherpoints = other.datapoints.points,
+                newpoints = [],
+                px, py, intery, qx, qy, bottom,
+                withlines = s.lines.show,
+                horizontal = s.bars.horizontal,
+                withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
+                withsteps = withlines && s.lines.steps,
+                fromgap = true,
+                keyOffset = horizontal ? 1 : 0,
+                accumulateOffset = horizontal ? 0 : 1,
+                i = 0, j = 0, l;
+
+            while (true) {
+                if (i >= points.length)
+                    break;
+
+                l = newpoints.length;
+
+                if (points[i] == null) {
+                    // copy gaps
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(points[i + m]);
+                    i += ps;
+                }
+                else if (j >= otherpoints.length) {
+                    // for lines, we can't use the rest of the points
+                    if (!withlines) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                    }
+                    i += ps;
+                }
+                else if (otherpoints[j] == null) {
+                    // oops, got a gap
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(null);
+                    fromgap = true;
+                    j += otherps;
+                }
+                else {
+                    // cases where we actually got two points
+                    px = points[i + keyOffset];
+                    py = points[i + accumulateOffset];
+                    qx = otherpoints[j + keyOffset];
+                    qy = otherpoints[j + accumulateOffset];
+                    bottom = 0;
+
+                    if (px == qx) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+
+                        newpoints[l + accumulateOffset] += qy;
+                        bottom = qy;
+                        
+                        i += ps;
+                        j += otherps;
+                    }
+                    else if (px > qx) {
+                        // we got past point below, might need to
+                        // insert interpolated extra point
+                        if (withlines && i > 0 && points[i - ps] != null) {
+                            intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
+                            newpoints.push(qx);
+                            newpoints.push(intery + qy);
+                            for (m = 2; m < ps; ++m)
+                                newpoints.push(points[i + m]);
+                            bottom = qy; 
+                        }
+
+                        j += otherps;
+                    }
+                    else { // px < qx
+                        if (fromgap && withlines) {
+                            // if we come from a gap, we just skip this point
+                            i += ps;
+                            continue;
+                        }
+                            
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                        
+                        // we might be able to interpolate a point below,
+                        // this can give us a better y
+                        if (withlines && j > 0 && otherpoints[j - otherps] != null)
+                            bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
+
+                        newpoints[l + accumulateOffset] += bottom;
+                        
+                        i += ps;
+                    }
+
+                    fromgap = false;
+                    
+                    if (l != newpoints.length && withbottom)
+                        newpoints[l + 2] += bottom;
+                }
+
+                // maintain the line steps invariant
+                if (withsteps && l != newpoints.length && l > 0
+                    && newpoints[l] != null
+                    && newpoints[l] != newpoints[l - ps]
+                    && newpoints[l + 1] != newpoints[l - ps + 1]) {
+                    for (m = 0; m < ps; ++m)
+                        newpoints[l + ps + m] = newpoints[l + m];
+                    newpoints[l + 1] = newpoints[l - ps + 1];
+                }
+            }
+
+            datapoints.points = newpoints;
+        }
+        
+        plot.hooks.processDatapoints.push(stackData);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'stack',
+        version: '1.2'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.stack.min.js
@@ -1,1 +1,1 @@
-
+(function(b){var a={series:{stack:null}};function c(f){function d(k,j){var h=null;for(var g=0;g<j.length;++g){if(k==j[g]){break}if(j[g].stack==k.stack){h=j[g]}}return h}function e(C,v,g){if(v.stack==null){return}var p=d(v,C.getData());if(!p){return}var z=g.pointsize,F=g.points,h=p.datapoints.pointsize,y=p.datapoints.points,t=[],x,w,k,J,I,r,u=v.lines.show,G=v.bars.horizontal,o=z>2&&(G?g.format[2].x:g.format[2].y),n=u&&v.lines.steps,E=true,q=G?1:0,H=G?0:1,D=0,B=0,A;while(true){if(D>=F.length){break}A=t.length;if(F[D]==null){for(m=0;m<z;++m){t.push(F[D+m])}D+=z}else{if(B>=y.length){if(!u){for(m=0;m<z;++m){t.push(F[D+m])}}D+=z}else{if(y[B]==null){for(m=0;m<z;++m){t.push(null)}E=true;B+=h}else{x=F[D+q];w=F[D+H];J=y[B+q];I=y[B+H];r=0;if(x==J){for(m=0;m<z;++m){t.push(F[D+m])}t[A+H]+=I;r=I;D+=z;B+=h}else{if(x>J){if(u&&D>0&&F[D-z]!=null){k=w+(F[D-z+H]-w)*(J-x)/(F[D-z+q]-x);t.push(J);t.push(k+I);for(m=2;m<z;++m){t.push(F[D+m])}r=I}B+=h}else{if(E&&u){D+=z;continue}for(m=0;m<z;++m){t.push(F[D+m])}if(u&&B>0&&y[B-h]!=null){r=I+(y[B-h+H]-I)*(x-J)/(y[B-h+q]-J)}t[A+H]+=r;D+=z}}E=false;if(A!=t.length&&o){t[A+2]+=r}}}}if(n&&A!=t.length&&A>0&&t[A]!=null&&t[A]!=t[A-z]&&t[A+1]!=t[A-z+1]){for(m=0;m<z;++m){t[A+z+m]=t[A+m]}t[A+1]=t[A-z+1]}}g.points=t}f.hooks.processDatapoints.push(e)}b.plot.plugins.push({init:c,options:a,name:"stack",version:"1.2"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.symbol.js
@@ -1,1 +1,71 @@
+/*
+Flot plugin that adds some extra symbols for plotting points.
 
+The symbols are accessed as strings through the standard symbol
+choice:
+
+  series: {
+      points: {
+          symbol: "square" // or "diamond", "triangle", "cross"
+      }
+  }
+
+*/
+
+(function ($) {
+    function processRawData(plot, series, datapoints) {
+        // we normalize the area of each symbol so it is approximately the
+        // same as a circle of the given radius
+
+        var handlers = {
+            square: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
+                var size = radius * Math.sqrt(Math.PI) / 2;
+                ctx.rect(x - size, y - size, size + size, size + size);
+            },
+            diamond: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = 2s^2  =>  s = r * sqrt(pi/2)
+                var size = radius * Math.sqrt(Math.PI / 2);
+                ctx.moveTo(x - size, y);
+                ctx.lineTo(x, y - size);
+                ctx.lineTo(x + size, y);
+                ctx.lineTo(x, y + size);
+                ctx.lineTo(x - size, y);
+            },
+            triangle: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = 1/2 * s^2 * sin (pi / 3)  =>  s = r * sqrt(2 * pi / sin(pi / 3))
+                var size = radius * Math.sqrt(2 * Math.PI / Math.sin(Math.PI / 3));
+                var height = size * Math.sin(Math.PI / 3);
+                ctx.moveTo(x - size/2, y + height/2);
+                ctx.lineTo(x + size/2, y + height/2);
+                if (!shadow) {
+                    ctx.lineTo(x, y - height/2);
+                    ctx.lineTo(x - size/2, y + height/2);
+                }
+            },
+            cross: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
+                var size = radius * Math.sqrt(Math.PI) / 2;
+                ctx.moveTo(x - size, y - size);
+                ctx.lineTo(x + size, y + size);
+                ctx.moveTo(x - size, y + size);
+                ctx.lineTo(x + size, y - size);
+            }
+        }
+
+        var s = series.points.symbol;
+        if (handlers[s])
+            series.points.symbol = handlers[s];
+    }
+    
+    function init(plot) {
+        plot.hooks.processDatapoints.push(processRawData);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        name: 'symbols',
+        version: '1.0'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.symbol.min.js
@@ -1,1 +1,1 @@
-
+(function(b){function a(h,e,g){var d={square:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI)/2;k.rect(j-l,n-l,l+l,l+l)},diamond:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI/2);k.moveTo(j-l,n);k.lineTo(j,n-l);k.lineTo(j+l,n);k.lineTo(j,n+l);k.lineTo(j-l,n)},triangle:function(l,k,o,j,n){var m=j*Math.sqrt(2*Math.PI/Math.sin(Math.PI/3));var i=m*Math.sin(Math.PI/3);l.moveTo(k-m/2,o+i/2);l.lineTo(k+m/2,o+i/2);if(!n){l.lineTo(k,o-i/2);l.lineTo(k-m/2,o+i/2)}},cross:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI)/2;k.moveTo(j-l,n-l);k.lineTo(j+l,n+l);k.moveTo(j-l,n+l);k.lineTo(j+l,n-l)}};var f=e.points.symbol;if(d[f]){e.points.symbol=d[f]}}function c(d){d.hooks.processDatapoints.push(a)}b.plot.plugins.push({init:c,name:"symbols",version:"1.0"})})(jQuery);

--- /dev/null
+++ b/lib/flot/jquery.flot.threshold.js
@@ -1,1 +1,104 @@
+/*
+Flot plugin for thresholding data. Controlled through the option
+"threshold" in either the global series options
 
+  series: {
+    threshold: {
+      below: number
+      color: colorspec
+    }
+  }
+
+or in a specific series
+
+  $.plot($("#placeholder"), [{ data: [ ... ], threshold: { ... }}])
+
+The data points below "below" are drawn with the specified color. This
+makes it easy to mark points below 0, e.g. for budget data.
+
+Internally, the plugin works by splitting the data into two series,
+above and below the threshold. The extra series below the threshold
+will have its label cleared and the special "originSeries" attribute
+set to the original series. You may need to check for this in hover
+events.
+*/
+
+(function ($) {
+    var options = {
+        series: { threshold: null } // or { below: number, color: color spec}
+    };
+    
+    function init(plot) {
+        function thresholdData(plot, s, datapoints) {
+            if (!s.threshold)
+                return;
+            
+            var ps = datapoints.pointsize, i, x, y, p, prevp,
+                thresholded = $.extend({}, s); // note: shallow copy
+
+            thresholded.datapoints = { points: [], pointsize: ps };
+            thresholded.label = null;
+            thresholded.color = s.threshold.color;
+            thresholded.threshold = null;
+            thresholded.originSeries = s;
+            thresholded.data = [];
+
+            var below = s.threshold.below,
+                origpoints = datapoints.points,
+                addCrossingPoints = s.lines.show;
+
+            threspoints = [];
+            newpoints = [];
+
+            for (i = 0; i < origpoints.length; i += ps) {
+                x = origpoints[i]
+                y = origpoints[i + 1];
+
+                prevp = p;
+                if (y < below)
+                    p = threspoints;
+                else
+                    p = newpoints;
+
+                if (addCrossingPoints && prevp != p && x != null
+                    && i > 0 && origpoints[i - ps] != null) {
+                    var interx = (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]) * (below - y) + x;
+                    prevp.push(interx);
+                    prevp.push(below);
+                    for (m = 2; m < ps; ++m)
+                        prevp.push(origpoints[i + m]);
+                    
+                    p.push(null); // start new segment
+                    p.push(null);
+                    for (m = 2; m < ps; ++m)
+                        p.push(origpoints[i + m]);
+                    p.push(interx);
+                    p.push(below);
+                    for (m = 2; m < ps; ++m)
+                        p.push(origpoints[i + m]);
+                }
+
+                p.push(x);
+                p.push(y);
+            }
+
+            datapoints.points = newpoints;
+            thresholded.datapoints.points = threspoints;
+            
+            if (thresholded.datapoints.points.length > 0)
+                plot.getData().push(thresholded);
+                
+            // FIXME: there are probably some edge cases left in bars
+        }
+        
+        plot.hooks.processDatapoints.push(thresholdData);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'threshold',
+        version: '1.0'
+    });
+})(jQuery);
+

--- /dev/null
+++ b/lib/flot/jquery.flot.threshold.min.js
@@ -1,1 +1,1 @@
-
+(function(B){var A={series:{threshold:null}};function C(D){function E(L,S,M){if(!S.threshold){return }var F=M.pointsize,I,O,N,G,K,H=B.extend({},S);H.datapoints={points:[],pointsize:F};H.label=null;H.color=S.threshold.color;H.threshold=null;H.originSeries=S;H.data=[];var P=S.threshold.below,Q=M.points,R=S.lines.show;threspoints=[];newpoints=[];for(I=0;I<Q.length;I+=F){O=Q[I];N=Q[I+1];K=G;if(N<P){G=threspoints}else{G=newpoints}if(R&&K!=G&&O!=null&&I>0&&Q[I-F]!=null){var J=(O-Q[I-F])/(N-Q[I-F+1])*(P-N)+O;K.push(J);K.push(P);for(m=2;m<F;++m){K.push(Q[I+m])}G.push(null);G.push(null);for(m=2;m<F;++m){G.push(Q[I+m])}G.push(J);G.push(P);for(m=2;m<F;++m){G.push(Q[I+m])}}G.push(O);G.push(N)}M.points=newpoints;H.datapoints.points=threspoints;if(H.datapoints.points.length>0){L.getData().push(H)}}D.hooks.processDatapoints.push(E)}B.plot.plugins.push({init:C,options:A,name:"threshold",version:"1.0"})})(jQuery);

--- a/lib/graphs.inc.php
+++ b/lib/graphs.inc.php
@@ -1,27 +1,117 @@
 <?php
+$includedFlot = false;
+function includeFlot() {
+	if (!$includedFlot) {
+		echo '   <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="lib/flot/excanvas.min.js"></script><![endif]--> 
+ 
+    <script language="javascript" type="text/javascript" src="lib/flot/jquery.flot.js"></script> 
+        <script language="javascript" type="text/javascript" src="lib/flot/jquery.flot.pie.js"></script> 
+
+';
+$includedFlot = true;
+	}
+}
+
+function CNDistributionGraph() {
+	global $conn;
+	includeFlot();
+	 ?>
+	   <center><div id="cndist" style="width:900px;height:550px"></div></center>
+<script type="text/javascript"> 
+	 $(function () {
+
+ var d1 = [];
+<?php
+$query = 'select cnid, count(*) from (select ("CNID" - MOD("CNID",100)) as cnid from contractnotice where "CNID" < 999999) as a group by cnid order by cnid';
+$query = $conn->prepare($query);
+$query->execute();
+if (!$query) {
+	databaseError($conn->errorInfo());
+	return Array();
+}
+
+foreach ($query->fetchAll() as $delta) {
+
+	echo "d1.push([ ".intval($delta['cnid']).", ".intval($delta['count'])."]); \n";
+};
+?>
+
+       var placeholder = $("#cndist");
+
+    var plot = $.plot(placeholder, [
+       {
+            data: d1,
+            bars: { show: true }
+        },
+    ],
+        {
+
+            grid: { hoverable: true, clickable: true, labelMargin: 17  },
+    });
+
+ });
+
+</script> 
+<?php
+}
 
 function agenciesGraph() {
-	$topX = 15;
-$query = "SELECT SUM(value) as val, agencyName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND childCN = 0
-GROUP BY agencyName ORDER BY val DESC limit $topX";
-$result = mysql_query($query);
-$agencies = Array();
-$values = Array();
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-  $agencies[] = $row['agencyName'];
-  $values[] = doubleval($row["val"]);
-}
-mysql_free_result($result);
-
-$query = "SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, agencyName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND childCN = 0
-GROUP BY agencyName ORDER BY val DESC LIMIT 18446744073709551610 OFFSET $topX) as a";
-$result = mysql_query($query);
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-  $agencies[] = $row['count'] . " other agencies";
-  $values[] = doubleval($row[0]);
-}
-mysql_free_result($result);
-
+	
+	global $conn;
+	includeFlot();
+$query = 'SELECT SUM("value") as val, MAX(contractnotice."agencyName") as agencyname FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName"  WHERE "childCN" = 0
+GROUP BY abn ORDER BY SUM("value") DESC';
+$query = $conn->prepare($query);
+$query->execute();
+if (!$query) {
+	databaseError($conn->errorInfo());
+	return Array();
+}
+?>
+<script type="text/javascript">
+$(function () {
+	// data
+	var data = [
+  <?php
+foreach ($query->fetchAll() as $row) {
+		echo '{ label: "'.$row['agencyname'].'",  data: '.doubleval($row["val"]).'},';
+  }
+    ?>
+	];
+	// GRAPH 7
+	$.plot($("#graph7"), data, 
+	{
+		series: {
+			pie: { 
+				show: true,
+          radius: 1,
+          tilt: 0.75,
+                label: {
+                    show: true,
+                    radius: 1,
+                    formatter: function(label, series){
+                        return '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">'+label+': '+Math.round(series.percent)+'%</div>';
+                    },
+                    background: { 
+                        opacity: 0.5,
+                        color: '#000'
+                    }
+                  },
+				combine: {
+					color: '#999',
+					threshold: 0.012
+				}
+			}
+		},
+		legend: {
+			show: false
+		}
+	});
+});
+</script>
+    <div id="graph7" style="width:900px;height:550px"></div>
+
+<?php
 };
 
 function agencySuppliersGraph($agency) {
@@ -206,40 +296,63 @@
 
 }
 function SuppliersGraph() {
+
+  global $conn;
+  includeFlot();
 $topX = 10;
-$query = "SELECT value, supplierName
-FROM `contractnotice` WHERE (YEAR(contractStart) >= 2009) AND childCN = 0
-GROUP BY supplierABN ORDER BY value DESC limit $topX";
-$result = mysql_query($query);
 $suppliers = Array();
 $values = Array();
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+
+
+$query = 'SELECT SUM("value") as value, MAX("supplierName") as supplierName, (
+ case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID 
+FROM contractnotice
+WHERE "childCN" = 0
+GROUP BY supplierID
+ORDER BY value DESC
+LIMIT '.$topX;
+$query = $conn->prepare($query);
+  $query->execute();
+  if (!$query) {
+    databaseError($conn->errorInfo());
+  }
+  foreach ($query->fetchAll() as $row) {
   setlocale(LC_MONETARY, 'en_US');
  // $value = number_format(doubleval($row["value"]) , 2);
   $suppliers[] = ucsmart($row[1]);
   $values[] = doubleval($row["value"]);
 }
-mysql_free_result($result);
-
-$query = "SELECT sum(a.value) as val, supplierCountry from (SELECT value, supplierName, supplierCountry
-FROM `contractnotice` WHERE (YEAR(contractStart) >= 2009) AND childCN = 0
-GROUP BY supplierName ORDER BY value LIMIT 18446744073709551610 OFFSET $topX) as a group by supplierCountry order by val DESC limit 5 offset 1";
-$result = mysql_query($query);
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-  $suppliers[] = "Other suppliers in ".ucsmart($row["supplierCountry"]);
+
+$query = 'SELECT sum(a.svalue) as val, suppliercountry from (SELECT sum("value") as svalue,  max("supplierCountry") as suppliercountry
+FROM contractnotice WHERE "childCN" = 0 and "supplierCountry" NOT ILIKE \'Australia\'
+GROUP BY "supplierName" ORDER BY svalue LIMIT 18446744073 OFFSET 10) as a group by suppliercountry order by val DESC limit 10 ';
+$query = $conn->prepare($query);
+  $query->execute();
+  if (!$query) {
+    databaseError($conn->errorInfo());
+  }
+
+  foreach ($query->fetchAll() as $row) {
+  $suppliers[] = "Other suppliers in ".ucsmart($row["suppliercountry"]);
   $values[] = doubleval($row[0]);
 }
 
-mysql_free_result($result);
-
-$query = "SELECT sum(a.value) as val, TRUNCATE(supplierPostcode,-2) as postcode from (SELECT value, supplierName, supplierPostcode, supplierCountry
-FROM `contractnotice` WHERE (YEAR(contractStart) >= 2009) AND childCN = 0 
-GROUP BY supplierName ORDER BY value LIMIT 18446744073709551610 OFFSET $topX) as a
-WHERE (supplierCountry LIKE 'Australia' OR supplierCountry LIKE 'AUSTRALIA') AND supplierPostcode < 10000
-group by TRUNCATE(supplierPostcode,-2)
-order by val DESC";
-$result = mysql_query($query);
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+
+$query = 'SELECT sum(a.value) as val, substring(
+supplierpostcode from 0 for 2) as postcode from (SELECT sum(value) as value, max("supplierPostcode") as supplierpostcode, max("supplierCountry") as suppliercountry
+FROM contractnotice WHERE "childCN" = 0 
+GROUP BY "supplierABN" ORDER BY sum(value) LIMIT 1844674 OFFSET 10) as a
+WHERE (suppliercountry ILIKE \'Australia\')
+group by substring(
+supplierpostcode from 0 for 2)
+order by val DESC;';
+$query = $conn->prepare($query);
+  $query->execute();
+  if (!$query) {
+    databaseError($conn->errorInfo());
+  }
+
+  foreach ($query->fetchAll() as $row) {
     if ($row['postcode'][0] == 2 && $row['postcode'][1] == 6) $ACTvalue += $row[0];
     else if ($row['postcode'][0] == 2 || $row['postcode'][0] == 1) $NSWvalue += $row[0];
     else if ($row['postcode'][0] == 3 || $row['postcode'][0] == 8) $Vicvalue += $row[0];
@@ -249,7 +362,6 @@
     else if ($row['postcode'][0] == 7) $Tasvalue += $row[0];
     else if ($row['postcode'][0] == 0) $NTvalue += $row[0];
 }
-mysql_free_result($result);
 $suppliers[] = "Other suppliers in Australia - ACT";
 $values[] = doubleval($ACTvalue);
 $suppliers[] = "Other suppliers in Australia - NSW";
@@ -266,7 +378,53 @@
 $values[] = doubleval($SAvalue);
 $suppliers[] = "Other suppliers in Australia - Tasmania";
 $values[] = doubleval($Tasvalue);
-	
-}
+
 
 ?>
+<script type="text/javascript">
+$(function () {
+  // data
+  var data = [
+  <?php
+foreach ($suppliers as $key => $supplier) {
+    echo '{ label: "'.$supplier.'",  data: '.doubleval($values[$key]).'},';
+  }
+    ?>
+  ];
+  // GRAPH 7
+  $.plot($("#graph7"), data, 
+  {
+    series: {
+      pie: { 
+        show: true,
+          radius: 1,
+          tilt: 0.75,
+                label: {
+                    show: true,
+                    radius: 1,
+                    formatter: function(label, series){
+                        return '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">'+label+': '+Math.round(series.percent)+'%</div>';
+                    },
+                    background: { 
+                        opacity: 0.5,
+                        color: '#000'
+                    }
+                  },
+        combine: {
+          color: '#999',
+          threshold: 0.012
+        }
+      }
+    },
+    legend: {
+      show: false
+    }
+  });
+});
+</script>
+    <div id="graph7" style="width:900px;height:550px"></div>
+
+<?php
+}
+
+?>

--- a/lib/jquery.js
+++ b/lib/jquery.js
@@ -1,19 +1,18 @@
-/*
- * jQuery JavaScript Library v1.3.2
+/*!
+ * jQuery JavaScript Library v1.6.1
  * http://jquery.com/
  *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu May 12 15:04:36 2011 -0400
  */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("<!doctype><html><body></body></html>");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bF.test(a)?d(a,e):b_(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bU,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bQ),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bD(a,b,c){var d=b==="width"?bx:by,e=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return e;f.each(d,function(){c||(e-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?e+=parseFloat(f.css(a,"margin"+this))||0:e-=parseFloat(f.css(a,"border"+this+"Width"))||0});return e}function bn(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bm(a){f.nodeName(a,"input")?bl(a):a.getElementsByTagName&&f.grep(a.getElementsByTagName("input"),bl)}function bl(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bk(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bj(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bi(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bh(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function X(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(S.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(y,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:E?function(a){return a==null?"":E.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?C.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(F)return F.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=D.call(arguments,2),g=function(){return a.apply(c,f.concat(D.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){G["[object "+b+"]"]=b.toLowerCase()}),x=e.uaMatch(w),x.browser&&(e.browser[x.browser]=!0,e.browser.version=x.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?z=function(){c.removeEventListener("DOMContentLoaded",z,!1),e.ready()}:c.attachEvent&&(z=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",z),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.addClass(a.call(this,b,c.attr("class")||""))});if(a&&typeof a=="string"){var b=(a||"").split(o);for(var c=0,d=this.length;c<d;c++){var e=this[c];if(e.nodeType===1)if(!e.className)e.className=a;else{var g=" "+e.className+" ",h=e.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);e.className=f.trim(h)}}}return this},removeClass:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a=="string"||a===b){var c=(a||"").split(o);for(var d=0,e=this.length;d<e;d++){var g=this[d];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(n," ");for(var i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){var d=f(this);d.toggleClass(a.call(this,c,d.attr("class"),b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem
+)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,O(a.origType,a.selector),f.extend({},a,{handler:N,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,O(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?F:E):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=F;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=F;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=F,this.stopPropagation()},isDefaultPrevented:E,isPropagationStopped:E,isImmediatePropagationStopped:E};var G=function(a){var b=a.relatedTarget;a.type=a.data;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&f.event.handle.apply(this,arguments)}catch(d){}},H=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?H:G,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?H:G)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&L("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&L("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var I,J=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var M={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||E,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=y.exec(h),k="",j&&(k=j[0],h=h.replace(y,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,M[h]?(a.push(M[h]+k),h=h+k):h=(M[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+O(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+O(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var P=/Until$/,Q=/^(?:parents|prevUntil|prevAll)/,R=/,/,S=/^.[^:#\[\.,]*$/,T=Array.prototype.slice,U=f.expr.match.POS,V={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(X(this,a,!1),"not",a)},filter:function(a){return this.pushStack(X(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=U.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/<tbody/i,bb=/<|&#?\w+;/,bc=/<(?:script|object|embed|option|style)/i,bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bh(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bn)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bc.test(a[0])&&(f.support.checkClone||!bd.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1></$2>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bm(k[i]);else bm(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bo=/alpha\([^)]*\)/i,bp=/opacity=([^)]*)/,bq=/-([a-z])/ig,br=/([A-Z]|^ms)/g,bs=/^-?\d+(?:px)?$/i,bt=/^-?\d/,bu=/^[+\-]=/,bv=/[^+\-\.\de]+/g,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB,bC=function(a,b){return b.toUpperCase()};f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0,widows:!0,orphans:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bu.test(d)&&(d=+d.replace(bv,"")+parseFloat(f.css(a,c))),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bq,bC)}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){a.offsetWidth!==0?e=bD(a,b,d):f.swap(a,bw,function(){e=bD(a,b,d)});if(e<=0){e=bz(a,b,b),e==="0px"&&bB&&(e=bB(a,b,b));if(e!=null)return e===""||e==="auto"?"0px":e}if(e<0||e==null){e=a.style[b];return e===""||e==="auto"?"0px":e}return typeof e=="string"?e:e+"px"}},set:function(a,b){if(!bs.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cv(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cm.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=cn.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this),f.isFunction(d.old)&&d.old.call(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cq||cs(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!co&&(cr?(co=1,g=function(){co&&(cr(g),e.tick())},cr(g)):co=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cq||cs(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);

--- a/media/unit_testing/controller.js
+++ /dev/null
@@ -1,94 +1,1 @@
-var giTotalTestCount = 0;
-var giActiveModule = 0;
-var giModuleTests;
-var giStartTime;
-var giTest;
-var gbStop = false;
-var gtoTest;
 
-function fnTestStart ( sTestInfo )
-{
-	gaoTest[ giActiveModule ].iTests++;
-	document.getElementById('test_info').innerHTML += 
-		(giActiveModule+1)+'.'+(giModuleTests+1)+'. '+sTestInfo+'... ';
-	document.getElementById('test_number').innerHTML = giTotalTestCount+1;
-	giModuleTests++;
-	giTotalTestCount++;
-	
-	/* Set a timer to catch stalled script */
-	gtoTest = setTimeout( function () {
-		fnMessage( '<span class="error">WARNING - test script stalled. Likely a JS error</span>' );
-		gbStop = true;
-	}, 3000 );
-}
-
-function fnTestResult ( bResult )
-{
-	clearTimeout( gtoTest );
-	if ( bResult )
-	{
-		fnMessage( 'Passed' );
-	}
-	else
-	{
-		fnMessage( '<span class="error">FAILED</span>' );
-		gbStop = true;
-		fnEnd( false );
-	}
-}
-
-function fnUnitStart( iTest )
-{
-	if ( !gbStop )
-	{
-		giModuleTests = 0;
-		window.parent.test_arena.location.href = 
-			(iTest==0?"":"../")+'templates/'+gaoTest[iTest].sTemplate+'.php?scripts='+gaoTest[iTest].sTest;
-		giTest = iTest;
-	}
-}
-
-function fnStartMessage( sMessage )
-{
-	fnMessage( '<br><b>'+gaoTest[giTest].sGroup+' - '+sMessage+'</b>' );
-}
-
-function fnMessage( sMessage )
-{
-	var nInfo = document.getElementById('test_info');
-	nInfo.innerHTML += sMessage+'<br>';
-	nInfo.scrollTop = nInfo.scrollHeight;
-}
-
-function fnUnitComplete()
-{
-	if ( giActiveModule < gaoTest.length - 1 )
-	{
-		fnUnitStart( ++giActiveModule );
-	}
-	else
-	{
-		fnEnd( true );
-	}
-}
-
-function fnEnd( bSuccess )
-{ 
-	var iEndTime = new Date().getTime();
-	var sTime = '<br>This test run took '+parseInt((iEndTime-giStartTime)/1000, 10)+
-			' second(s) to complete.';
-	
-	if ( bSuccess )
-	{
-		$('#test_running').html( 'Tests complete. '+giTotalTestCount+' tests were run.'+sTime );
-	}
-	else
-	{
-		$('#test_running').html( 'Unit tests failed at test '+giTotalTestCount+'.'+sTime );
-	}
-}
-
-$(document).ready( function () {
-	giStartTime = new Date().getTime();
-	fnUnitStart( giActiveModule );
-} );

--- a/media/unit_testing/controller.php
+++ /dev/null
@@ -1,100 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>DataTables unit test controller</title>
-		
-		<style type="text/css" media="screen">
-			#controller {
-				font: 12px/1.45em "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-				margin: 0;
-				padding: 0 0 0 0.5em;
-				color: #333;
-				background-color: #fff;
-			}
-			
-			#test_info {
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 50%;
-				height: 100%;
-				font-size: 11px;
-				overflow: auto;
-			}
-			
-			.error {
-				color: red;
-			}
-			
-			#controller h1 {
-				color: #4E6CA3;
-				font-size: 18px;
-			}
-		</style>
-		
-		<script type="text/javascript" language="javascript" src="../js/jquery.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			var gaoTest = [
-			<?php
-				function fnReadDir( &$aReturn, $path )
-				{
-					$rDir = opendir( $path );
-        	while ( ($file = readdir($rDir)) !== false )
-					{
-						if ( $file == "." || $file == ".." || $file == ".DS_Store" )
-						{
-							continue;
-						}
-						else if ( is_dir( $path.'/'.$file ) )
-						{
-							fnReadDir( $aReturn, $path.'/'.$file );
-						}
-						else
-						{
-							array_push( $aReturn, $path.'/'.$file );
-						}
-					}
-					closedir($rDir);
-				}
-				
-				/* Get the tests dynamically from the 'tests' directory, and their templates */
-				$aFiles = array();
-				fnReadDir( &$aFiles, "tests" );
-				
-				for ( $i=0 ; $i<count($aFiles) ; $i++ )
-				{
-					$sTemplate;
-					$fp = fopen( $aFiles[$i], "r" );
-					fscanf( $fp, "// DATA_TEMPLATE: %s", &$sTemplate );
-					fclose( $fp );
-					
-					$aPath = split('/', $aFiles[$i]);
-					
-					echo '{ '.
-						'"sTemplate": "'.$sTemplate.'", '.
-						'"sTest": "'.$aFiles[$i].'", '.
-						'"sGroup": "'.$aPath[1].'"},'."\n";
-				}
-				
-			?>
-			null ];
-			gaoTest.pop(); /* No interest in the null */
-		</script>
-		<script type="text/javascript" language="javascript" src="controller.js"></script>
-	</head>
-	<body id="controller">
-		<h1>DataTables unit testing</h1>
-		<div id="test_running">Running test: <span id="test_number"></span></div>
-		<div id="test_info">
-			<b>Test information:</b><br>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/index.html
+++ /dev/null
@@ -1,7 +1,1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-	<frameset rows="20%,80%">
-		<frame name="controller" id="controller" src="controller.php">
-		<frame name="test_arena" id="test_arena">
-	</frameset>
-</html>
+

--- a/media/unit_testing/performance/draw.html
+++ /dev/null
@@ -1,482 +1,1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.datatables.net/favicon.ico" />
-		
-		<title>DataTables example</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			$(document).ready(function() {
-				var oTable = $('#example').dataTable();
-				var oSettings = oTable.fnSettings();
-				var iStart = new Date().getTime();
-				
-				//console.profile();
-				//for ( var i=0, iLen=1000 ; i<iLen ; i++ )
-				//{
-				//	oSettings._iDisplayLength = 100;
-				//	oTable.oApi._fnCalculateEnd( oSettings );
-				//	oTable.oApi._fnDraw( oSettings );
-				//	
-				//	oSettings._iDisplayLength = 10;
-				//	oTable.oApi._fnCalculateEnd( oSettings );
-				//	oTable.oApi._fnDraw( oSettings );
-				//}
-				//console.profileEnd();
-				
-				var iEnd = new Date().getTime();
-				document.getElementById('output').innerHTML = "Test took "+(iEnd-iStart)+"mS";
-			} );
-		</script>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> performance test - draw
-			</div>
-			<div id="output"></div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 4.0</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-			
-			
-			<div id="footer" style="text-align:center;">
-				<span style="font-size:10px;">
-					DataTables &copy; Allan Jardine 2008-2009.
-				</span>
-			</div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/performance/large.php
+++ /dev/null
@@ -1,102 +1,1 @@
-<?php
-  /* MySQL connection */
-	include( $_SERVER['DOCUMENT_ROOT']."/datatables/mysql.php" ); /* ;-) */
-	
-	$gaSql['link'] =  mysql_pconnect( $gaSql['server'], $gaSql['user'], $gaSql['password']  ) or
-		die( 'Could not open connection to server' );
-	
-	mysql_select_db( $gaSql['db'], $gaSql['link'] ) or 
-		die( 'Could not select database '. $gaSql['db'] );
 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.datatables.net/favicon.ico" />
-		
-		<title>DataTables example</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			$(document).ready(function() {
-				var iStart = new Date().getTime();
-				
-				if ( typeof console != 'undefined' ) {
-					console.profile();
-				}
-				for ( var i=0 ; i<1 ; i++ )
-				{
-					var oTable = $('#example').dataTable({"bDestroy": true});
-				}
-				if ( typeof console != 'undefined' ) {
-					console.profileEnd();
-				}
-				
-				var iEnd = new Date().getTime();
-				document.getElementById('output').innerHTML = "Test took "+(iEnd-iStart)+"mS";
-			} );
-		</script>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> performance test - draw
-			</div>
-			<div id="output"></div>
-
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>id</th>
-			<th>name</th>
-			<th>phone</th>
-			<th>email</th>
-			<th>city</th>
-			<th>zip</th>
-			<th>state</th>
-			<th>country</th>
-			<th>zip2</th>
-		</tr>
-	</thead>
-	<tbody>
-<?php
-	$sQuery = "
-		SELECT *
-		FROM   testData
-		LIMIT  2000
-	";
-	$rResult = mysql_query( $sQuery, $gaSql['link'] ) or die(mysql_error());
-	while ( $aRow = mysql_fetch_array( $rResult ) )
-	{
-		echo '<tr>';
-		echo '<td><a href="1">'.$aRow['id'].'</a></td>';
-		echo '<td>'.$aRow['name'].'</td>';
-		echo '<td>'.$aRow['phone'].'</td>';
-		echo '<td>'.$aRow['email'].'</td>';
-		echo '<td>'.$aRow['city'].'</td>';
-		echo '<td>'.$aRow['zip'].'</td>';
-		echo '<td>'.$aRow['state'].'</td>';
-		echo '<td>'.$aRow['country'].'</td>';
-		echo '<td>'.$aRow['zip2'].'</td>';
-		echo '</tr>';
-		
-	}
-?>
-	</tbody>
-</table>
-			</div>
-			<div class="spacer"></div>
-			
-			<div id="footer" style="text-align:center;">
-				<span style="font-size:10px;">
-					DataTables &copy; Allan Jardine 2008-2009.
-				</span>
-			</div>
-		</div>
-	</body>
-</html>

--- a/media/unit_testing/performance/page.html
+++ /dev/null
@@ -1,477 +1,1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.datatables.net/favicon.ico" />
-		
-		<title>DataTables example</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			$(document).ready(function() {
-				var oTable = $('#example').dataTable();
-				var oSettings = oTable.fnSettings();
-				var iStart = new Date().getTime();
-				
-				//for ( var i=0, iLen=100 ; i<iLen ; i++ )
-				//{
-				console.profile( );
-					oTable.fnPageChange( "next" );
-					oTable.fnPageChange( "previous" );
-				console.profileEnd( );
-				//}
-				
-				var iEnd = new Date().getTime();
-				document.getElementById('output').innerHTML = "Test took "+(iEnd-iStart)+"mS";
-			} );
-		</script>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> performance test - draw
-			</div>
-			<div id="output"></div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 4.0</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-			
-			
-			<div id="footer" style="text-align:center;">
-				<span style="font-size:10px;">
-					DataTables &copy; Allan Jardine 2008-2009.
-				</span>
-			</div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/performance/sort.html
+++ /dev/null
@@ -1,477 +1,1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.datatables.net/favicon.ico" />
-		
-		<title>DataTables example</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			$(document).ready(function() {
-				var oTable = $('#example').dataTable();
-				var oSettings = oTable.fnSettings();
-				var iStart = new Date().getTime();
-				
-				for ( var i=0, iLen=100 ; i<iLen ; i++ )
-				{
-				console.profile( );
-					oTable.fnSort( [[1, 'asc']] );
-					oTable.fnSort( [[0, 'asc']] );
-				console.profileEnd( );
-				}
-				
-				var iEnd = new Date().getTime();
-				document.getElementById('output').innerHTML = "Test took "+(iEnd-iStart)+"mS";
-			} );
-		</script>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> performance test - draw
-			</div>
-			<div id="output"></div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 4.0</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-			
-			
-			<div id="footer" style="text-align:center;">
-				<span style="font-size:10px;">
-					DataTables &copy; Allan Jardine 2008-2009.
-				</span>
-			</div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/-complex_header.php
+++ /dev/null
@@ -1,469 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> unit test template for reading DOM data
-			</div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th rowspan="2" class="bl bt">Rendering engine</th>
-			<th colspan="3" class="bl br bt">Browser details</th>
-			<th class="br bt">CSS grade</th>
-		</tr>
-		<tr>
-			<th class="bl">Browser</th>
-			<th>Platform(s)</th>
-			<th class="br">Engine version</th>
-			<th class="br bt">CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 4.0</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/2512.php
+++ /dev/null
@@ -1,464 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> unit test template for reading DOM data
-			</div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>testsearchstring <br>html &amp; entity</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/dom_data.php
+++ /dev/null
@@ -1,465 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> unit test template for reading DOM data
-			</div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 4.0</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-			<td class="center">1.9</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.2</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.4</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">1.6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-			<td class="center">1.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.2</td>
-			<td>OSX.3</td>
-			<td class="center">125.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 1.3</td>
-			<td>OSX.3</td>
-			<td class="center">312.8</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 2.0</td>
-			<td>OSX.4+</td>
-			<td class="center">419.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>Safari 3.0</td>
-			<td>OSX.4+</td>
-			<td class="center">522.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>OmniWeb 5.5</td>
-			<td>OSX.4+</td>
-			<td class="center">420</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>iPod Touch / iPhone</td>
-			<td>iPod</td>
-			<td class="center">420.1</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Webkit</td>
-			<td>S60</td>
-			<td>S60</td>
-			<td class="center">413</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.0</td>
-			<td>Win 95+ / OSX.1+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 7.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.0</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 8.5</td>
-			<td>Win 95+ / OSX.2+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.0</td>
-			<td>Win 95+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.2</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera 9.5</td>
-			<td>Win 88+ / OSX.3+</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Opera for Wii</td>
-			<td>Wii</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nokia N800</td>
-			<td>N800</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Presto</td>
-			<td>Nintendo DS browser</td>
-			<td>Nintendo DS</td>
-			<td class="center">8.5</td>
-			<td class="center">C/A<sup>1</sup></td>
-		</tr>
-		<tr class="gradeC">
-			<td>KHTML</td>
-			<td>Konqureror 3.1</td>
-			<td>KDE 3.1</td>
-			<td class="center">3.1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.3</td>
-			<td>KDE 3.3</td>
-			<td class="center">3.3</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>KHTML</td>
-			<td>Konqureror 3.5</td>
-			<td>KDE 3.5</td>
-			<td class="center">3.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Tasman</td>
-			<td>Internet Explorer 4.5</td>
-			<td>Mac OS 8-9</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.1</td>
-			<td>Mac OS 7.6-9</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Tasman</td>
-			<td>Internet Explorer 5.2</td>
-			<td>Mac OS 8-X</td>
-			<td class="center">1</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.1</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Misc</td>
-			<td>NetFront 3.4</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Dillo 0.8</td>
-			<td>Embedded devices</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Links</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeX">
-			<td>Misc</td>
-			<td>Lynx</td>
-			<td>Text only</td>
-			<td class="center">-</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>IE Mobile</td>
-			<td>Windows Mobile 6</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Misc</td>
-			<td>PSP browser</td>
-			<td>PSP</td>
-			<td class="center">-</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeU">
-			<td>Other browsers</td>
-			<td>All others</td>
-			<td>-</td>
-			<td class="center">-</td>
-			<td class="center">U</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/dymanic_table.php
+++ /dev/null
@@ -1,45 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			$(document).ready( function () {
-				$('#demo').html( '<table cellpadding="0" cellspacing="0" border="0" class="display" id="example"></table>' );
-			} );
-		</script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> dynamic table template
-			</div>
-			
-			<h1>Live example</h1>
-			<div id="demo"></div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/empty_table.php
+++ /dev/null
@@ -1,55 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> empty table template
-			</div>
-			
-			<h1>Live example</h1>
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		
-	</tbody>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/js_data.php
+++ /dev/null
@@ -1,124 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<script type="text/javascript" charset="utf-8">
-			/* Make the data source available for testing */
-			var gaaData = [
-				['Trident','Internet Explorer 4.0','Win 95+','4','X'],
-				['Trident','Internet Explorer 5.0','Win 95+','5','C'],
-				['Trident','Internet Explorer 5.5','Win 95+','5.5','A'],
-				['Trident','Internet Explorer 6','Win 98+','6','A'],
-				['Trident','Internet Explorer 7','Win XP SP2+','7','A'],
-				['Trident','AOL browser (AOL desktop)','Win XP','6','A'],
-				['Gecko','Firefox 1.0','Win 98+ / OSX.2+','1.7','A'],
-				['Gecko','Firefox 1.5','Win 98+ / OSX.2+','1.8','A'],
-				['Gecko','Firefox 2.0','Win 98+ / OSX.2+','1.8','A'],
-				['Gecko','Firefox 3.0','Win 2k+ / OSX.3+','1.9','A'],
-				['Gecko','Camino 1.0','OSX.2+','1.8','A'],
-				['Gecko','Camino 1.5','OSX.3+','1.8','A'],
-				['Gecko','Netscape 7.2','Win 95+ / Mac OS 8.6-9.2','1.7','A'],
-				['Gecko','Netscape Browser 8','Win 98SE+','1.7','A'],
-				['Gecko','Netscape Navigator 9','Win 98+ / OSX.2+','1.8','A'],
-				['Gecko','Mozilla 1.0','Win 95+ / OSX.1+',1,'A'],
-				['Gecko','Mozilla 1.1','Win 95+ / OSX.1+',1.1,'A'],
-				['Gecko','Mozilla 1.2','Win 95+ / OSX.1+',1.2,'A'],
-				['Gecko','Mozilla 1.3','Win 95+ / OSX.1+',1.3,'A'],
-				['Gecko','Mozilla 1.4','Win 95+ / OSX.1+',1.4,'A'],
-				['Gecko','Mozilla 1.5','Win 95+ / OSX.1+',1.5,'A'],
-				['Gecko','Mozilla 1.6','Win 95+ / OSX.1+',1.6,'A'],
-				['Gecko','Mozilla 1.7','Win 98+ / OSX.1+',1.7,'A'],
-				['Gecko','Mozilla 1.8','Win 98+ / OSX.1+',1.8,'A'],
-				['Gecko','Seamonkey 1.1','Win 98+ / OSX.2+','1.8','A'],
-				['Gecko','Epiphany 2.20','Gnome','1.8','A'],
-				['Webkit','Safari 1.2','OSX.3','125.5','A'],
-				['Webkit','Safari 1.3','OSX.3','312.8','A'],
-				['Webkit','Safari 2.0','OSX.4+','419.3','A'],
-				['Webkit','Safari 3.0','OSX.4+','522.1','A'],
-				['Webkit','OmniWeb 5.5','OSX.4+','420','A'],
-				['Webkit','iPod Touch / iPhone','iPod','420.1','A'],
-				['Webkit','S60','S60','413','A'],
-				['Presto','Opera 7.0','Win 95+ / OSX.1+','-','A'],
-				['Presto','Opera 7.5','Win 95+ / OSX.2+','-','A'],
-				['Presto','Opera 8.0','Win 95+ / OSX.2+','-','A'],
-				['Presto','Opera 8.5','Win 95+ / OSX.2+','-','A'],
-				['Presto','Opera 9.0','Win 95+ / OSX.3+','-','A'],
-				['Presto','Opera 9.2','Win 88+ / OSX.3+','-','A'],
-				['Presto','Opera 9.5','Win 88+ / OSX.3+','-','A'],
-				['Presto','Opera for Wii','Wii','-','A'],
-				['Presto','Nokia N800','N800','-','A'],
-				['Presto','Nintendo DS browser','Nintendo DS','8.5','C/A<sup>1</sup>'],
-				['KHTML','Konqureror 3.1','KDE 3.1','3.1','C'],
-				['KHTML','Konqureror 3.3','KDE 3.3','3.3','A'],
-				['KHTML','Konqureror 3.5','KDE 3.5','3.5','A'],
-				['Tasman','Internet Explorer 4.5','Mac OS 8-9','-','X'],
-				['Tasman','Internet Explorer 5.1','Mac OS 7.6-9','1','C'],
-				['Tasman','Internet Explorer 5.2','Mac OS 8-X','1','C'],
-				['Misc','NetFront 3.1','Embedded devices','-','C'],
-				['Misc','NetFront 3.4','Embedded devices','-','A'],
-				['Misc','Dillo 0.8','Embedded devices','-','X'],
-				['Misc','Links','Text only','-','X'],
-				['Misc','Lynx','Text only','-','X'],
-				['Misc','IE Mobile','Windows Mobile 6','-','C'],
-				['Misc','PSP browser','PSP','-','C'],
-				['Other browsers','All others','-','-','U']
-			];
-		</script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> unit test template for reading DOM data
-			</div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>
+

--- a/media/unit_testing/templates/two_tables.php
+++ /dev/null
@@ -1,227 +1,1 @@
-<?php
-	header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); 
-	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); 
-	header( 'Cache-Control: no-store, no-cache, must-revalidate' ); 
-	header( 'Cache-Control: post-check=0, pre-check=0', false ); 
-	header( 'Pragma: no-cache' ); 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
-		
-		<title>DataTables unit testing</title>
-		<style type="text/css" title="currentStyle">
-			@import "../../css/demo_page.css";
-			@import "../../css/demo_table.css";
-		</style>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
-		<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
-		<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
-		<?php
-			$aScripts = split( ":", $_GET['scripts'] );
-			for ( $i=0 ; $i<count($aScripts) ; $i++ )
-			{
-				echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
-			}
-		?>
-	</head>
-	<body id="dt_example">
-		<div id="container">
-			<div class="full_width big">
-				<i>DataTables</i> unit test template for two tables
-			</div>
-			
-			<div id="demo">
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example1">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeX">
-			<td>Trident</td>
-			<td>testsearchstring <br>html &amp; entity</td>
-			<td>Win 95+</td>
-			<td class="center">4</td>
-			<td class="center">X</td>
-		</tr>
-		<tr class="gradeC">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.0</td>
-			<td>Win 95+</td>
-			<td class="center">5</td>
-			<td class="center">C</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 5.5</td>
-			<td>Win 95+</td>
-			<td class="center">5.5</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet
-				 Explorer 6</td>
-			<td>Win 98+</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>Internet Explorer 7</td>
-			<td>Win XP SP2+</td>
-			<td class="center">7</td>
-			<td class="center">A</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Trident</td>
-			<td>AOL browser (AOL desktop)</td>
-			<td>Win XP</td>
-			<td class="center">6</td>
-			<td class="center">A</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-			<th>Engine version</th>
-			<th>CSS grade</th>
-		</tr>
-	</tfoot>
-</table>
 
-
-<table cellpadding="0" cellspacing="0" border="0" class="display" id="example2">
-	<thead>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.0</td>
-			<td>Win 98+ / OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 1.5</td>
-			<td>Win 98+ / OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 2.0</td>
-			<td>Win 98+ / OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Firefox 3.0</td>
-			<td>Win 2k+ / OSX.3+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.0</td>
-			<td>OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Camino 1.5</td>
-			<td>OSX.3+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape 7.2</td>
-			<td>Win 95+ / Mac OS 8.6-9.2</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Browser 8</td>
-			<td>Win 98SE+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Netscape Navigator 9</td>
-			<td>Win 98+ / OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.0</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.1</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.2</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.3</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.4</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.5</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.6</td>
-			<td>Win 95+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.7</td>
-			<td>Win 98+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Mozilla 1.8</td>
-			<td>Win 98+ / OSX.1+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Seamonkey 1.1</td>
-			<td>Win 98+ / OSX.2+</td>
-		</tr>
-		<tr class="gradeA">
-			<td>Gecko</td>
-			<td>Epiphany 2.20</td>
-			<td>Gnome</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr>
-			<th>Rendering engine</th>
-			<th>Browser</th>
-			<th>Platform(s)</th>
-		</tr>
-	</tfoot>
-</table>
-			</div>
-			<div class="spacer"></div>
-		</div>
-	</body>
-</html>

--- a/media/unit_testing/tests_onhold/1_dom/-complex_header.js
+++ /dev/null
@@ -1,52 +1,1 @@
-// DATA_TEMPLATE: -complex_header
-oTest.fnStart( "Complex header" );
 
-
-$(document).ready( function () {
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Sorting on colspan has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on non-unique TH and first TH has no effect",
-		function () { $('#example thead th:eq(2)').click(); },
-		function () { return $('#example tbody tr td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on non-unique TH and second TH will sort",
-		function () { $('#example thead th:eq(6)').click(); },
-		function () { return $('#example tbody tr td:eq(4)').html() == "A"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on non-unique TH and second TH will sort - reserve",
-		function () { $('#example thead th:eq(6)').click(); },
-		function () { return $('#example tbody tr td:eq(4)').html() == "X"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on unique TH will sort",
-		function () { $('#example thead th:eq(5)').click(); },
-		function () { return $('#example tbody tr td:eq(3)').html() == "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on unique TH will sort - reserve",
-		function () { $('#example thead th:eq(5)').click(); },
-		function () { return $('#example tbody tr td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on unique rowspan TH will sort",
-		function () { $('#example thead th:eq(0)').click(); },
-		function () { return $('#example tbody tr td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/-iDraw.js
+++ /dev/null
@@ -1,41 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "iDraw - check that iDraw increments for each draw" );
 
-
-$(document).ready( function () {
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"After first draw, iDraw is 1",
-		null,
-		function () { return oSettings.iDraw == 1; }
-	);
-	
-	oTest.fnTest( 
-		"After second draw, iDraw is 2",
-		function () { oTable.fnDraw() },
-		function () { return oSettings.iDraw == 2; }
-	);
-	
-	oTest.fnTest( 
-		"After sort",
-		function () { oTable.fnSort([[1,'asc']]) },
-		function () { return oSettings.iDraw == 3; }
-	);
-	
-	oTest.fnTest( 
-		"After filter",
-		function () { oTable.fnFilter('gecko') },
-		function () { return oSettings.iDraw == 4; }
-	);
-	
-	oTest.fnTest( 
-		"After another filter",
-		function () { oTable.fnFilter('gec') },
-		function () { return oSettings.iDraw == 5; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2512.js
+++ /dev/null
@@ -1,17 +1,1 @@
-// DATA_TEMPLATE: 2512
-oTest.fnStart( "Check filtering with BR and HTML entity" );
 
-
-$(document).ready( function () {
-	$('#example').dataTable();
-	
-	/* Basic checks */
-	oTest.fnTest( 
-		"Check filtering",
-		function () { $('#example').dataTable().fnFilter('testsearchstring'); },
-		function () { return $('#example tbody tr').length == 1; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2530-2.js
+++ /dev/null
@@ -1,15 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "User given with is left when no scrolling" );
 
-$(document).ready( function () {
-	$('#example')[0].style.width = "80%";
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Check user width is left",
-		null,
-		function () { return $('#example').width() == 640; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2530.js
+++ /dev/null
@@ -1,29 +1,1 @@
-// DATA_TEMPLATE: dymanic_table
-oTest.fnStart( "2530 - Check width's when dealing with empty strings" );
 
-
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"aaData": [
-			['','Internet Explorer 4.0','Win 95+','4','X'],
-			['','Internet Explorer 5.0','Win 95+','5','C']
-		],
-		"aoColumns": [
-			{ "sTitle": "", "sWidth": "40px" },
-			{ "sTitle": "Browser" },
-			{ "sTitle": "Platform" },
-			{ "sTitle": "Version", "sClass": "center" },
-			{ "sTitle": "Grade", "sClass": "center" }
-		]
-	} );
-	
-	/* Basic checks */
-	oTest.fnTest( 
-		"Check calculated widths",
-		null,
-		function () { return $('#example tbody tr td:eq(0)').width() < 100; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2569.js
+++ /dev/null
@@ -1,36 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "Destroy with hidden columns" );
 
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"aoColumnDefs": [ 
-			{ "bSearchable": false, "bVisible": false, "aTargets": [ 2 ] },
-			{ "bVisible": false, "aTargets": [ 3 ] }
-		]
-	} );
-	$('#example').dataTable().fnDestroy();
-	
-	oTest.fnTest( 
-		"Check that the number of columns in table is correct",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"And with scrolling",
-		function () {
-			$('#example').dataTable( {
-				"sScrollY": 200,
-				"aoColumnDefs": [ 
-					{ "bSearchable": false, "bVisible": false, "aTargets": [ 2 ] },
-					{ "bVisible": false, "aTargets": [ 3 ] }
-				]
-			} );
-			$('#example').dataTable().fnDestroy();
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2600.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2600 - Display rewind when changing length" );
 
-$(document).ready( function () {
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Info correct on init",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Page 2",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Page 3",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Page 4",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 31 to 40 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Page 5",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 41 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Rewind",
-		function () { $('#example_length select').val('100'); $('#example_length select').change(); },
-		function () { return $('#example_info').html() == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2608.js
+++ /dev/null
@@ -1,54 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2608 - State saving escaping filters" );
 
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"bStateSave": true
-	} );
-	
-	oTest.fnTest( 
-		"Set the filter",
-		function () {
-			$('#example_filter input').val( '\\s*CVM\\s*$' );
-			$('#example_filter input').keyup();
-		},
-		function () { return $('#example_filter input').val() == '\\s*CVM\\s*$'; }
-	);
-	
-	oTest.fnTest( 
-		"Destroy the table and remake it - checking the filter was saved",
-		function () {
-			$('#example').dataTable( {
-				"bStateSave": true,
-				"bDestroy": true
-			} );
-		},
-		function () { return $('#example_filter input').val() == '\\s*CVM\\s*$'; }
-	);
-	
-	oTest.fnTest( 
-		"Do it again without state saving and make sure filter is empty",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true
-			} );
-		},
-		function () { return $('#example_filter input').val() == ''; }
-	);
-	
-	oTest.fnTest( 
-		"Clean up",
-		function () {
-			$('#example').dataTable( {
-				"bStateSave": true,
-				"bDestroy": true
-			} );
-			$('#example_filter input').val( '' );
-			$('#example_filter input').keyup();
-		},
-		function () { return $('#example_filter input').val() == ''; }
-	);
-	
-	oTest.fnCookieDestroy( $('#example').dataTable() );
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2635.js
+++ /dev/null
@@ -1,40 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2635 - Hiding column and state saving" );
 
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"bStateSave": true
-	} );
-	
-	oTest.fnTest( 
-		"Set the hidden column",
-		function () {
-			$('#example').dataTable().fnSetColumnVis( 2, false );
-		},
-		function () { return $('#example thead th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Destroy the table and remake it - checking one column was removed",
-		function () {
-			$('#example').dataTable( {
-				"bStateSave": true,
-				"bDestroy": true
-			} );
-		},
-		function () { return $('#example thead th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Do it again without state saving and make sure we are back to 5 columns",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true
-			} );
-		},
-		function () { return $('#example thead th').length == 5; }
-	);
-	
-	oTest.fnCookieDestroy( $('#example').dataTable() );
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2746-stable-sort.js
+++ /dev/null
@@ -1,199 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2746 - Stable sorting" );
 
-$(document).ready( function () {
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Initial sort",
-		null,
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Firefox 1.0' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Firefox 1.5' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Firefox 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Reserve initial sort",
-		function () {
-			$('#example thead th:eq(0)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Webkit' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Webkit' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Safari 1.2' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Safari 1.3' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Safari 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Reserve to go back to initial sort sort",
-		function () {
-			$('#example thead th:eq(0)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Firefox 1.0' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Firefox 1.5' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Firefox 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Reserve initial sort again",
-		function () {
-			$('#example thead th:eq(0)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Webkit' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Webkit' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Safari 1.2' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Safari 1.3' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Safari 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"And once more back to the initial sort",
-		function () {
-			$('#example thead th:eq(0)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Firefox 1.0' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Firefox 1.5' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Firefox 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sort on second column",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Other browsers' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Trident' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'All others' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'AOL browser (AOL desktop)' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Camino 1.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Reserve sort on second column",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Webkit' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Seamonkey 1.1' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Safari 3.0' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Safari 2.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"And back to asc sorting on second column",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Other browsers' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Trident' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'All others' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'AOL browser (AOL desktop)' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Camino 1.0';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sort on third column, having now sorted on second",
-		function () {
-			$('#example thead th:eq(2)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Other browsers' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Misc' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'All others' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Dillo 0.8' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'NetFront 3.1';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Reserve sort on third column",
-		function () {
-			$('#example thead th:eq(2)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Misc' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Trident' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'IE Mobile' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Internet Explorer 7' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'AOL browser (AOL desktop)';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Return sorting on third column to asc",
-		function () {
-			$('#example thead th:eq(2)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Other browsers' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Misc' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'All others' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Dillo 0.8' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'NetFront 3.1';
-			return ret;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sort on first column having sorted on second then third columns",
-		function () {
-			$('#example thead th:eq(0)').click();
-		},
-		function () {
-			var ret =
-				$('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(1) td:eq(0)').html() == 'Gecko' &&
-				$('#example tbody tr:eq(0) td:eq(1)').html() == 'Epiphany 2.20' &&
-				$('#example tbody tr:eq(1) td:eq(1)').html() == 'Camino 1.0' &&
-				$('#example tbody tr:eq(2) td:eq(1)').html() == 'Camino 1.5';
-			return ret;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2799.js
+++ /dev/null
@@ -1,14 +1,1 @@
-// DATA_TEMPLATE: two_tables
-oTest.fnStart( "Initialise two tables" );
 
-$(document).ready( function () {
-	$('table.display').dataTable();
-	
-	oTest.fnTest( 
-		"Check that initialisation was okay",
-		null,
-		function () { return true; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2840-restore-table-width.js
+++ /dev/null
@@ -1,19 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2840 - Restore table width on fnDestory" );
 
-$(document).ready( function () {
-	document.cookie = "";
-	$('#example').dataTable( {
-		"sScrollX": "100%",
-		"sScrollXInner": "110%"
-	} );
-	$('#example').dataTable().fnDestroy();
-	
-	oTest.fnTest( 
-		"Width after destroy",
-		null,
-		function () { return $('#example').width() == "800"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/2914-state-save-sort.js
+++ /dev/null
@@ -1,39 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "2914 - State saving with an empty array" );
 
-$(document).ready( function () {
-	document.cookie = "";
-	$('#example').dataTable( {
-		"bStateSave": true,
-		"aaSorting": []
-	} );
-	
-	oTest.fnTest( 
-		"No sort",
-		null,
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest( 
-		"Next page",
-		function () {
-			$('#example').dataTable().fnPageChange( 'next' );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Destroy the table and remake it - checking we are still on the next page",
-		function () {
-			$('#example').dataTable( {
-				"bStateSave": true,
-					"aaSorting": [],
-				"bDestroy": true
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnCookieDestroy( $('#example').dataTable() );
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/_zero_config.js
+++ /dev/null
@@ -1,437 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "Sanity checks for DataTables with DOM data" );
 
-oTest.fnTest( 
-	"jQuery.dataTable function",
-	null,
-	function () { return typeof jQuery().dataTable == "function"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableSettings storage array",
-	null,
-	function () { return typeof jQuery().dataTableSettings == "object"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableExt plugin object",
-	null,
-	function () { return typeof jQuery().dataTableExt == "object"; }
-);
-
-$(document).ready( function () {
-	$('#example').dataTable();
-	
-	/* Basic checks */
-	oTest.fnTest( 
-		"Length changing div exists",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Filtering div exists",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Information div exists",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Pagination div exists",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is off by default",
-		null,
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"10 rows shown on the first page",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Initial sort occured",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	/* Need to use the WaitTest for sorting due to the setTimeout datatables uses */
-	oTest.fnTest( 
-		"Sorting (first click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (third click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (first click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column (first click)",
-		function () { 
-			$('#example thead th:eq(0)').click();
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () { var b = 
-			$('#example tbody td:eq(0)').html() == "Gecko" && 
-			$('#example tbody td:eq(1)').html() == "Camino 1.0"; return b; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - sorting second column only",
-		function () { 
-			$('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Basic paging */
-	oTest.fnTest( 
-		"Paging to second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "IE Mobile"; }
-	);
-	
-	oTest.fnTest( 
-		"Paging to first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Attempting to page back beyond the first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Changing length */
-	oTest.fnTest( 
-		"Changing table length to 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 50 records",
-		function () { $("select[name=example_length]").val('50').change(); },
-		function () { return $('#example tbody tr').length == 50; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 100 records",
-		function () { $("select[name=example_length]").val('100').change(); },
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 10 records",
-		function () { $("select[name=example_length]").val('10').change(); },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	/*
-	 * Information element
-	 */
-	oTest.fnTest(
-		"Information on zero config",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on third page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back on first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 25 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records - second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 26 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 100 records - first page",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('100').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back to 10 records",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('10').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 31 to 31 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' back to first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - second time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter increased to 'Win 98'",
-		function () { $('#example_filter input').val("Win 98").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter decreased to 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - third time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter removed",
-		function () { $('#example_filter input').val("").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	/*
-	 * Filtering
-	 */
-	oTest.fnTest(
-		"Filter 'W' - rows",
-		function () { 
-			/* Reset the table such that the old sorting doesn't mess things up */
-			oSession.fnRestore();
-			$('#example').dataTable();
-			$('#example_filter input').val("W").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'W' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 42 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Wi'",
-		function () { $('#example_filter input').val("Wi").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 32 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "AOL browser (AOL desktop)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 reverse",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - maintaing reverse sorting col 1",
-		function () { $('#example_filter input').val("Win XP").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3 - reversed",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting col 3 - reversed info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 6 of 6 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere'",
-		function () { $('#example_filter input').val("nothinghere").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 
-			"No matching records found"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter back to blank and 1st column sorting",
-		function () {
-			$('#example_filter input').val("").keyup();
-			$('#example thead th:eq(0)').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry",
-		function () {
-			$('#example_filter input').val("Win").keyup();
-			$('#example_filter input').val("GeckoWin").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry with space",
-		function () {
-			$('#example_filter input').val("Gecko Win").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 17 entries (filtered from 57 total entries)"; }
-	);
-	
-	
-	
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aaSorting.js
+++ /dev/null
@@ -1,183 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aaSorting" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default sorting is single column",
-		null,
-		function () {
-			return oSettings.aaSorting.length == 1 && typeof oSettings.aaSorting[0] == 'object';
-		}
-	);
-	
-	oTest.fnTest( 
-		"Default sorting is first column asc",
-		null,
-		function () {
-			return oSettings.aaSorting[0].length == 3 && oSettings.aaSorting[0][0] == 0 &&
-				oSettings.aaSorting[0][1] == 'asc';
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting is applied",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single string column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single string column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single int column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single int column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','asc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','desc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "iPod Touch / iPhone"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','desc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Safari 3.0"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','asc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','asc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1.9"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','desc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "125.5"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','desc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (3 column) - string asc / int asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSorting": [['0','asc'], ['3','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(7) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aaSortingFixed.js
+++ /dev/null
@@ -1,60 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aaSortingFixed" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"No fixed sorting by default",
-		null,
-		function () {
-			return oSettings.aaSortingFixed == null;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSortingFixed": [['0','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaSortingFixed": [['3','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "PSP browser"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.bSearchable.js
+++ /dev/null
@@ -1,67 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.bSeachable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Columns are searchable by default",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html().match(/Camino/); }
-	);
-	
-	oTest.fnTest( 
-		"Disabling sorting on a column removes it from the global filter",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Camino");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Disabled on one column has no effect on other columns",
-		function () { oTable.fnFilter("Webkit"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Webkit"; }
-	);
-	
-	oTest.fnTest( 
-		"Disable filtering on multiple columns",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					{ "bSearchable": false },
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Webkit");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Filter on second disabled column",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.bSortable.js
+++ /dev/null
@@ -1,105 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.bSortable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"All columns are sortable by default",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Can disable sorting from one column",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Disabled column has no sorting class",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") == false; }
-	);
-	
-	oTest.fnTest( 
-		"Other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	oTest.fnTest( 
-		"Disable sorting on multiple columns - no sorting classes",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					{ "bSortable": false },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example thead th:eq(1)').hasClass("sorting") ||
-				$('#example thead th:eq(3)').hasClass("sorting")
-			return bReturn == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting on disabled column 1 has no effect",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Second sort on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Even with multiple disabled sorting columns other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.bUseRendered.js
+++ /dev/null
@@ -1,145 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.bUseRendered" );
 
-/* bUseRendered is used to alter sorting data, if false then the original data is used for
- * sorting rather than the rendered data
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	
-	var oTable = $('#example').dataTable( {
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				if ( mTmp == 0 ) {
-					mTmp++;
-					return "aaa";
-				} else
-					return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default for bUseRendered is true - rendered data is used for sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'aaa'; }
-	);
-	
-	oTest.fnTest( 
-		"When bUseRendered is false, original data is used for sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	
-	oTest.fnTest( 
-		"bUseRendered set to false on one columns and true (default) on two others",
-		function () {
-			mTmp = 0;
-			var mTmp2 = 0;
-			var mTmp3 = 0;
-			
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					{
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa1";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp2 == 0 ) {
-								mTmp2++;
-								return "aaa2";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{
-						"fnRender": function (a) {
-							if ( mTmp3 == 0 ) {
-								mTmp3++;
-								return "zzz3";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'aaa1'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 2nd column sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 3rd column sorting",
-		function () {
-			$('#example thead th:eq(2)').click();
-			$('#example thead th:eq(2)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').html() == 'zzz3'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 4th column sorting",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == '-'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 5th column sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.bVisible.js
+++ /dev/null
@@ -1,132 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.bVisible" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"All columns are visible by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes tfoot th column from DOM",
-		null,
-		function () { return $('#example tfoot tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"The correct thead column has been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Platform(s)" &&
-				jqNodes[2].innerHTML == "Engine version" &&
-				jqNodes[3].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"The correct tbody column has been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "Gnome" &&
-				jqNodes[2].innerHTML == "1.8" &&
-				jqNodes[3].innerHTML == "A";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Can hide multiple columns and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					{ "bVisible": false },
-					null,
-					{ "bVisible": false }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - removes tfoot th column from DOM",
-		null,
-		function () { return $('#example tfoot tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - the correct thead columns have been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Engine version"
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - the correct tbody columns have been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "1"
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.fnRender.js
+++ /dev/null
@@ -1,175 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.fnRender" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	var oTable = $('#example').dataTable( {
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				mTmp++;
-				return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Single column - fnRender is called once for each row",
-		null,
-		function () { return mTmp == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Confirm that fnRender passes one argument (an object) with three parameters",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( arguments.length != 1 || typeof a.iDataRow=='undefined' ||
-						 	typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender iDataColumn is row number",
-		function () {
-			var iCount = 0;
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( iCount != a.iDataRow )
-						{
-							mTmp = false;
-						}
-						iCount++;
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender iDataColumn is the column",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.iDataColumn != 1 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender aData is data array of correct size",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.aData.length != 5 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest';
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'unittest'; }
-	);
-	
-	oTest.fnTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest1';
-					} },
-					{ "fnRender": function (a) {
-						return 'unittest2';
-					} },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(0) td:eq(2)').html() == 'unittest1' &&
-				$('#example tbody tr:eq(0) td:eq(3)').html() == 'unittest2';
-			return bReturn; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.iDataSort.js
+++ /dev/null
@@ -1,88 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.iDataSort" );
 
-$(document).ready( function () {
-	/* Should know that sorting already works by default from other tests, so we can jump
-	 * right in here
-	 */
-	var oTable = $('#example').dataTable( {
-		"aoColumns": [
-			null,
-			{ "iDataSort": 4 },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Sorting on first column is uneffected",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on second column is the order of the fifth",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnTest( 
-		"Reserve sorting on second column uses fifth column as well",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on 5th column retains it's own sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Use 2nd col for sorting 5th col and via-versa - no effect on first col sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "iDataSort": 4 },
-					null,
-					null,
-					{ "iDataSort": 1 }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnTest( 
-		"2nd col sorting uses fifth col",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnTest( 
-		"2nd col sorting uses fifth col - reversed",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnTest( 
-		"5th col sorting uses 2nd col",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnTest( 
-		"5th col sorting uses 2nd col - reversed",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'Seamonkey 1.1'; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.sClass.js
+++ /dev/null
@@ -1,111 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.sClass" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"By default the test class hasn't been applied to the column (sanity!)",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					null,
-					{ "sClass": 'unittest' },
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - third row",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - last row",
-		null,
-		function () { return $('#example tbody tr:eq(9) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to other columns - 1st",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to other columns - 5th",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - seventh row - second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody tr:eq(6) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to header",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to footer",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					{ "sClass": 'unittest2' },
-					null,
-					null,
-					{ "sClass": 'unittest1' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest2') &&
-				$('#example tbody tr:eq(8) td:eq(3)').hasClass('unittest1');
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 1",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').hasClass('unittest1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 2",
-		null,
-		function () { return $('#example tbody tr:eq(6) td:eq(4)').hasClass('unittest2') == false; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.sName.js
+++ /dev/null
@@ -1,27 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.sName" );
 
-/* This has no effect at all in DOM methods - so we just check that it has applied the name */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aoColumns": [
-			null,
-			null,
-			null,
-			{ "sName": 'unit test' },
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Names are stored in the columns object",
-		null,
-		function () { return oSettings.aoColumns[3].sName =="unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.sTitle.js
+++ /dev/null
@@ -1,78 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.sTitle" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Column names are read from the DOM by default",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Browser" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Can set a single column title - and others are read from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test' },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Can set multiple column titles",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test 1' },
-					null,
-					null,
-					{ "sTitle": 'unit test 2' }
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test 1" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "unit test 2";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoColumns.sWidth.js
+++ /dev/null
@@ -1,84 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoColumns.sWidth" );
 
-/* NOTE - we need to disable the auto width for the majority of these test in order to preform 
- * these tests as the auto width will convert the width to a px value. We can do 'non-exact' tests
- * with auto width enabled however to ensure it scales columns as required
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bAutoWidth": false,
-		"aoColumns": [
-			null,
-			{ "sWidth": '40%' },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"With auto width disabled the width for one column is appled",
-		null,
-		function () { return $('#example thead th:eq(1)')[0].style.width == "40%"; }
-	);
-	
-	oTest.fnTest( 
-		"With auto width disabled the width for one column is appled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bAutoWidth": false,
-				"aoColumns": [
-					null,
-					null,
-					{ "sWidth": '20%' },
-					{ "sWidth": '30%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn =
-				$('#example thead th:eq(2)')[0].style.width == "20%" &&
-				$('#example thead th:eq(3)')[0].style.width == "30%";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"With auto width, it will make the smallest column the largest with percentage width given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoColumns": [
-					null,
-					null,
-					null,
-					{ "sWidth": '40%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			
-			if ( a3>a0 && a3>a1 && a3>a2 && a3>a4 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/aoSearchCols.js
+++ /dev/null
@@ -1,112 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "aoSearchCols" );
 
-/* We could be here forever testing this one, so we test a limited subset on a couple of colums */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default should be to have a empty colums array",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.aoPreSearchCols[0].sSearch == 0 && !oSettings.aoPreSearchCols[0].bRegex &&
-				oSettings.aoPreSearchCols[1].sSearch == 0 && !oSettings.aoPreSearchCols[1].bRegex &&
-				oSettings.aoPreSearchCols[2].sSearch == 0 && !oSettings.aoPreSearchCols[2].bRegex &&
-				oSettings.aoPreSearchCols[3].sSearch == 0 && !oSettings.aoPreSearchCols[3].bRegex &&
-				oSettings.aoPreSearchCols[4].sSearch == 0 && !oSettings.aoPreSearchCols[4].bRegex;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Search on a single column - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1.5" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1.5"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on single column - escape regex false",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					null,
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 3 of 3 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "3.3", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Konqureror 3.3"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns (no records) - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "Allan", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/asStripClasses.js
+++ /dev/null
@@ -1,106 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "asStripClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Default row striping is applied",
-		null,
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Row striping does not effect current classes",
-		null,
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('gradeA') &&
-			       $('#example tbody tr:eq(1)').hasClass('gradeA') &&
-			       $('#example tbody tr:eq(2)').hasClass('gradeA') &&
-			       $('#example tbody tr:eq(3)').hasClass('gradeA');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Row striping on the second page",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	/* No striping */
-	oTest.fnTest( 
-		"No row striping",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"asStripClasses": []
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)')[0].className == "gradeA" &&
-			       $('#example tbody tr:eq(1)')[0].className == "gradeA" &&
-			       $('#example tbody tr:eq(2)')[0].className == "gradeA" &&
-			       $('#example tbody tr:eq(3)')[0].className == "gradeA";
-		}
-	);
-	
-	/* Custom striping */
-	oTest.fnTest( 
-		"Custom striping [2]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"asStripClasses": [ 'test1', 'test2' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test1') &&
-			       $('#example tbody tr:eq(3)').hasClass('test2');
-		}
-	);
-	
-	
-	/* long array of striping */
-	oTest.fnTest( 
-		"Custom striping [4]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"asStripClasses": [ 'test1', 'test2', 'test3', 'test4' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Custom striping is restarted on second page [2]",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bAutoWidth.js
+++ /dev/null
@@ -1,138 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bAutoWidth" );
 
-/* It's actually a little tricky to test this. We can't test absolute numbers because
- * different browsers and different platforms will render the width of the columns slightly
- * differently. However, we certainly can test the principle of what should happen (column 
- * width doesn't change over pages)
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Auto width is enabled by default",
-		null,
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	oTest.fnTest( 
-		"First column has a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style').match(/width/i); }
-	);
-	
-	/*
-	This would seem like a better test - but there appear to be difficulties with tables
-	which are bigger (calculated) than there is actually room for. I suspect this is actually
-	a bug in datatables
-	oTest.fnTest( 
-		"Check column widths on first page match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			console.log( a0, b0, a1, b1, a2, b2, a3, b3 );
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check column widths on second page match thid page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	*/
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Auto width can be disabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bAutoWidth": false
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth == false; }
-	);
-	
-	oTest.fnTest( 
-		"First column does not have a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style') == null; }
-	);
-	
-	/*
-	oTest.fnTest( 
-		"Check column widths on first page do not match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return false;
-			else
-				return true;
-		}
-	);
-	*/
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Auto width enabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bAutoWidth": true
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bFilter.js
+++ /dev/null
@@ -1,40 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bFilter" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Filtering div exists by default",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Fltering can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bFilter": false
-			} );
-		},
-		function () { return document.getElementById('example_filter') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Filtering enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bFilter": true
-			} );
-		},
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bInfiniteScroll.js
+++ /dev/null
@@ -1,130 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bInfiniteScroll" );
 
-
-$(document).ready( function () {
-	var oTable = $('#example').dataTable( {
-		"bScrollInfinite": true,
-		"sScrollY": "200px"
-	} );
-	
-	oTest.fnTest( 
-		"10 rows by default",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Info",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes",
-		null,
-		function () { return $('#example tbody>tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll on 20px adds 10 rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 20px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after 20px scroll",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Scroll on 10px more results in the same number of rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(30); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 10 more px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll to 240px adds another 10 rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(240); },
-		function () { return $('#example tbody tr').length == 30; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 240px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after 240px scroll",
-		null,
-		function () { return $('#example tbody>tr').length == 30; }
-	);
-	
-	oTest.fnTest( 
-		"Filtering will drop back to 10 rows",
-		function () { 
-			$('div.dataTables_scrollBody').scrollTop(0);
-			oTable.fnFilter('gec')
-		},
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Info after filtering",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 20 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after filtering",
-		null,
-		function () { return $('#example tbody>tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll after filtering adds 10",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after filtering",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting will drop back to 10 rows",
-		function () { oTable.fnSort([[1,'asc']]) },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll after sorting adds 10",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after scrolling",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bInfo.js
+++ /dev/null
@@ -1,40 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Info div exists by default",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Info can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bInfo": false
-			} );
-		},
-		function () { return document.getElementById('example_info') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Info enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bInfo": true
-			} );
-		},
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bJQueryUI.js
+++ /dev/null
@@ -1,40 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bJQueryUI" );
 
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"bJQueryUI": true
-	} );
-	
-	oTest.fnTest( 
-		"Header elements are fully wrapped by DIVs",
-		null,
-		function () {
-			var test = true;
-			$('#example thead th').each( function () {
-				if ( this.childNodes > 1 ) {
-					test = false;
-				}
-			} );
-			return test;
-		}
-	);
-	
-	oTest.fnTest( 
-		"One div for each header element",
-		null,
-		function () {
-			return $('#example thead th div').length == 5;
-		}
-	);
-	
-	oTest.fnTest( 
-		"One span for each header element, nested as child of div",
-		null,
-		function () {
-			return $('#example thead th div>span').length == 5;
-		}
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bLengthChange.js
+++ /dev/null
@@ -1,71 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bLengthChange" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Length div exists by default",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnTest(
-		"Four default options",
-		null,
-		function () { return $("select[name=example_length] option").length == 4; }
-	);
-	
-	oTest.fnTest(
-		"Default options",
-		null,
-		function () {
-			var opts = $("select[name='example_length'] option");
-			return opts[0].getAttribute('value') == 10 && opts[1].getAttribute('value') == 25 &&
-				opts[2].getAttribute('value') == 50 && opts[3].getAttribute('value') == 100;
-		}
-	);
-	
-	oTest.fnTest(
-		"Info takes length into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Change length can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bLengthChange": false
-			} );
-		},
-		function () { return document.getElementById('example_length') == null; }
-	);
-	
-	oTest.fnTest(
-		"Information takes length disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Length change enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bLengthChange": true
-			} );
-		},
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bPaginate.js
+++ /dev/null
@@ -1,55 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bPaginate" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Pagiantion div exists by default",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnTest(
-		"Information div takes paging into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bPaginate": false
-			} );
-		},
-		function () { return document.getElementById('example_paginate') == null; }
-	);
-	
-	oTest.fnTest(
-		"Information div takes paging disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 57 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Pagiantion enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bPaginate": true
-			} );
-		},
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bProcessing.js
+++ /dev/null
@@ -1,99 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bProcessing" );
 
-/* It's actually a bit hard to set this one due to the fact that it will only be shown
- * when DataTables is doing some kind of processing. The server-side processing is a bit
- * better to test this than here - so we just the interal functions to enable it and check
- * that it is available
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Processing is off by default",
-		null,
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div cannot be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div cannot be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Processing can be enabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bProcessing": true
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == true; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing'); }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is hidden by default",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div can be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "visible"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div can be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Processing disabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bProcessing": false
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bServerSide.js
+++ /dev/null
@@ -1,18 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bServerSide" );
 
-/* Not interested in server-side processing here other than to check that it is off */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Server side is off by default",
-		null,
-		function () { return oSettings.oFeatures.bServerSide == false; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bSort.js
+++ /dev/null
@@ -1,101 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bSort" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Sorting is on by default",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting Asc by default class applied",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnTest(
-		"Click on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting class removed from first column",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting asc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnTest(
-		"Reverse on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting acs class removed from second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting desc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_desc"); }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bSort": false
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Disabled classes applied",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass('sorting_disabled'); }
-	);
-	
-	oTest.fnTest(
-		"Click on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Reverse on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Sorting enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bSort": true
-			} );
-		},
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/bSortClasses.js
+++ /dev/null
@@ -1,128 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "bSortClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Sorting classes are applied by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes are applied to all required cells",
-		null,
-		function () { return $('#example tbody tr:eq(7) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes are not applied to non-sorting columns",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 1",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 2",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 3",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(3)')[0], { 'shift': true } );
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Remove sorting classes on single column sort",
-		function () { 
-			$('#example thead th:eq(4)').click();
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting class 1 was added",
-		null,
-		function () { return $('#example tbody tr:eq(1) td:eq(4)').hasClass('sorting_1'); }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Sorting classes can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bSortClasses": false
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes disabled - add column 1 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes disabled - add column 2 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Sorting classes enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bSortClasses": true
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnCookieCallback.js
+++ /dev/null
@@ -1,97 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "Cookie callback" );
 
-
-$(document).ready( function () {
-	var mPass;
-	/* Note that in order to be fully effective here for saving state, there would need to be a
-	 * stringify function to serialise the data array
-	 */
-	
-	oTest.fnTest( 
-		"null by default",
-		function () {
-			$('#example').dataTable();
-		},
-		function () { return $('#example').dataTable().fnSettings().fnCookieCallback == null; }
-	);
-	
-	oTest.fnTest( 
-		"Number of arguments",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"bStateSave": true,
-				"fnCookieCallback": function (sName, oData, sExpires, sPath) {
-					mPass = arguments.length;
-					return sName + "=; expires=" + sExpires +"; path=" + sPath;
-				}
-			} );
-		},
-		function () { return mPass == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Name",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"bStateSave": true,
-				"fnCookieCallback": function (sName, oData, sExpires, sPath) {
-					mPass = sName=="SpryMedia_DataTables_example_dom_data.php";
-					return sName + "=; expires=" + sExpires +"; path=" + sPath;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"bStateSave": true,
-				"fnCookieCallback": function (sName, oData, sExpires, sPath) {
-					mPass = typeof oData.iStart != 'undefined';
-					return sName + "=; expires=" + sExpires +"; path=" + sPath;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Expires",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"bStateSave": true,
-				"fnCookieCallback": function (sName, oData, sExpires, sPath) {
-					mPass = typeof sExpires == 'string';
-					return sName + "=; expires=" + sExpires +"; path=" + sPath;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Path",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"bStateSave": true,
-				"fnCookieCallback": function (sName, oData, sExpires, sPath) {
-					mPass = sPath.match(/media\/unit_testing\/templates/);
-					return sName + "=; expires=" + sExpires +"; path=" + sPath;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnCookieDestroy( $('#example').dataTable() );
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnDeleteRow.js
+++ /dev/null
@@ -1,30 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnDeleteRow" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Check that the default data is sane",
-		null,
-		function () { return oSettings.asDataSearch.join(' ').match(/4.0/g).length == 3; }
-	);
-	
-	oTest.fnTest( 
-		"Remove the first data row, and check that hte search data has been updated",
-		function () { oTable.fnDeleteRow( 0 ); },
-		function () { return oSettings.asDataSearch.join(' ').match(/4.0/g).length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Check that the info element has been updated",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 56 entries"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnDrawCallback.js
+++ /dev/null
@@ -1,80 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnDrawCallback" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnDrawCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"One argument passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"fnDrawCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"fnDrawCallback": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnDrawCallback": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called once on each draw there after as well",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnFooterCallback.js
+++ /dev/null
@@ -1,227 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnFooterCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnFooterCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					nFoot.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example tfoot th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Data array has length matching original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aasData.length != 57 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array's column lengths match original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					for ( var i=0, iLen=aasData.length ; i<iLen ; i++ )
-					{
-						if ( aasData[i].length != 5 )
-						{
-							mPass = false;
-						}
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 10 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd != 10 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 20 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 57 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnHeaderCallback.js
+++ /dev/null
@@ -1,227 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnHeaderCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnHeaderCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example thead th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Data array has length matching original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aasData.length != 57 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array's column lengths match original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					for ( var i=0, iLen=aasData.length ; i<iLen ; i++ )
-					{
-						if ( aasData[i].length != 5 )
-						{
-							mPass = false;
-						}
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 10 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd != 10 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 20 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 57 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnInfoCallback.js
+++ /dev/null
@@ -1,115 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnInfoCallback checks" );
 
-$(document).ready( function () {
-	var mPass;
-	
-	$('#example').dataTable();
-	
-	/* Basic checks */
-	oTest.fnTest( 
-		"null by default",
-		null,
-		function () { return $('#example').dataTable().fnSettings().oLanguage.fnInfoCallback == null; }
-	);
-	
-	oTest.fnTest( 
-		"Agrument length",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					mPass = arguments.length;
-					return sPre;
-				}
-			} );
-		},
-		function () { return mPass == 6; }
-	);
-	
-	oTest.fnTest( 
-		"Settings first",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					mPass = (oS == $('#example').dataTable().fnSettings()) ? true : false;
-					return sPre;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Start arg",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					return iStart;
-				}
-			} );
-		},
-		function () { return $('#example_info').html() == "1"; }
-	);
-	
-	oTest.fnTest( 
-		"End arg",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					return iEnd;
-				}
-			} );
-		},
-		function () { return $('#example_info').html() == "10"; }
-	);
-	
-	oTest.fnTest( 
-		"Max arg",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					return iMax;
-				}
-			} );
-		},
-		function () { return $('#example_info').html() == "57"; }
-	);
-	
-	oTest.fnTest( 
-		"Max arg - filter",
-		function () {
-			$('#example').dataTable().fnFilter("1.0");
-		},
-		function () { return $('#example_info').html() == "57"; }
-	);
-	
-	oTest.fnTest( 
-		"Total arg",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"fnInfoCallback": function( oS, iStart, iEnd, iMax, iTotal, sPre ) {
-					return iTotal;
-				}
-			} );
-		},
-		function () { return $('#example_info').html() == "57"; }
-	);
-	
-	oTest.fnTest( 
-		"Total arg - filter",
-		function () {
-			$('#example').dataTable().fnFilter("1.0");
-		},
-		function () { return $('#example_info').html() == "3"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnInitComplete.js
+++ /dev/null
@@ -1,94 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnInitComplete" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnInitComplete == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"One argument passed (for DOM!)",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"fnInitComplete": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"fnInitComplete": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnInitComplete called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnInitComplete": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnInitComplete never called there after",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"10 rows in the table on complete",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnInitComplete": function ( ) {
-					mPass = $('#example tbody tr').length;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/fnRowCallback.js
+++ /dev/null
@@ -1,105 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "fnRowCallback" );
 
-/* Note - fnRowCallback MUST return the first arguments (modified or not) */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnRowCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Four arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"fnRowCallback": function ( nTr ) {
-					mPass = arguments.length;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once for each drawn row",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					mPass++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					$(nTr).addClass('unit_test');
-					return nTr;
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1)').hasClass('unit_test'); }
-	);
-	
-	oTest.fnTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( asData.length != 5 )
-						mPass = false;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			var iCount = 0;
-			$('#example').dataTable( {
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( iCount != iDrawIndex )
-						mPass = false;
-					iCount++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/iDisplayLength.js
+++ /dev/null
@@ -1,76 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "iDisplayLength" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable();
-	
-	oTest.fnTest( 
-		"Default length is ten",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 10",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 25",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"iDisplayLength": 25
-			} );
-		},
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 25; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 100",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"iDisplayLength": 100
-			} );
-		},
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 100; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 23 (unknown select menu length)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"iDisplayLength": 23
-			} );
-		},
-		function () { return $('#example tbody tr').length == 23; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 10 (since 23 is unknow)",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.oPaginate.js
+++ /dev/null
@@ -1,80 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.oPaginate" );
 
-/* Note that the paging language information only has relevence in full numbers */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( { "sPaginationType": "full_numbers" } );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "First" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Previous" &&
-				oSettings.oLanguage.oPaginate.sNext == "Next" &&
-				oSettings.oLanguage.oPaginate.sLast == "Last";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "First" &&
-				$('#example_paginate .previous').html() == "Previous" &&
-				$('#example_paginate .next').html() == "Next" &&
-				$('#example_paginate .last').html() == "Last";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sPaginationType": "full_numbers",
-				"oLanguage": {
-					"oPaginate": {
-						"sFirst":    "unit1",
-						"sPrevious": "test2",
-						"sNext":     "unit3",
-						"sLast":     "test4"
-					}
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "unit1" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "test2" &&
-				oSettings.oLanguage.oPaginate.sNext == "unit3" &&
-				oSettings.oLanguage.oPaginate.sLast == "test4";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate definitions are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "unit1" &&
-				$('#example_paginate .previous').html() == "test2" &&
-				$('#example_paginate .next').html() == "unit3" &&
-				$('#example_paginate .last').html() == "test4";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfo.js
+++ /dev/null
@@ -1,109 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info language is 'Showing _START_ to _END_ of _TOTAL_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sInfo == "Showing _START_ to _END_ of _TOTAL_ entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Info language can be defined - without any macros",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfo == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _START_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit _START_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _END_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 10 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _TOTAL_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 57 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macros _START_ and _END_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macros _START_, _END_ and _TOTAL_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 57 test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js
+++ /dev/null
@@ -1,75 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sInfoEmpty" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info empty language is 'Showing 0 to 0 of 0 entries' by default",
-		function () { oTable.fnFilter("nothinghere"); },
-		function () { return oSettings.oLanguage.sInfoEmpty == "Showing 0 to 0 of 0 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"Showing 0 to 0 of 0 entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Info empty language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfoEmpty": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return oSettings.oLanguage.sInfoEmpty == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Macro's not replaced",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfoEmpty": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit _START_ _END_ _TOTAL_ test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoPostFix.js
+++ /dev/null
@@ -1,73 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sInfoPostFix" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info post fix language is '' (blank) by default",
-		null,
-		function () { return oSettings.oLanguage.sInfoPostFix == ""; }
-	);
-	
-	oTest.fnTest( 
-		"Width no post fix, the basic info shows",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Info post fix language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfoPostFix == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit test"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Macros have no effect in the post fix",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfoPostFix": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit _START_ _END_ _TOTAL_ test"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Post fix is applied after fintering info",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 0 to 0 of 0 entries unit (filtered from 57 total entries) test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sLengthMenu.js
+++ /dev/null
@@ -1,101 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sLengthMenu" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Menu language is 'Show _MENU_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sLengthMenu == "Show _MENU_ entries"; }
-	);
-	
-	oTest.fnTest(
-		"_MENU_ macro is replaced by select menu in DOM",
-		null,
-		function () { return $('select', oSettings.aanFeatures.l[0]).length == 1 }
-	);
-	
-	oTest.fnTest(
-		"Default is put into DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "Show " &&
-				anChildren[2].nodeValue == " entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Menu length language can be defined - no _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sLengthMenu": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sLengthMenu == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Menu length language definition is in the DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			return anChildren[0].nodeValue == "unit test";
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Menu length language can be defined - with _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sLengthMenu": "unit _MENU_ test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "unit " &&
-				anChildren[2].nodeValue == " test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Only the _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sLengthMenu": "_MENU_"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren.length == 1 &&
-				$('select', oSettings.aanFeatures.l[0]).length == 1;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sProcessing.js
+++ /dev/null
@@ -1,47 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sProcessing" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bProcessing": true
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Processing language is 'Processing...' by default",
-		null,
-		function () { return oSettings.oLanguage.sProcessing == "Processing..."; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "Processing..."; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Processing language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bProcessing": true,
-				"oLanguage": {
-					"sProcessing": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sProcessing == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sSearch.js
+++ /dev/null
@@ -1,61 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Search language is 'Search:' by default",
-		null,
-		function () { return oSettings.oLanguage.sSearch == "Search:"; }
-	);
-	
-	oTest.fnTest( 
-		"Search language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "Search: "; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Search language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sSearch": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sSearch == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "unit test "; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Blank search has a no (separator) inserted",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sSearch": ""
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return document.getElementById('example_filter').childNodes.length == 1; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sUrl.js
+++ /dev/null
@@ -1,59 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sUrl" );
 
-/* Note that we only test the internal storage of language information pulled form a file here
- * as the other language tests will check it goes into the DOM correctly
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"sUrl is blank by default",
-		null,
-		function () { return oSettings.oLanguage.sUrl == ""; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Loading of German file loads language information",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sUrl": "../../../examples/examples_support/de_DE.txt"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.sProcessing == "Bitte warten..." &&
-				oSettings.oLanguage.sLengthMenu == "_MENU_ Einträge anzeigen" &&
-				oSettings.oLanguage.sZeroRecords == "Keine Einträge vorhanden." &&
-				oSettings.oLanguage.sInfo == "_START_ bis _END_ von _TOTAL_ Einträgen" &&
-				oSettings.oLanguage.sInfoEmpty == "0 bis 0 von 0 Einträgen" &&
-				oSettings.oLanguage.sInfoFiltered == "(gefiltert von _MAX_  Einträgen)" &&
-				oSettings.oLanguage.sInfoPostFix == "" &&
-				oSettings.oLanguage.sSearch == "Suchen" &&
-				oSettings.oLanguage.oPaginate.sFirst == "Erster" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Zurück" &&
-				oSettings.oLanguage.oPaginate.sNext == "Nächster" &&
-				oSettings.oLanguage.oPaginate.sLast == "Letzter";
-				
-			return bReturn;
-		}
-	);
-	
-	/* One DOM check just to ensure that they go into the DOM */
-	oTest.fnTest(
-		"Loaded language goes into the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "1 bis 10 von 57 Einträgen"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sZeroRecords.js
+++ /dev/null
@@ -1,45 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oLanguage.sZeroRecords" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Zero records language is 'No matching records found' by default",
-		null,
-		function () { return oSettings.oLanguage.sZeroRecords == "No matching records found"; }
-	);
-	
-	oTest.fnTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "No matching records found" }
-	);
-	
-	
-	
-	oTest.fnTest( 
-		"Zero records language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oLanguage": {
-					"sZeroRecords": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sZeroRecords == "unit test"; }
-	);
-	
-	oTest.fnTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere2'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "unit test" }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/oSearch.js
+++ /dev/null
@@ -1,101 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "oSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default values should be blank",
-		null,
-		function () {
-			var bReturn = oSettings.oPreviousSearch.sSearch == "" && 
-			              !oSettings.oPreviousSearch.bRegex;
-			return bReturn;
-		}
-	);
-	
-	/* This test might be considered iffy since the full object isn't given, but it's reasonable to
-	 * expect DataTables to cope with this. It should just assumine regex false
-	 */
-	oTest.fnTest( 
-		"Search term only in object",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"oSearch": {
-					"sSearch": "Mozilla"
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest( 
-		"New search will kill old one",
-		function () {
-			oTable.fnFilter("Opera");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnTest( 
-		"Search plain text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oSearch": {
-					"sSearch": "DS",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Nintendo DS browser"; }
-	);
-	
-	oTest.fnTest( 
-		"Search plain text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oSearch": {
-					"sSearch": "Opera",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnTest( 
-		"Search regex text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Search regex text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/sAjaxSource.js
+++ /dev/null
@@ -1,18 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "sAjaxSource" );
 
-/* Not interested in ajax source here other than to check it's default */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Server side is off by default",
-		null,
-		function () { return oSettings.sAjaxSource == null; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/sDom.js
+++ /dev/null
@@ -1,319 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "sDom" );
 
-/* This is going to be brutal on the browser! There is a lot that can be tested here... */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default DOM varaible",
-		null,
-		function () { return oSettings.sDom == "lfrtip"; }
-	);
-	
-	oTest.fnTest( 
-		"Default DOM in document",
-		null,
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check example 1 in code propagates",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sDom": '<"wrapper"flipt>'
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sDom == '<"wrapper"flipt>'; }
-	);
-	
-	oTest.fnTest( 
-		"Check example 1 in DOM",
-		null,
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			var nCustomWrapper = $('div.wrapper')[0];
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrapper &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nLength &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging &&
-				nNodes[6] == nTable;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check example 2 in DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sDom": '<lf<t>ip>'
-			} );
-		},
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			var nCustomWrappers = []
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-				
-				/* Only the two custom divs don't have class names */
-				if ( !jqNodes[i].getAttribute('class') )
-				{
-					nCustomWrappers.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrappers[0] &&
-				nNodes[2] == nLength &&
-				nNodes[3] == nFilter &&
-				nNodes[4] == nCustomWrappers[1] &&
-				nNodes[5] == nTable &&
-				nNodes[6] == nInfo &&
-				nNodes[7] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no length element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sDom": 'frtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				null == nLength &&
-				nNodes[1] == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no filter element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sDom": 'lrtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				null == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	/* Note we don't test for no table as this is not supported (and it would be fairly daft! */
-	
-	oTest.fnTest( 
-		"Check no info element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sDom": 'lfrtp'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				null == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no paging element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sDom": 'lfrti'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				null == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Element with an id",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sDom": '<"#test"lf>rti'
-			} );
-		},
-		function () {
-			return $('#test').length == 1;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Element with an id and a class",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sDom": '<"#test.classTest"lf>rti'
-			} );
-		},
-		function () {
-			return ($('#test').length == 1 && $('#test')[0].className == "classTest");
-		}
-	);
-	
-	oTest.fnTest( 
-		"Element with just a class",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sDom": '<"classTest"lf>rti'
-			} );
-		},
-		function () {
-			return ($('div.classTest').length == 1 );
-		}
-	);
-	
-	oTest.fnTest( 
-		"Two elements with an id",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sDom": '<"#test1"lf>rti<"#test2"lf>'
-			} );
-		},
-		function () {
-			return ($('#test1').length == 1 && $('#test2').length == 1);
-		}
-	);
-	
-	oTest.fnTest( 
-		"Two elements with an id and one with a class",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sDom": '<"#test1"lf>rti<"#test2.classTest"lf>'
-			} );
-		},
-		function () {
-			return ($('#test1').length == 1 && $('#test2').length == 1 && $('div.classTest').length == 1);
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/1_dom/sPaginationType.js
+++ /dev/null
@@ -1,122 +1,1 @@
-// DATA_TEMPLATE: dom_data
-oTest.fnStart( "sPaginationType" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable();
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Check two button paging is the default",
-		null,
-		function () { return oSettings.sPaginationType == "two_button"; }
-	);
-	
-	oTest.fnTest( 
-		"Check class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_two_button'); }
-	);
-	
-	oTest.fnTest( 
-		"Two div elements are in the wrapper",
-		null,
-		function () { return $('#example_paginate div').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"We have the previous button",
-		null,
-		function () { return document.getElementById('example_previous'); }
-	);
-	
-	oTest.fnTest( 
-		"We have the next button",
-		null,
-		function () { return document.getElementById('example_next'); }
-	);
-	
-	oTest.fnTest( 
-		"Previous button is disabled",
-		null,
-		function () { return $('#example_previous').hasClass('paginate_disabled_previous'); }
-	);
-	
-	oTest.fnTest( 
-		"Next button is enabled",
-		null,
-		function () { return $('#example_next').hasClass('paginate_enabled_next'); }
-	);
-	
-	/* Don't test paging - that's done by the zero config test script. */
-	
-	
-	/* Two buttons paging */
-	oTest.fnTest( 
-		"Can enabled full numbers paging",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sPaginationType": "full_numbers"
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sPaginationType == "full_numbers"; }
-	);
-	
-	oTest.fnTest( 
-		"Check full numbers class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_full_numbers'); }
-	);
-	
-	
-	var nFirst, nPrevious, nNext, nLast;
-	oTest.fnTest( 
-		"Jump to last page",
-		function () {
-			nFirst = $('div.dataTables_paginate span.first');
-			nPrevious = $('div.dataTables_paginate span.previous');
-			nNext = $('div.dataTables_paginate span.next');
-			nLast = $('div.dataTables_paginate span.last');
-			nLast.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Go to two pages previous",
-		function () {
-			nPrevious.click();
-			nPrevious.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 31 to 40 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Next (second last) page",
-		function () {
-			nNext.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 41 to 50 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Jump to first page",
-		function () {
-			nFirst.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries";
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/_zero_config.js
+++ /dev/null
@@ -1,440 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "Sanity checks for DataTables with data from JS" );
 
-oTest.fnTest( 
-	"jQuery.dataTable function",
-	null,
-	function () { return typeof jQuery().dataTable == "function"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableSettings storage array",
-	null,
-	function () { return typeof jQuery().dataTableSettings == "object"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableExt plugin object",
-	null,
-	function () { return typeof jQuery().dataTableExt == "object"; }
-);
-
-$(document).ready( function () {
-	var oInit = {
-		"aaData": gaaData
-	};
-	$('#example').dataTable( oInit );
-	
-	/* Basic checks */
-	oTest.fnTest( 
-		"Length changing div exists",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Filtering div exists",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Information div exists",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Pagination div exists",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is off by default",
-		null,
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"10 rows shown on the first page",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Initial sort occured",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	/* Need to use the WaitTest for sorting due to the setTimeout datatables uses */
-	oTest.fnTest( 
-		"Sorting (first click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (third click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (first click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column (first click)",
-		function () { 
-			$('#example thead th:eq(0)').click();
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () { var b = 
-			$('#example tbody td:eq(0)').html() == "Gecko" && 
-			$('#example tbody td:eq(1)').html() == "Camino 1.0"; return b; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - sorting second column only",
-		function () { 
-			$('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Basic paging */
-	oTest.fnTest( 
-		"Paging to second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "IE Mobile"; }
-	);
-	
-	oTest.fnTest( 
-		"Paging to first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Attempting to page back beyond the first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Changing length */
-	oTest.fnTest( 
-		"Changing table length to 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 50 records",
-		function () { $("select[name=example_length]").val('50').change(); },
-		function () { return $('#example tbody tr').length == 50; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 100 records",
-		function () { $("select[name=example_length]").val('100').change(); },
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 10 records",
-		function () { $("select[name=example_length]").val('10').change(); },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	/*
-	 * Information element
-	 */
-	oTest.fnTest(
-		"Information on zero config",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on third page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back on first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 25 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records - second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 26 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 100 records - first page",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('100').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back to 10 records",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('10').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 31 to 31 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' back to first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - second time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter increased to 'Win 98'",
-		function () { $('#example_filter input').val("Win 98").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter decreased to 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - third time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter removed",
-		function () { $('#example_filter input').val("").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	/*
-	 * Filtering
-	 */
-	oTest.fnTest(
-		"Filter 'W' - rows",
-		function () { 
-			/* Reset the table such that the old sorting doesn't mess things up */
-			oSession.fnRestore();
-			$('#example').dataTable( oInit );
-			$('#example_filter input').val("W").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'W' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 42 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Wi'",
-		function () { $('#example_filter input').val("Wi").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 32 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "AOL browser (AOL desktop)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 reverse",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - maintaing reverse sorting col 1",
-		function () { $('#example_filter input').val("Win XP").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3 - reversed",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting col 3 - reversed info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 6 of 6 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere'",
-		function () { $('#example_filter input').val("nothinghere").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 
-			"No matching records found"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter back to blank and 1st column sorting",
-		function () {
-			$('#example_filter input').val("").keyup();
-			$('#example thead th:eq(0)').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry",
-		function () {
-			$('#example_filter input').val("Win").keyup();
-			$('#example_filter input').val("GeckoWin").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry with space",
-		function () {
-			$('#example_filter input').val("Gecko Win").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 17 entries (filtered from 57 total entries)"; }
-	);
-	
-	
-	
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aaSorting.js
+++ /dev/null
@@ -1,198 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aaSorting" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default sorting is single column",
-		null,
-		function () {
-			return oSettings.aaSorting.length == 1 && typeof oSettings.aaSorting[0] == 'object';
-		}
-	);
-	
-	oTest.fnTest( 
-		"Default sorting is first column asc",
-		null,
-		function () {
-			return oSettings.aaSorting[0].length == 3 && oSettings.aaSorting[0][0] == 0 &&
-				oSettings.aaSorting[0][1] == 'asc';
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting is applied",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single string column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single string column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single int column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Custom sorting on single int column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','asc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','desc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "iPod Touch / iPhone"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','desc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Safari 3.0"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','asc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string asc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','asc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1.9"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','desc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "125.5"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (2 column) - string desc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','desc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column sorting (3 column) - string asc / int asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSorting": [['0','asc'], ['3','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(7) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aaSortingFixed.js
+++ /dev/null
@@ -1,64 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aaSortingFixed" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"No fixed sorting by default",
-		null,
-		function () {
-			return oSettings.aaSortingFixed == null;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSortingFixed": [['0','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aaSortingFixed": [['3','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "PSP browser"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.bSearchable.js
+++ /dev/null
@@ -1,71 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.bSeachable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Columns are searchable by default",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html().match(/Camino/); }
-	);
-	
-	oTest.fnTest( 
-		"Disabling sorting on a column removes it from the global filter",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Camino");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Disabled on one column has no effect on other columns",
-		function () { oTable.fnFilter("Webkit"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Webkit"; }
-	);
-	
-	oTest.fnTest( 
-		"Disable filtering on multiple columns",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					{ "bSearchable": false },
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Webkit");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Filter on second disabled column",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.bSortable.js
+++ /dev/null
@@ -1,109 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.bSortable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"All columns are sortable by default",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Can disable sorting from one column",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Disabled column has no sorting class",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") == false; }
-	);
-	
-	oTest.fnTest( 
-		"Other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	oTest.fnTest( 
-		"Disable sorting on multiple columns - no sorting classes",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					{ "bSortable": false },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example thead th:eq(1)').hasClass("sorting") ||
-				$('#example thead th:eq(3)').hasClass("sorting")
-			return bReturn == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting on disabled column 1 has no effect",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Second sort on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Even with multiple disabled sorting columns other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.bUseRendered.js
+++ /dev/null
@@ -1,148 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.bUseRendered" );
 
-/* bUseRendered is used to alter sorting data, if false then the original data is used for
- * sorting rather than the rendered data
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				if ( mTmp == 0 ) {
-					mTmp++;
-					return "aaa";
-				} else
-					return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default for bUseRendered is true - rendered data is used for sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'aaa'; }
-	);
-	
-	oTest.fnTest( 
-		"When bUseRendered is false, original data is used for sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	
-	oTest.fnTest( 
-		"bUseRendered set to false on one columns and true (default) on two others",
-		function () {
-			mTmp = 0;
-			var mTmp2 = 0;
-			var mTmp3 = 0;
-			
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					{
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa1";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp2 == 0 ) {
-								mTmp2++;
-								return "aaa2";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{
-						"fnRender": function (a) {
-							if ( mTmp3 == 0 ) {
-								mTmp3++;
-								return "zzz3";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'aaa1'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 2nd column sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 3rd column sorting",
-		function () {
-			$('#example thead th:eq(2)').click();
-			$('#example thead th:eq(2)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').html() == 'zzz3'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 4th column sorting",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == '-'; }
-	);
-	
-	oTest.fnTest( 
-		"Multi-column rendering - 5th column sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.bVisible.js
+++ /dev/null
@@ -1,110 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.bVisible" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"All columns are visible by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"Can hide one column and it removes tfoot th column from DOM",
-		null,
-		function () { return $('#example tfoot tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnTest( 
-		"The correct tbody column has been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "Gnome" &&
-				jqNodes[2].innerHTML == "1.8" &&
-				jqNodes[3].innerHTML == "A";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Can hide multiple columns and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					{ "bVisible": false },
-					null,
-					{ "bVisible": false }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - removes tfoot th column from DOM",
-		null,
-		function () { return $('#example tfoot tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"Multiple hide - the correct tbody columns have been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "1"
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.fnRender.js
+++ /dev/null
@@ -1,182 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.fnRender" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				mTmp++;
-				return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Single column - fnRender is called once for each row",
-		null,
-		function () { return mTmp == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Confirm that fnRender passes one argument (an object) with three parameters",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( arguments.length != 1 || typeof a.iDataRow=='undefined' ||
-						 	typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender iDataColumn is row number",
-		function () {
-			var iCount = 0;
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( iCount != a.iDataRow )
-						{
-							mTmp = false;
-						}
-						iCount++;
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender iDataColumn is the column",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.iDataColumn != 1 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"fnRender aData is data array of correct size",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.aData.length != 5 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest';
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'unittest'; }
-	);
-	
-	oTest.fnTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest1';
-					} },
-					{ "fnRender": function (a) {
-						return 'unittest2';
-					} },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(0) td:eq(2)').html() == 'unittest1' &&
-				$('#example tbody tr:eq(0) td:eq(3)').html() == 'unittest2';
-			return bReturn; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.iDataSort.js
+++ /dev/null
@@ -1,90 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.iDataSort" );
 
-$(document).ready( function () {
-	/* Should know that sorting already works by default from other tests, so we can jump
-	 * right in here
-	 */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"aoColumns": [
-			null,
-			{ "iDataSort": 4 },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Sorting on first column is uneffected",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on second column is the order of the fifth",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnTest( 
-		"Reserve sorting on second column uses fifth column as well",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting on 5th column retains it's own sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Use 2nd col for sorting 5th col and via-versa - no effect on first col sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "iDataSort": 4 },
-					null,
-					null,
-					{ "iDataSort": 1 }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnTest( 
-		"2nd col sorting uses fifth col",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnTest( 
-		"2nd col sorting uses fifth col - reversed",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnTest( 
-		"5th col sorting uses 2nd col",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnTest( 
-		"5th col sorting uses 2nd col - reversed",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'Seamonkey 1.1'; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.sClass.js
+++ /dev/null
@@ -1,115 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.sClass" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"By default the test class hasn't been applied to the column (sanity!)",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					null,
-					{ "sClass": 'unittest' },
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - third row",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - last row",
-		null,
-		function () { return $('#example tbody tr:eq(9) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to other columns - 1st",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to other columns - 5th",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - seventh row - second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody tr:eq(6) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to header",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Add a class to a single column - has not applied to footer",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					{ "sClass": 'unittest2' },
-					null,
-					null,
-					{ "sClass": 'unittest1' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest2') &&
-				$('#example tbody tr:eq(8) td:eq(3)').hasClass('unittest1');
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 1",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').hasClass('unittest1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 2",
-		null,
-		function () { return $('#example tbody tr:eq(6) td:eq(4)').hasClass('unittest2') == false; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.sName.js
+++ /dev/null
@@ -1,28 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.sName" );
 
-/* This has no effect at all in DOM methods - so we just check that it has applied the name */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"aoColumns": [
-			null,
-			null,
-			null,
-			{ "sName": 'unit test' },
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Names are stored in the columns object",
-		null,
-		function () { return oSettings.aoColumns[3].sName =="unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.sTitle.js
+++ /dev/null
@@ -1,82 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.sTitle" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"If not given, then the columns titles are empty",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Browser" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Can set a single column title - and others are read from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test' },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Can set multiple column titles",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test 1' },
-					null,
-					null,
-					{ "sTitle": 'unit test 2' }
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test 1" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "unit test 2";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoColumns.sWidth.js
+++ /dev/null
@@ -1,87 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoColumns.sWidth" );
 
-/* NOTE - we need to disable the auto width for the majority of these test in order to preform 
- * these tests as the auto width will convert the width to a px value. We can do 'non-exact' tests
- * with auto width enabled however to ensure it scales columns as required
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"bAutoWidth": false,
-		"aoColumns": [
-			null,
-			{ "sWidth": '40%' },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"With auto width disabled the width for one column is appled",
-		null,
-		function () { return $('#example thead th:eq(1)')[0].style.width == "40%"; }
-	);
-	
-	oTest.fnTest( 
-		"With auto width disabled the width for one column is appled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bAutoWidth": false,
-				"aoColumns": [
-					null,
-					null,
-					{ "sWidth": '20%' },
-					{ "sWidth": '30%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn =
-				$('#example thead th:eq(2)')[0].style.width == "20%" &&
-				$('#example thead th:eq(3)')[0].style.width == "30%";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"With auto width, it will make the smallest column the largest with percentage width given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoColumns": [
-					null,
-					null,
-					null,
-					{ "sWidth": '40%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			
-			if ( a3>a0 && a3>a1 && a3>a2 && a3>a4 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/aoSearchCols.js
+++ /dev/null
@@ -1,119 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "aoSearchCols" );
 
-/* We could be here forever testing this one, so we test a limited subset on a couple of colums */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default should be to have a empty colums array",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.aoPreSearchCols[0].sSearch == 0 && !oSettings.aoPreSearchCols[0].bRegex &&
-				oSettings.aoPreSearchCols[1].sSearch == 0 && !oSettings.aoPreSearchCols[1].bRegex &&
-				oSettings.aoPreSearchCols[2].sSearch == 0 && !oSettings.aoPreSearchCols[2].bRegex &&
-				oSettings.aoPreSearchCols[3].sSearch == 0 && !oSettings.aoPreSearchCols[3].bRegex &&
-				oSettings.aoPreSearchCols[4].sSearch == 0 && !oSettings.aoPreSearchCols[4].bRegex;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Search on a single column - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1.5" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1.5"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on single column - escape regex false",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					null,
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 3 of 3 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "3.3", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Konqureror 3.3"; }
-	);
-	
-	oTest.fnTest( 
-		"Search on two columns (no records) - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "Allan", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/asStripClasses.js
+++ /dev/null
@@ -1,100 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "asStripClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Default row striping is applied",
-		null,
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Row striping on the second page",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	/* No striping */
-	oTest.fnTest( 
-		"No row striping",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"asStripClasses": []
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)')[0].className == "" &&
-			       $('#example tbody tr:eq(1)')[0].className == "" &&
-			       $('#example tbody tr:eq(2)')[0].className == "" &&
-			       $('#example tbody tr:eq(3)')[0].className == "";
-		}
-	);
-	
-	/* Custom striping */
-	oTest.fnTest( 
-		"Custom striping [2]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"asStripClasses": [ 'test1', 'test2' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test1') &&
-			       $('#example tbody tr:eq(3)').hasClass('test2');
-		}
-	);
-	
-	
-	/* long array of striping */
-	oTest.fnTest( 
-		"Custom striping [4]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"asStripClasses": [ 'test1', 'test2', 'test3', 'test4' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Custom striping is restarted on second page [2]",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bAutoWidth.js
+++ /dev/null
@@ -1,142 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bAutoWidth" );
 
-/* It's actually a little tricky to test this. We can't test absolute numbers because
- * different browsers and different platforms will render the width of the columns slightly
- * differently. However, we certainly can test the principle of what should happen (column 
- * width doesn't change over pages)
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Auto width is enabled by default",
-		null,
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	oTest.fnTest( 
-		"First column has a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style').match(/width/i); }
-	);
-	
-	/*
-	This would seem like a better test - but there appear to be difficulties with tables
-	which are bigger (calculated) than there is actually room for. I suspect this is actually
-	a bug in datatables
-	oTest.fnTest( 
-		"Check column widths on first page match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			console.log( a0, b0, a1, b1, a2, b2, a3, b3 );
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check column widths on second page match thid page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	*/
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Auto width can be disabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bAutoWidth": false
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth == false; }
-	);
-	
-	oTest.fnTest( 
-		"First column does not have a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style') == null; }
-	);
-	
-	/*
-	oTest.fnTest( 
-		"Check column widths on first page do not match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return false;
-			else
-				return true;
-		}
-	);
-	*/
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Auto width enabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bAutoWidth": true
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bFilter.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bFilter" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Filtering div exists by default",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Fltering can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bFilter": false
-			} );
-		},
-		function () { return document.getElementById('example_filter') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Filtering enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bFilter": true
-			} );
-		},
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bInfo.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Info div exists by default",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Info can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bInfo": false
-			} );
-		},
-		function () { return document.getElementById('example_info') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Info enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bInfo": true
-			} );
-		},
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bLengthChange.js
+++ /dev/null
@@ -1,75 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bLengthChange" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Length div exists by default",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnTest(
-		"Four default options",
-		null,
-		function () { return $("select[name=example_length] option").length == 4; }
-	);
-	
-	oTest.fnTest(
-		"Default options",
-		null,
-		function () {
-			var opts = $("select[name='example_length'] option");
-			return opts[0].getAttribute('value') == 10 && opts[1].getAttribute('value') == 25 &&
-				opts[2].getAttribute('value') == 50 && opts[3].getAttribute('value') == 100;
-		}
-	);
-	
-	oTest.fnTest(
-		"Info takes length into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Change length can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bLengthChange": false
-			} );
-		},
-		function () { return document.getElementById('example_length') == null; }
-	);
-	
-	oTest.fnTest(
-		"Information takes length disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Length change enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bLengthChange": true
-			} );
-		},
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bPaginate.js
+++ /dev/null
@@ -1,59 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bPaginate" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Pagiantion div exists by default",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnTest(
-		"Information div takes paging into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bPaginate": false
-			} );
-		},
-		function () { return document.getElementById('example_paginate') == null; }
-	);
-	
-	oTest.fnTest(
-		"Information div takes paging disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 57 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Pagiantion enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bPaginate": true
-			} );
-		},
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bProcessing.js
+++ /dev/null
@@ -1,103 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bProcessing" );
 
-/* It's actually a bit hard to set this one due to the fact that it will only be shown
- * when DataTables is doing some kind of processing. The server-side processing is a bit
- * better to test this than here - so we just the interal functions to enable it and check
- * that it is available
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Processing is off by default",
-		null,
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div cannot be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div cannot be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Processing can be enabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bProcessing": true
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == true; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing'); }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is hidden by default",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div can be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "visible"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div can be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Processing disabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bProcessing": false
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bServerSide.js
+++ /dev/null
@@ -1,20 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bServerSide" );
 
-/* Not interested in server-side processing here other than to check that it is off */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Server side is off by default",
-		null,
-		function () { return oSettings.oFeatures.bServerSide == false; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bSort.js
+++ /dev/null
@@ -1,99 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bSort" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Sorting is on by default",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting Asc by default class applied",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnTest(
-		"Click on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting class removed from first column",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting asc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnTest(
-		"Reverse on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting acs class removed from second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting desc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_desc"); }
-	);
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bSort": false
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Click on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Reverse on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Sorting enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bSort": true
-			} );
-		},
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/bSortClasses.js
+++ /dev/null
@@ -1,132 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "bSortClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Sorting classes are applied by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes are applied to all required cells",
-		null,
-		function () { return $('#example tbody tr:eq(7) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes are not applied to non-sorting columns",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 1",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 2",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - add column 3",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(3)')[0], { 'shift': true } );
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnTest( 
-		"Remove sorting classes on single column sort",
-		function () { 
-			$('#example thead th:eq(4)').click();
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting class 1 was added",
-		null,
-		function () { return $('#example tbody tr:eq(1) td:eq(4)').hasClass('sorting_1'); }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnTest( 
-		"Sorting classes can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bSortClasses": false
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes disabled - add column 1 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Sorting classes disabled - add column 2 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	
-	/* Enable makes no difference */
-	oTest.fnTest( 
-		"Sorting classes enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"bSortClasses": true
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/fnDrawCallback.js
+++ /dev/null
@@ -1,85 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "fnDrawCallback" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnDrawCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"One argument passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnDrawCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"fnDrawCallback": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnDrawCallback": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called once on each draw there after as well",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/fnFooterCallback.js
+++ /dev/null
@@ -1,240 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "fnFooterCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnFooterCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					nFoot.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example tfoot th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Data array has length matching original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aasData.length != 57 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array's column lengths match original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					for ( var i=0, iLen=aasData.length ; i<iLen ; i++ )
-					{
-						if ( aasData[i].length != 5 )
-						{
-							mPass = false;
-						}
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 10 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd != 10 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 20 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 57 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"fnFooterCallback": function ( nFoot, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/fnHeaderCallback.js
+++ /dev/null
@@ -1,240 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "fnHeaderCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnHeaderCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example thead th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Data array has length matching original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aasData.length != 57 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array's column lengths match original data",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					for ( var i=0, iLen=aasData.length ; i<iLen ; i++ )
-					{
-						if ( aasData[i].length != 5 )
-						{
-							mPass = false;
-						}
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 10 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd != 10 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 20 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			$('#example_next').click();
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 57 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/fnInitComplete.js
+++ /dev/null
@@ -1,83 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "fnInitComplete" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnInitComplete == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"One argument passed (for DOM!)",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnInitComplete": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"fnInitComplete": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnInitComplete called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnInitComplete": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnTest( 
-		"fnInitComplete never called there after",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/fnRowCallback.js
+++ /dev/null
@@ -1,112 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "fnRowCallback" );
 
-/* Note - fnRowCallback MUST return the first arguments (modified or not) */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnRowCallback == null; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Four arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnRowCallback": function ( nTr ) {
-					mPass = arguments.length;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	oTest.fnTest( 
-		"fnRowCallback called once for each drawn row",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					mPass++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	oTest.fnTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					$(nTr).addClass('unit_test');
-					return nTr;
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1)').hasClass('unit_test'); }
-	);
-	
-	oTest.fnTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( asData.length != 5 )
-						mPass = false;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			var iCount = 0;
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( iCount != iDrawIndex )
-						mPass = false;
-					iCount++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/iDisplayLength.js
+++ /dev/null
@@ -1,81 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "iDisplayLength" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	
-	oTest.fnTest( 
-		"Default length is ten",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 10",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 25",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"iDisplayLength": 25
-			} );
-		},
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 25; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 100",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"iDisplayLength": 100
-			} );
-		},
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 100; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Set initial length to 23 (unknown select menu length)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"iDisplayLength": 23
-			} );
-		},
-		function () { return $('#example tbody tr').length == 23; }
-	);
-	
-	oTest.fnTest( 
-		"Select menu shows 10 (since 23 is unknow)",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.oPaginate.js
+++ /dev/null
@@ -1,84 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.oPaginate" );
 
-/* Note that the paging language information only has relevence in full numbers */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"sPaginationType": "full_numbers"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "First" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Previous" &&
-				oSettings.oLanguage.oPaginate.sNext == "Next" &&
-				oSettings.oLanguage.oPaginate.sLast == "Last";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "First" &&
-				$('#example_paginate .previous').html() == "Previous" &&
-				$('#example_paginate .next').html() == "Next" &&
-				$('#example_paginate .last').html() == "Last";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"sPaginationType": "full_numbers",
-				"oLanguage": {
-					"oPaginate": {
-						"sFirst":    "unit1",
-						"sPrevious": "test2",
-						"sNext":     "unit3",
-						"sLast":     "test4"
-					}
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "unit1" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "test2" &&
-				oSettings.oLanguage.oPaginate.sNext == "unit3" &&
-				oSettings.oLanguage.oPaginate.sLast == "test4";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate definitions are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "unit1" &&
-				$('#example_paginate .previous').html() == "test2" &&
-				$('#example_paginate .next').html() == "unit3" &&
-				$('#example_paginate .last').html() == "test4";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sInfo.js
+++ /dev/null
@@ -1,117 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info language is 'Showing _START_ to _END_ of _TOTAL_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sInfo == "Showing _START_ to _END_ of _TOTAL_ entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Info language can be defined - without any macros",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfo == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _START_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit _START_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _END_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 10 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macro _TOTAL_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 57 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macros _START_ and _END_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language can be defined - with macros _START_, _END_ and _TOTAL_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 57 test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js
+++ /dev/null
@@ -1,79 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sInfoEmpty" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info empty language is 'Showing 0 to 0 of 0 entries' by default",
-		function () { oTable.fnFilter("nothinghere"); },
-		function () { return oSettings.oLanguage.sInfoEmpty == "Showing 0 to 0 of 0 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"Showing 0 to 0 of 0 entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Info empty language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfoEmpty": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return oSettings.oLanguage.sInfoEmpty == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Macro's not replaced",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfoEmpty": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit _START_ _END_ _TOTAL_ test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoPostFix.js
+++ /dev/null
@@ -1,78 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sInfoPostFix" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Info post fix language is '' (blank) by default",
-		null,
-		function () { return oSettings.oLanguage.sInfoPostFix == ""; }
-	);
-	
-	oTest.fnTest( 
-		"Width no post fix, the basic info shows",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Info post fix language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfoPostFix == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit test"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Macros have no effect in the post fix",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfoPostFix": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit _START_ _END_ _TOTAL_ test"; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Post fix is applied after fintering info",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 0 to 0 of 0 entries unit (filtered from 57 total entries) test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sLengthMenu.js
+++ /dev/null
@@ -1,106 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sLengthMenu" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Menu language is 'Show _MENU_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sLengthMenu == "Show _MENU_ entries"; }
-	);
-	
-	oTest.fnTest(
-		"_MENU_ macro is replaced by select menu in DOM",
-		null,
-		function () { return $('select', oSettings.aanFeatures.l[0]).length == 1 }
-	);
-	
-	oTest.fnTest(
-		"Default is put into DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "Show " &&
-				anChildren[2].nodeValue == " entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Menu length language can be defined - no _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sLengthMenu": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sLengthMenu == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Menu length language definition is in the DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			return anChildren[0].nodeValue == "unit test";
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Menu length language can be defined - with _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sLengthMenu": "unit _MENU_ test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "unit " &&
-				anChildren[2].nodeValue == " test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnTest( 
-		"Only the _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sLengthMenu": "_MENU_"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren.length == 1 &&
-				$('select', oSettings.aanFeatures.l[0]).length == 1;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sProcessing.js
+++ /dev/null
@@ -1,49 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sProcessing" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData,
-		"bProcessing": true
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Processing language is 'Processing...' by default",
-		null,
-		function () { return oSettings.oLanguage.sProcessing == "Processing..."; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "Processing..."; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Processing language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"bProcessing": true,
-				"oLanguage": {
-					"sProcessing": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sProcessing == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sSearch.js
+++ /dev/null
@@ -1,65 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Search language is 'Search:' by default",
-		null,
-		function () { return oSettings.oLanguage.sSearch == "Search:"; }
-	);
-	
-	oTest.fnTest( 
-		"Search language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "Search: "; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Search language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sSearch": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sSearch == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "unit test "; }
-	);
-	
-	
-	oTest.fnTest( 
-		"Blank search has a no (separator) inserted",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sSearch": ""
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return document.getElementById('example_filter').childNodes.length == 1; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sUrl.js
+++ /dev/null
@@ -1,62 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sUrl" );
 
-/* Note that we only test the internal storage of language information pulled form a file here
- * as the other language tests will check it goes into the DOM correctly
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"sUrl is blank by default",
-		null,
-		function () { return oSettings.oLanguage.sUrl == ""; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Loading of German file loads language information",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sUrl": "../../../examples/examples_support/de_DE.txt"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.sProcessing == "Bitte warten..." &&
-				oSettings.oLanguage.sLengthMenu == "_MENU_ Einträge anzeigen" &&
-				oSettings.oLanguage.sZeroRecords == "Keine Einträge vorhanden." &&
-				oSettings.oLanguage.sInfo == "_START_ bis _END_ von _TOTAL_ Einträgen" &&
-				oSettings.oLanguage.sInfoEmpty == "0 bis 0 von 0 Einträgen" &&
-				oSettings.oLanguage.sInfoFiltered == "(gefiltert von _MAX_  Einträgen)" &&
-				oSettings.oLanguage.sInfoPostFix == "" &&
-				oSettings.oLanguage.sSearch == "Suchen" &&
-				oSettings.oLanguage.oPaginate.sFirst == "Erster" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Zurück" &&
-				oSettings.oLanguage.oPaginate.sNext == "Nächster" &&
-				oSettings.oLanguage.oPaginate.sLast == "Letzter";
-				
-			return bReturn;
-		}
-	);
-	
-	/* One DOM check just to ensure that they go into the DOM */
-	oTest.fnTest(
-		"Loaded language goes into the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "1 bis 10 von 57 Einträgen"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oLanguage.sZeroRecords.js
+++ /dev/null
@@ -1,48 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oLanguage.sZeroRecords" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Zero records language is 'No matching records found' by default",
-		null,
-		function () { return oSettings.oLanguage.sZeroRecords == "No matching records found"; }
-	);
-	
-	oTest.fnTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "No matching records found" }
-	);
-	
-	
-	
-	oTest.fnTest( 
-		"Zero records language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oLanguage": {
-					"sZeroRecords": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sZeroRecords == "unit test"; }
-	);
-	
-	oTest.fnTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere2'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "unit test" }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/oSearch.js
+++ /dev/null
@@ -1,108 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "oSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default values should be blank",
-		null,
-		function () {
-			var bReturn = oSettings.oPreviousSearch.sSearch == "" && 
-			              !oSettings.oPreviousSearch.bRegex;
-			return bReturn;
-		}
-	);
-	
-	/* This test might be considered iffy since the full object isn't given, but it's reasonable to
-	 * expect DataTables to cope with this. It should just assumine regex false
-	 */
-	oTest.fnTest( 
-		"Search term only in object",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"oSearch": {
-					"sSearch": "Mozilla"
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest( 
-		"New search will kill old one",
-		function () {
-			oTable.fnFilter("Opera");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnTest( 
-		"Search plain text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oSearch": {
-					"sSearch": "DS",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Nintendo DS browser"; }
-	);
-	
-	oTest.fnTest( 
-		"Search plain text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oSearch": {
-					"sSearch": "Opera",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnTest( 
-		"Search regex text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnTest( 
-		"Search regex text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/sAjaxSource.js
+++ /dev/null
@@ -1,20 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "sAjaxSource" );
 
-/* Not interested in ajax source here other than to check it's default */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Server side is off by default",
-		null,
-		function () { return oSettings.sAjaxSource == null; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/sDom.js
+++ /dev/null
@@ -1,262 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "sDom" );
 
-/* This is going to be brutal on the browser! There is a lot that can be tested here... */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Default DOM varaible",
-		null,
-		function () { return oSettings.sDom == "lfrtip"; }
-	);
-	
-	oTest.fnTest( 
-		"Default DOM in document",
-		null,
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check example 1 in code propagates",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": '<"wrapper"flipt>'
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sDom == '<"wrapper"flipt>'; }
-	);
-	
-	oTest.fnTest( 
-		"Check example 1 in DOM",
-		null,
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			var nCustomWrapper = $('div.wrapper')[0];
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrapper &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nLength &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging &&
-				nNodes[6] == nTable;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check example 2 in DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": '<lf<t>ip>'
-			} );
-		},
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			var nCustomWrappers = []
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-				
-				/* Only the two custom divs don't have class names */
-				if ( !jqNodes[i].getAttribute('class') )
-				{
-					nCustomWrappers.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrappers[0] &&
-				nNodes[2] == nLength &&
-				nNodes[3] == nFilter &&
-				nNodes[4] == nCustomWrappers[1] &&
-				nNodes[5] == nTable &&
-				nNodes[6] == nInfo &&
-				nNodes[7] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no length element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": 'frtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				null == nLength &&
-				nNodes[1] == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no filter element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": 'lrtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				null == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	/* Note we don't test for no table as this is not supported (and it would be fairly daft! */
-	
-	oTest.fnTest( 
-		"Check no info element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": 'lfrtp'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				null == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"Check no paging element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"aaData": gaaData,
-				"sDom": 'lfrti'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				null == nPaging;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/2_js/sPaginationType.js
+++ /dev/null
@@ -1,125 +1,1 @@
-// DATA_TEMPLATE: js_data
-oTest.fnStart( "sPaginationType" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"aaData": gaaData
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"Check two button paging is the default",
-		null,
-		function () { return oSettings.sPaginationType == "two_button"; }
-	);
-	
-	oTest.fnTest( 
-		"Check class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_two_button'); }
-	);
-	
-	oTest.fnTest( 
-		"Two div elements are in the wrapper",
-		null,
-		function () { return $('#example_paginate div').length == 2; }
-	);
-	
-	oTest.fnTest( 
-		"We have the previous button",
-		null,
-		function () { return document.getElementById('example_previous'); }
-	);
-	
-	oTest.fnTest( 
-		"We have the next button",
-		null,
-		function () { return document.getElementById('example_next'); }
-	);
-	
-	oTest.fnTest( 
-		"Previous button is disabled",
-		null,
-		function () { return $('#example_previous').hasClass('paginate_disabled_previous'); }
-	);
-	
-	oTest.fnTest( 
-		"Next button is enabled",
-		null,
-		function () { return $('#example_next').hasClass('paginate_enabled_next'); }
-	);
-	
-	/* Don't test paging - that's done by the zero config test script. */
-	
-	
-	/* Two buttons paging */
-	oTest.fnTest( 
-		"Can enabled full numbers paging",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"aaData": gaaData,
-				"sPaginationType": "full_numbers"
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sPaginationType == "full_numbers"; }
-	);
-	
-	oTest.fnTest( 
-		"Check full numbers class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_full_numbers'); }
-	);
-	
-	
-	var nFirst, nPrevious, nNext, nLast;
-	oTest.fnTest( 
-		"Jump to last page",
-		function () {
-			nFirst = $('div.dataTables_paginate span.first');
-			nPrevious = $('div.dataTables_paginate span.previous');
-			nNext = $('div.dataTables_paginate span.next');
-			nLast = $('div.dataTables_paginate span.last');
-			nLast.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Go to two pages previous",
-		function () {
-			nPrevious.click();
-			nPrevious.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 31 to 40 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Next (second last) page",
-		function () {
-			nNext.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 41 to 50 of 57 entries";
-		}
-	);
-	
-	oTest.fnTest( 
-		"Jump to first page",
-		function () {
-			nFirst.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries";
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/_zero_config.js
+++ /dev/null
@@ -1,440 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "Sanity checks for DataTables with data from JS" );
 
-oTest.fnTest( 
-	"jQuery.dataTable function",
-	null,
-	function () { return typeof jQuery().dataTable == "function"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableSettings storage array",
-	null,
-	function () { return typeof jQuery().dataTableSettings == "object"; }
-);
-
-oTest.fnTest(
-	"jQuery.dataTableExt plugin object",
-	null,
-	function () { return typeof jQuery().dataTableExt == "object"; }
-);
-
-$(document).ready( function () {
-	var oInit = {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	};
-	$('#example').dataTable( oInit );
-	
-	/* Basic checks */
-	oTest.fnWaitTest( 
-		"Length changing div exists",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Filtering div exists",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Information div exists",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Pagination div exists",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnTest( 
-		"Processing div is off by default",
-		null,
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"10 rows shown on the first page",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Initial sort occured",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	/* Need to use the WaitTest for sorting due to the setTimeout datatables uses */
-	oTest.fnTest( 
-		"Sorting (first click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (third click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (first click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting (second click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column (first click)",
-		function () { 
-			$('#example thead th:eq(0)').click();
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () { var b = 
-			$('#example tbody td:eq(0)').html() == "Gecko" && 
-			$('#example tbody td:eq(1)').html() == "Camino 1.0"; return b; }
-	);
-	
-	oTest.fnTest( 
-		"Sorting multi-column - sorting second column only",
-		function () { 
-			$('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Basic paging */
-	oTest.fnTest( 
-		"Paging to second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "IE Mobile"; }
-	);
-	
-	oTest.fnTest( 
-		"Paging to first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnTest( 
-		"Attempting to page back beyond the first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	/* Changing length */
-	oTest.fnTest( 
-		"Changing table length to 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 50 records",
-		function () { $("select[name=example_length]").val('50').change(); },
-		function () { return $('#example tbody tr').length == 50; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 100 records",
-		function () { $("select[name=example_length]").val('100').change(); },
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnTest( 
-		"Changing table length to 10 records",
-		function () { $("select[name=example_length]").val('10').change(); },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	/*
-	 * Information element
-	 */
-	oTest.fnTest(
-		"Information on zero config",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on third page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information on last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back on first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 25 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 25 records - second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 26 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with 100 records - first page",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('100').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information back to 10 records",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('10').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 31 to 31 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' back to first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - second time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter increased to 'Win 98'",
-		function () { $('#example_filter input').val("Win 98").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter decreased to 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter 'Win' second page - third time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Information with filter removed",
-		function () { $('#example_filter input').val("").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	/*
-	 * Filtering
-	 */
-	oTest.fnWaitTest(
-		"Filter 'W' - rows",
-		function () { 
-			/* Reset the table such that the old sorting doesn't mess things up */
-			oSession.fnRestore();
-			$('#example').dataTable( oInit );
-			$('#example_filter input').val("W").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'W' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 42 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Wi'",
-		function () { $('#example_filter input').val("Wi").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 32 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "AOL browser (AOL desktop)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting column 1 reverse",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - maintaing reverse sorting col 1",
-		function () { $('#example_filter input').val("Win XP").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win XP' - sorting col 3 - reversed",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "7"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'Win' - sorting col 3 - reversed info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 6 of 6 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere'",
-		function () { $('#example_filter input').val("nothinghere").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 
-			"No matching records found"; }
-	);
-	
-	oTest.fnTest(
-		"Filter 'nothinghere' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Filter back to blank and 1st column sorting",
-		function () {
-			$('#example_filter input').val("").keyup();
-			$('#example thead th:eq(0)').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry",
-		function () {
-			$('#example_filter input').val("Win").keyup();
-			$('#example_filter input').val("GeckoWin").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest(
-		"Prefixing a filter entry with space",
-		function () {
-			$('#example_filter input').val("Gecko Win").keyup();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 17 entries (filtered from 57 total entries)"; }
-	);
-	
-	
-	
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aaSorting.js
+++ /dev/null
@@ -1,198 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aaSorting" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default sorting is single column",
-		null,
-		function () {
-			return oSettings.aaSorting.length == 1 && typeof oSettings.aaSorting[0] == 'object';
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Default sorting is first column asc",
-		null,
-		function () {
-			return oSettings.aaSorting[0].length == 3 && oSettings.aaSorting[0][0] == 0 &&
-				oSettings.aaSorting[0][1] == 'asc';
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting is applied",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single string column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single string column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single int column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single int column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','asc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','desc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "iPod Touch / iPhone"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','desc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Safari 3.0"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','asc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','asc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1.9"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','desc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "125.5"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','desc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (3 column) - string asc / int asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSorting": [['0','asc'], ['3','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(7) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aaSortingFixed.js
+++ /dev/null
@@ -1,67 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aaSortingFixed" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"No fixed sorting by default",
-		null,
-		function () {
-			return oSettings.aaSortingFixed == null;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSortingFixed": [['0','asc']],
-				"fnInitComplete": function () {
-					$('#example thead th:eq(1)').click();
-				}
-			} );
-			//
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aaSortingFixed": [['3','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "PSP browser"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.bSearchable.js
+++ /dev/null
@@ -1,76 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bSeachable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Columns are searchable by default",
-		function () { oTable.fnFilter("Camino"); },
-		function () {
-			if ( $('#example tbody tr:eq(0) td:eq(1)')[0] )
-				return $('#example tbody tr:eq(0) td:eq(1)').html().match(/Camino/);
-			else
-				return null;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Disabling sorting on a column removes it from the global filter",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Camino");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disabled on one column has no effect on other columns",
-		function () { oTable.fnFilter("Webkit"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Webkit"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disable filtering on multiple columns",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					{ "bSearchable": false },
-					{ "bSearchable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("Webkit");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Filter on second disabled column",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.bSortable.js
+++ /dev/null
@@ -1,109 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bSortable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"All columns are sortable by default",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can disable sorting from one column",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disabled column has no sorting class",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disable sorting on multiple columns - no sorting classes",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					{ "bSortable": false },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example thead th:eq(1)').hasClass("sorting") ||
-				$('#example thead th:eq(3)').hasClass("sorting")
-			return bReturn == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on disabled column 1 has no effect",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() != "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Second sort on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() != "-"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Even with multiple disabled sorting columns other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == "X"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.bUseRendered.js
+++ /dev/null
@@ -1,148 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bUseRendered" );
 
-/* bUseRendered is used to alter sorting data, if false then the original data is used for
- * sorting rather than the rendered data
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				if ( mTmp == 0 ) {
-					mTmp++;
-					return "aaa";
-				} else
-					return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default for bUseRendered is true - rendered data is used for sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'aaa'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"When bUseRendered is false, original data is used for sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"bUseRendered set to false on one columns and true (default) on two others",
-		function () {
-			mTmp = 0;
-			var mTmp2 = 0;
-			var mTmp3 = 0;
-			
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					{
-						"fnRender": function (a) {
-							if ( mTmp == 0 ) {
-								mTmp++;
-								return "aaa1";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{ 
-						"bUseRendered": false,
-						"fnRender": function (a) {
-							if ( mTmp2 == 0 ) {
-								mTmp2++;
-								return "aaa2";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					{
-						"fnRender": function (a) {
-							if ( mTmp3 == 0 ) {
-								mTmp3++;
-								return "zzz3";
-							} else {
-								return a.aData[a.iDataColumn];
-							}
-						}
-					},
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'aaa1'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column rendering - 2nd column sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column rendering - 3rd column sorting",
-		function () {
-			$('#example thead th:eq(2)').click();
-			$('#example thead th:eq(2)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').html() == 'zzz3'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column rendering - 4th column sorting",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == '-'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column rendering - 5th column sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.bVisible.js
+++ /dev/null
@@ -1,124 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bVisible" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"All columns are visible by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can hide one column and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 4; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can hide one column and it removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnWaitTest( 
-		"The correct thead column has been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Platform(s)" &&
-				jqNodes[2].innerHTML == "Engine version" &&
-				jqNodes[3].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"The correct tbody column has been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "Gnome" &&
-				jqNodes[2].innerHTML == "1.8" &&
-				jqNodes[3].innerHTML == "A";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Can hide multiple columns and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					{ "bVisible": false },
-					null,
-					{ "bVisible": false }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - the correct thead columns have been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Engine version"
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - the correct tbody columns have been hidden",
-		function () {
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } );
-		},
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "1"
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js
+++ /dev/null
@@ -1,182 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.fnRender" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				mTmp++;
-				return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Single column - fnRender is called once for each row",
-		null,
-		function () { return mTmp == 57; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Confirm that fnRender passes one argument (an object) with three parameters",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( arguments.length != 1 || typeof a.iDataRow=='undefined' ||
-						 	typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender iDataColumn is row number",
-		function () {
-			var iCount = 0;
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( iCount != a.iDataRow )
-						{
-							mTmp = false;
-						}
-						iCount++;
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender iDataColumn is the column",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.iDataColumn != 1 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender aData is data array of correct size",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.aData.length != 5 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest';
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'unittest'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest1';
-					} },
-					{ "fnRender": function (a) {
-						return 'unittest2';
-					} },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(0) td:eq(2)').html() == 'unittest1' &&
-				$('#example tbody tr:eq(0) td:eq(3)').html() == 'unittest2';
-			return bReturn; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.iDataSort.js
+++ /dev/null
@@ -1,90 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.iDataSort" );
 
-$(document).ready( function () {
-	/* Should know that sorting already works by default from other tests, so we can jump
-	 * right in here
-	 */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"aoColumns": [
-			null,
-			{ "iDataSort": 4 },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Sorting on first column is uneffected",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on second column is the order of the fifth",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Reserve sorting on second column uses fifth column as well",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on 5th column retains it's own sorting",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Use 2nd col for sorting 5th col and via-versa - no effect on first col sorting",
-		function () {
-			mTmp = 0;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "iDataSort": 4 },
-					null,
-					null,
-					{ "iDataSort": 1 }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 'Gecko'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"2nd col sorting uses fifth col",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'A'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"2nd col sorting uses fifth col - reversed",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').html() == 'X'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"5th col sorting uses 2nd col",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'All others'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"5th col sorting uses 2nd col - reversed",
-		function () { $('#example thead th:eq(4)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'Seamonkey 1.1'; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.sClass.js
+++ /dev/null
@@ -1,115 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sClass" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"By default the test class hasn't been applied to the column (sanity!)",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					null,
-					{ "sClass": 'unittest' },
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - third row",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - last row",
-		null,
-		function () { return $('#example tbody tr:eq(9) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to other columns - 1st",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to other columns - 5th",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - seventh row - second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody tr:eq(6) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to header",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to footer",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					{ "sClass": 'unittest2' },
-					null,
-					null,
-					{ "sClass": 'unittest1' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest2') &&
-				$('#example tbody tr:eq(8) td:eq(3)').hasClass('unittest1');
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 1",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').hasClass('unittest1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 2",
-		null,
-		function () { return $('#example tbody tr:eq(6) td:eq(4)').hasClass('unittest2') == false; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.sName.js
+++ /dev/null
@@ -1,28 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sName" );
 
-/* This has no effect at all in DOM methods - so we just check that it has applied the name */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"aoColumns": [
-			null,
-			null,
-			null,
-			{ "sName": 'unit test' },
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Names are stored in the columns object",
-		null,
-		function () { return oSettings.aoColumns[3].sName =="unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.sTitle.js
+++ /dev/null
@@ -1,82 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sTitle" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"If not given, then the columns titles are empty",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Browser" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Can set a single column title - and others are read from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test' },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Can set multiple column titles",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test 1' },
-					null,
-					null,
-					{ "sTitle": 'unit test 2' }
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test 1" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "unit test 2";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.sWidth.js
+++ /dev/null
@@ -1,87 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sWidth" );
 
-/* NOTE - we need to disable the auto width for the majority of these test in order to preform 
- * these tests as the auto width will convert the width to a px value. We can do 'non-exact' tests
- * with auto width enabled however to ensure it scales columns as required
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"bAutoWidth": false,
-		"aoColumns": [
-			null,
-			{ "sWidth": '40%' },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"With auto width disabled the width for one column is appled",
-		null,
-		function () { return $('#example thead th:eq(1)')[0].style.width == "40%"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"With auto width disabled the width for one column is appled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bAutoWidth": false,
-				"aoColumns": [
-					null,
-					null,
-					{ "sWidth": '20%' },
-					{ "sWidth": '30%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn =
-				$('#example thead th:eq(2)')[0].style.width == "20%" &&
-				$('#example thead th:eq(3)')[0].style.width == "30%";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"With auto width, it will make the smallest column the largest with percentage width given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoColumns": [
-					null,
-					null,
-					null,
-					{ "sWidth": '40%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			
-			if ( a3>a0 && a3>a1 && a3>a2 && a3>a4 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/aoSearchCols.js
+++ /dev/null
@@ -1,119 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoSearchCols" );
 
-/* We could be here forever testing this one, so we test a limited subset on a couple of colums */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default should be to have a empty colums array",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.aoPreSearchCols[0].sSearch == 0 && !oSettings.aoPreSearchCols[0].bRegex &&
-				oSettings.aoPreSearchCols[1].sSearch == 0 && !oSettings.aoPreSearchCols[1].bRegex &&
-				oSettings.aoPreSearchCols[2].sSearch == 0 && !oSettings.aoPreSearchCols[2].bRegex &&
-				oSettings.aoPreSearchCols[3].sSearch == 0 && !oSettings.aoPreSearchCols[3].bRegex &&
-				oSettings.aoPreSearchCols[4].sSearch == 0 && !oSettings.aoPreSearchCols[4].bRegex;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Search on a single column - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search on two columns - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1.5" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1.5"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search on single column - escape regex false",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					null,
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example_info').html() == "Showing 1 to 3 of 3 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search on two columns - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "3.3", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Konqureror 3.3"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search on two columns (no records) - escape regex false on first, true on second",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"aoSearchCols": [
-					{ "sSearch": ".*ML", "bEscapeRegex": false },
-					{ "sSearch": "Allan", "bEscapeRegex": true },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/asStripClasses.js
+++ /dev/null
@@ -1,105 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "asStripClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Default row striping is applied",
-		null,
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Row striping on the second page",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	/* No striping */
-	oTest.fnWaitTest( 
-		"No row striping",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"asStripClasses": []
-			} );
-		},
-		function () {
-			if ( typeof $('#example tbody tr:eq(1)')[0] == 'undefined' )
-			{
-				/* Use the 'wait for' to allow this to become true */
-				return false;
-			}
-			return $('#example tbody tr:eq(0)')[0].className == "" &&
-			       $('#example tbody tr:eq(1)')[0].className == "" &&
-			       $('#example tbody tr:eq(2)')[0].className == "" &&
-			       $('#example tbody tr:eq(3)')[0].className == "";
-		}
-	);
-	
-	/* Custom striping */
-	oTest.fnWaitTest( 
-		"Custom striping [2]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"asStripClasses": [ 'test1', 'test2' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test1') &&
-			       $('#example tbody tr:eq(3)').hasClass('test2');
-		}
-	);
-	
-	
-	/* long array of striping */
-	oTest.fnWaitTest( 
-		"Custom striping [4]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"asStripClasses": [ 'test1', 'test2', 'test3', 'test4' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Custom striping is restarted on second page [2]",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bAutoWidth.js
+++ /dev/null
@@ -1,142 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bAutoWidth" );
 
-/* It's actually a little tricky to test this. We can't test absolute numbers because
- * different browsers and different platforms will render the width of the columns slightly
- * differently. However, we certainly can test the principle of what should happen (column 
- * width doesn't change over pages)
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Auto width is enabled by default",
-		null,
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	oTest.fnWaitTest( 
-		"First column has a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style').match(/width/i); }
-	);
-	
-	/*
-	This would seem like a better test - but there appear to be difficulties with tables
-	which are bigger (calculated) than there is actually room for. I suspect this is actually
-	a bug in datatables
-	oTest.fnWaitTest( 
-		"Check column widths on first page match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			console.log( a0, b0, a1, b1, a2, b2, a3, b3 );
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check column widths on second page match thid page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	*/
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Auto width can be disabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bAutoWidth": false
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"First column does not have a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style') == null; }
-	);
-	
-	/*
-	oTest.fnWaitTest( 
-		"Check column widths on first page do not match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return false;
-			else
-				return true;
-		}
-	);
-	*/
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Auto width enabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bAutoWidth": true
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bFilter.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bFilter" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Filtering div exists by default",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Fltering can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bFilter": false
-			} );
-		},
-		function () { return document.getElementById('example_filter') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Filtering enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bFilter": true
-			} );
-		},
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bInfo.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Info div exists by default",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Info can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bInfo": false
-			} );
-		},
-		function () { return document.getElementById('example_info') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Info enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bInfo": true
-			} );
-		},
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bLengthChange.js
+++ /dev/null
@@ -1,75 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bLengthChange" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Length div exists by default",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Four default options",
-		null,
-		function () { return $("select[name=example_length] option").length == 4; }
-	);
-	
-	oTest.fnWaitTest(
-		"Default options",
-		null,
-		function () {
-			var opts = $("select[name='example_length'] option");
-			return opts[0].getAttribute('value') == 10 && opts[1].getAttribute('value') == 25 &&
-				opts[2].getAttribute('value') == 50 && opts[3].getAttribute('value') == 100;
-		}
-	);
-	
-	oTest.fnWaitTest(
-		"Info takes length into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Change length can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bLengthChange": false
-			} );
-		},
-		function () { return document.getElementById('example_length') == null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information takes length disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Length change enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bLengthChange": true
-			} );
-		},
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bPaginate.js
+++ /dev/null
@@ -1,59 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bPaginate" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Pagiantion div exists by default",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information div takes paging into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bPaginate": false
-			} );
-		},
-		function () { return document.getElementById('example_paginate') == null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information div takes paging disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 57 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Pagiantion enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bPaginate": true
-			} );
-		},
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bProcessing.js
+++ /dev/null
@@ -1,103 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bProcessing" );
 
-/* It's actually a bit hard to set this one due to the fact that it will only be shown
- * when DataTables is doing some kind of processing. The server-side processing is a bit
- * better to test this than here - so we just the interal functions to enable it and check
- * that it is available
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Processing is off by default",
-		null,
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div cannot be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div cannot be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Processing can be enabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bProcessing": true
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is hidden by default",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div can be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "visible"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div can be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Processing disabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bProcessing": false
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bServerSide.js
+++ /dev/null
@@ -1,20 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bServerSide" );
 
-/* Not interested in server-side processing here other than to check that it is off */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Server side is off by default",
-		null,
-		function () { return oSettings.oFeatures.bServerSide == false; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bSort.js
+++ /dev/null
@@ -1,99 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bSort" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Sorting is on by default",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting Asc by default class applied",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnWaitTest(
-		"Click on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting class removed from first column",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting asc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnWaitTest(
-		"Reverse on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting acs class removed from second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting desc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_desc"); }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bSort": false
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Click on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Reverse on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Sorting enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bSort": true
-			} );
-		},
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/bSortClasses.js
+++ /dev/null
@@ -1,132 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bSortClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are applied by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are applied to all required cells",
-		null,
-		function () { return $('#example tbody tr:eq(7) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are not applied to non-sorting columns",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 1",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 2",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 3",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(3)')[0], { 'shift': true } );
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Remove sorting classes on single column sort",
-		function () { 
-			$('#example thead th:eq(4)').click();
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting class 1 was added",
-		null,
-		function () { return $('#example tbody tr:eq(1) td:eq(4)').hasClass('sorting_1'); }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Sorting classes can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bSortClasses": false
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes disabled - add column 1 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes disabled - add column 2 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Sorting classes enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bSortClasses": true
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/fnDrawCallback.js
+++ /dev/null
@@ -1,98 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnDrawCallback" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass, bInit;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnDrawCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"One argument passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			bInit = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnDrawCallback": function ( ) {
-					mPass = arguments.length;
-				},
-				"fnInitComplete": function () {
-					bInit = true;
-				}
-			} );
-		},
-		function () { return mPass == 1 && bInit; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			bInit = false;
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnDrawCallback": function ( oSettings ) {
-					mPass = oSettings;
-				},
-				"fnInitComplete": function () {
-					bInit = true;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass && bInit; }
-	);
-	
-	
-	/* The draw callback is called once for the init and then when the data is added */
-	oTest.fnWaitTest( 
-		"fnRowCallback called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			bInit = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnDrawCallback": function ( ) {
-					mPass++;
-				},
-				"fnInitComplete": function () {
-					bInit = true;
-				}
-			} );
-		},
-		function () { return mPass == 2 && bInit; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once on each draw there after as well",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/fnHeaderCallback.js
+++ /dev/null
@@ -1,191 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnHeaderCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass, bInit;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnHeaderCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			bInit = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( ) {
-					mPass = arguments.length;
-				},
-				"fnInitComplete": function () {
-					bInit = true;
-				}
-			} );
-		},
-		function () { return mPass == 5 && bInit; }
-	);
-	
-	
-	/* The header callback is called once for the init and then when the data is added */
-	oTest.fnWaitTest( 
-		"fnHeaderCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			bInit = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				},
-				"fnInitComplete": function () {
-					bInit = true;
-				}
-			} );
-		},
-		function () { return mPass == 2 && bInit; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 3; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example thead th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 10 )
-					{
-						mPass = true;
-					}
-				},
-				"fnInitComplete": function () {
-					$('#example_next').click();
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 20 )
-					{
-						mPass = true;
-					}
-				},
-				"fnInitComplete": function () {
-					$('#example_next').click();
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 57 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnWaitTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/fnInitComplete.js
+++ /dev/null
@@ -1,100 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnInitComplete" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnInitComplete == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Two arguments passed (for Ajax!)",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnInitComplete": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnInitComplete": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnInitComplete called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnInitComplete": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnInitComplete never called there after",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"10 rows in the table on complete",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnInitComplete": function ( ) {
-					mPass = $('#example tbody tr').length;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/fnRowCallback.js
+++ /dev/null
@@ -1,112 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnRowCallback" );
 
-/* Note - fnRowCallback MUST return the first arguments (modified or not) */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnRowCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Four arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnRowCallback": function ( nTr ) {
-					mPass = arguments.length;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once for each drawn row",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					mPass++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					$(nTr).addClass('unit_test');
-					return nTr;
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1)').hasClass('unit_test'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( asData.length != 5 )
-						mPass = false;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			var iCount = 0;
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( iCount != iDrawIndex )
-						mPass = false;
-					iCount++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/fnServerData.js
+++ /dev/null
@@ -1,64 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnServerData for Ajax sourced data" );
 
-$(document).ready( function () {
-	var mPass;
-	
-	oTest.fnTest( 
-		"Argument length",
-		function () {
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnServerData": function () {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 3; }
-	);
-	
-	oTest.fnTest( 
-		"Url",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnServerData": function (sUrl, aoData, fnCallback) {
-					mPass = sUrl == "../../../examples/examples_support/json_source.txt";
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Data array",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnServerData": function (sUrl, aoData, fnCallback) {
-					mPass = aoData.length==0;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnTest( 
-		"Callback function",
-		function () {
-			$('#example').dataTable( {
-				"bDestroy": true,
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"fnServerData": function (sUrl, aoData, fnCallback) {
-					mPass = typeof fnCallback == 'function';
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/iDisplayLength.js
+++ /dev/null
@@ -1,81 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "iDisplayLength" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Default length is ten",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 10",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 25",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"iDisplayLength": 25
-			} );
-		},
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 25; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 100",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"iDisplayLength": 100
-			} );
-		},
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 100; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 23 (unknown select menu length)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"iDisplayLength": 23
-			} );
-		},
-		function () { return $('#example tbody tr').length == 23; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 10 (since 23 is unknow)",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.oPaginate.js
+++ /dev/null
@@ -1,84 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.oPaginate" );
 
-/* Note that the paging language information only has relevence in full numbers */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"sPaginationType": "full_numbers"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"oLanguage.oPaginate defaults",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "First" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Previous" &&
-				oSettings.oLanguage.oPaginate.sNext == "Next" &&
-				oSettings.oLanguage.oPaginate.sLast == "Last";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "First" &&
-				$('#example_paginate .previous').html() == "Previous" &&
-				$('#example_paginate .next').html() == "Next" &&
-				$('#example_paginate .last').html() == "Last";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"oLanguage.oPaginate can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sPaginationType": "full_numbers",
-				"oLanguage": {
-					"oPaginate": {
-						"sFirst":    "unit1",
-						"sPrevious": "test2",
-						"sNext":     "unit3",
-						"sLast":     "test4"
-					}
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "unit1" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "test2" &&
-				oSettings.oLanguage.oPaginate.sNext == "unit3" &&
-				oSettings.oLanguage.oPaginate.sLast == "test4";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate definitions are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "unit1" &&
-				$('#example_paginate .previous').html() == "test2" &&
-				$('#example_paginate .next').html() == "unit3" &&
-				$('#example_paginate .last').html() == "test4";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfo.js
+++ /dev/null
@@ -1,117 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info language is 'Showing _START_ to _END_ of _TOTAL_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sInfo == "Showing _START_ to _END_ of _TOTAL_ entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - without any macros",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfo == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "unit test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _START_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit _START_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _END_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 10 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _TOTAL_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 57 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macros _START_ and _END_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macros _START_, _END_ and _TOTAL_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 57 test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js
+++ /dev/null
@@ -1,79 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfoEmpty" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info empty language is 'Showing 0 to 0 of 0 entries' by default",
-		function () { oTable.fnFilter("nothinghere"); },
-		function () { return oSettings.oLanguage.sInfoEmpty == "Showing 0 to 0 of 0 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"Showing 0 to 0 of 0 entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info empty language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfoEmpty": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return oSettings.oLanguage.sInfoEmpty == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Macro's not replaced",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfoEmpty": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit _START_ _END_ _TOTAL_ test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoPostFix.js
+++ /dev/null
@@ -1,78 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfoPostFix" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info post fix language is '' (blank) by default",
-		null,
-		function () { return oSettings.oLanguage.sInfoPostFix == ""; }
-	);
-	
-	oTest.fnTest( 
-		"Width no post fix, the basic info shows",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info post fix language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfoPostFix == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit test"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Macros have no effect in the post fix",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfoPostFix": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit _START_ _END_ _TOTAL_ test"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Post fix is applied after fintering info",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 0 to 0 of 0 entries unit (filtered from 57 total entries) test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sLengthMenu.js
+++ /dev/null
@@ -1,106 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sLengthMenu" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Menu language is 'Show _MENU_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sLengthMenu == "Show _MENU_ entries"; }
-	);
-	
-	oTest.fnTest(
-		"_MENU_ macro is replaced by select menu in DOM",
-		null,
-		function () { return $('select', oSettings.aanFeatures.l[0]).length == 1 }
-	);
-	
-	oTest.fnTest(
-		"Default is put into DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "Show " &&
-				anChildren[2].nodeValue == " entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Menu length language can be defined - no _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sLengthMenu": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sLengthMenu == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Menu length language definition is in the DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			return anChildren[0].nodeValue == "unit test";
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Menu length language can be defined - with _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sLengthMenu": "unit _MENU_ test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "unit " &&
-				anChildren[2].nodeValue == " test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Only the _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sLengthMenu": "_MENU_"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren.length == 1 &&
-				$('select', oSettings.aanFeatures.l[0]).length == 1;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sProcessing.js
+++ /dev/null
@@ -1,49 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sProcessing" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-		"bProcessing": true
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Processing language is 'Processing...' by default",
-		null,
-		function () { return oSettings.oLanguage.sProcessing == "Processing..."; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "Processing..."; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Processing language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"bProcessing": true,
-				"oLanguage": {
-					"sProcessing": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sProcessing == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sSearch.js
+++ /dev/null
@@ -1,65 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Search language is 'Search:' by default",
-		null,
-		function () { return oSettings.oLanguage.sSearch == "Search:"; }
-	);
-	
-	oTest.fnTest( 
-		"Search language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "Search: "; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Search language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sSearch": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sSearch == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "unit test "; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Blank search has a no space (separator) inserted",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sSearch": ""
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return document.getElementById('example_filter').childNodes.length == 1; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sUrl.js
+++ /dev/null
@@ -1,62 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sUrl" );
 
-/* Note that we only test the internal storage of language information pulled form a file here
- * as the other language tests will check it goes into the DOM correctly
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"sUrl is blank by default",
-		null,
-		function () { return oSettings.oLanguage.sUrl == ""; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Loading of German file loads language information",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sUrl": "../../../examples/examples_support/de_DE.txt"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.sProcessing == "Bitte warten..." &&
-				oSettings.oLanguage.sLengthMenu == "_MENU_ Einträge anzeigen" &&
-				oSettings.oLanguage.sZeroRecords == "Keine Einträge vorhanden." &&
-				oSettings.oLanguage.sInfo == "_START_ bis _END_ von _TOTAL_ Einträgen" &&
-				oSettings.oLanguage.sInfoEmpty == "0 bis 0 von 0 Einträgen" &&
-				oSettings.oLanguage.sInfoFiltered == "(gefiltert von _MAX_  Einträgen)" &&
-				oSettings.oLanguage.sInfoPostFix == "" &&
-				oSettings.oLanguage.sSearch == "Suchen" &&
-				oSettings.oLanguage.oPaginate.sFirst == "Erster" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Zurück" &&
-				oSettings.oLanguage.oPaginate.sNext == "Nächster" &&
-				oSettings.oLanguage.oPaginate.sLast == "Letzter";
-				
-			return bReturn;
-		}
-	);
-	
-	/* One DOM check just to ensure that they go into the DOM */
-	oTest.fnTest(
-		"Loaded language goes into the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "1 bis 10 von 57 Einträgen"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sZeroRecords.js
+++ /dev/null
@@ -1,48 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sZeroRecords" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Zero records language is 'No matching records found' by default",
-		null,
-		function () { return oSettings.oLanguage.sZeroRecords == "No matching records found"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "No matching records found" }
-	);
-	
-	
-	
-	oTest.fnWaitTest( 
-		"Zero records language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oLanguage": {
-					"sZeroRecords": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sZeroRecords == "unit test"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere2'); },
-		function () { return $('#example tbody tr td')[0].innerHTML == "unit test" }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/oSearch.js
+++ /dev/null
@@ -1,108 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default values should be blank",
-		null,
-		function () {
-			var bReturn = oSettings.oPreviousSearch.sSearch == "" && 
-			              !oSettings.oPreviousSearch.bRegex;
-			return bReturn;
-		}
-	);
-	
-	/* This test might be considered iffy since the full object isn't given, but it's reasonable to
-	 * expect DataTables to cope with this. It should just assumine regex false
-	 */
-	oTest.fnWaitTest( 
-		"Search term only in object",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oSearch": {
-					"sSearch": "Mozilla"
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"New search will kill old one",
-		function () {
-			oTable.fnFilter("Opera");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search plain text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oSearch": {
-					"sSearch": "DS",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Nintendo DS browser"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search plain text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oSearch": {
-					"sSearch": "Opera",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Presto"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search regex text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search regex text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "Gecko"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/sAjaxSource.js
+++ /dev/null
@@ -1,22 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sAjaxSource" );
 
-/* Sanitfy check really - all the other tests blast this */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Server side is off by default",
-		null,
-		function () { 
-			return oSettings.sAjaxSource == "../../../examples/examples_support/json_source.txt";
-		}
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/sDom.js
+++ /dev/null
@@ -1,262 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sDom" );
 
-/* This is going to be brutal on the browser! There is a lot that can be tested here... */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default DOM varaible",
-		null,
-		function () { return oSettings.sDom == "lfrtip"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Default DOM in document",
-		null,
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 1 in code propagates",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": '<"wrapper"flipt>'
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sDom == '<"wrapper"flipt>'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 1 in DOM",
-		null,
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			var nCustomWrapper = $('div.wrapper')[0];
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrapper &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nLength &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging &&
-				nNodes[6] == nTable;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 2 in DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": '<lf<t>ip>'
-			} );
-		},
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			var nCustomWrappers = []
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-				
-				/* Only the two custom divs don't have class names */
-				if ( !jqNodes[i].getAttribute('class') )
-				{
-					nCustomWrappers.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrappers[0] &&
-				nNodes[2] == nLength &&
-				nNodes[3] == nFilter &&
-				nNodes[4] == nCustomWrappers[1] &&
-				nNodes[5] == nTable &&
-				nNodes[6] == nInfo &&
-				nNodes[7] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no length element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": 'frtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				null == nLength &&
-				nNodes[1] == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no filter element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": 'lrtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				null == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	/* Note we don't test for no table as this is not supported (and it would be fairly daft! */
-	
-	oTest.fnWaitTest( 
-		"Check no info element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": 'lfrtp'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				null == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no paging element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sDom": 'lfrti'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				null == nPaging;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/3_ajax/sPaginationType.js
+++ /dev/null
@@ -1,134 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sPaginationType" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"sAjaxSource": "../../../examples/examples_support/json_source.txt"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Check two button paging is the default",
-		null,
-		function () { return oSettings.sPaginationType == "two_button"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Check class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_two_button'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Two div elements are in the wrapper",
-		null,
-		function () { return $('#example_paginate div').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"We have the previous button",
-		null,
-		function () { return document.getElementById('example_previous'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"We have the next button",
-		null,
-		function () { return document.getElementById('example_next'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Previous button is disabled",
-		null,
-		function () { return $('#example_previous').hasClass('paginate_disabled_previous'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Next button is enabled",
-		null,
-		function () { return $('#example_next').hasClass('paginate_enabled_next'); }
-	);
-	
-	/* Don't test paging - that's done by the zero config test script. */
-	
-	
-	/* Two buttons paging */
-	var bComplete = false;
-	oTest.fnWaitTest( 
-		"Can enabled full numbers paging",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"sAjaxSource": "../../../examples/examples_support/json_source.txt",
-				"sPaginationType": "full_numbers",
-				"fnInitComplete": function () {
-					bComplete = true;
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			if ( bComplete )
-				return oSettings.sPaginationType == "full_numbers";
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check full numbers class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_full_numbers'); }
-	);
-	
-	
-	var nFirst, nPrevious, nNext, nLast;
-	oTest.fnWaitTest( 
-		"Jump to last page",
-		function () {
-			nFirst = $('div.dataTables_paginate span.first');
-			nPrevious = $('div.dataTables_paginate span.previous');
-			nNext = $('div.dataTables_paginate span.next');
-			nLast = $('div.dataTables_paginate span.last');
-			nLast.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Go to two pages previous",
-		function () {
-			nPrevious.click();
-			nPrevious.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 31 to 40 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Next (second last) page",
-		function () {
-			nNext.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 41 to 50 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Jump to first page",
-		function () {
-			nFirst.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries";
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/-iDraw.js
+++ /dev/null
@@ -1,44 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "iDraw - check that iDraw increments for each draw" );
 
-
-$(document).ready( function () {
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"After first draw, iDraw is 1",
-		null,
-		function () { return oSettings.iDraw == 1; }
-	);
-	
-	oTest.fnWaitTest( 
-		"After second draw, iDraw is 2",
-		function () { oTable.fnDraw() },
-		function () { return oSettings.iDraw == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"After sort",
-		function () { oTable.fnSort([[1,'asc']]) },
-		function () { return oSettings.iDraw == 3; }
-	);
-	
-	oTest.fnWaitTest( 
-		"After filter",
-		function () { oTable.fnFilter('gecko') },
-		function () { return oSettings.iDraw == 4; }
-	);
-	
-	oTest.fnWaitTest( 
-		"After another filter",
-		function () { oTable.fnFilter('gec') },
-		function () { return oSettings.iDraw == 5; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/2440.js
+++ /dev/null
@@ -1,32 +1,1 @@
-// DATA_TEMPLATE: empty_table
-/*
- * NOTE: There are some differences in this zero config script for server-side
- * processing compared to the other data sources. The main reason for this is the
- * difference in how the server-side processing does it's filtering. Also the
- * sorting state is always reset on each draw.
- */
-oTest.fnStart( "Info element with display all" );
 
-$(document).ready( function () {
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTable.fnSettings()._iDisplayLength = -1;
-	oTable.oApi._fnCalculateEnd( oTable.fnSettings() );
-	oTable.fnDraw();
-	
-	
-	/* Basic checks */
-	oTest.fnWaitTest( 
-		"Check length is correct when -1 length given",
-		null,
-		function () {
-			return document.getElementById('example_info').innerHTML == 
-				"Showing 1 to 57 of 57 entries";
-		}
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/2569.js
+++ /dev/null
@@ -1,47 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "Destroy with hidden columns" );
 
-$(document).ready( function () {
-	var mTest;
-	
-	
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"aoColumnDefs": [ 
-			{ "bSearchable": false, "bVisible": false, "aTargets": [ 2 ] },
-			{ "bVisible": false, "aTargets": [ 3 ] }
-		],
-		"fnInitComplete": function () {
-			this.fnDestroy();
-		}
-	} );
-	
-	oTest.fnWaitTest( 
-		"Check that the number of columns in table is correct",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	
-	oTest.fnTest( 
-		"And with scrolling",
-		function () {
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sScrollY": 200,
-				"aoColumnDefs": [ 
-					{ "bSearchable": false, "bVisible": false, "aTargets": [ 2 ] },
-					{ "bVisible": false, "aTargets": [ 3 ] }
-				],
-				"fnInitComplete": function () {
-					this.fnDestroy();
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/2600.js
+++ /dev/null
@@ -1,47 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "2600 - Display rewind when changing length" );
 
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Info correct on init",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Page 2",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Page 3",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Page 4",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 31 to 40 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Page 5",
-		function () { $('#example_next').click(); },
-		function () { return $('#example_info').html() == "Showing 41 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Rewind",
-		function () { $('#example_length select').val('100'); $('#example_length select').change(); },
-		function () { return $('#example_info').html() == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/_zero_config.js
+++ /dev/null
@@ -1,424 +1,1 @@
-// DATA_TEMPLATE: empty_table
-/*
- * NOTE: There are some differences in this zero config script for server-side
- * processing compared to the other data sources. The main reason for this is the
- * difference in how the server-side processing does it's filtering. Also the
- * sorting state is always reset on each draw.
- */
-oTest.fnStart( "Sanity checks for DataTables with data from JS" );
 
-oTest.fnWaitTest( 
-	"jQuery.dataTable function",
-	null,
-	function () { return typeof jQuery().dataTable == "function"; }
-);
-
-oTest.fnWaitTest(
-	"jQuery.dataTableSettings storage array",
-	null,
-	function () { return typeof jQuery().dataTableSettings == "object"; }
-);
-
-oTest.fnWaitTest(
-	"jQuery.dataTableExt plugin object",
-	null,
-	function () { return typeof jQuery().dataTableExt == "object"; }
-);
-
-$(document).ready( function () {
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	/* Basic checks */
-	oTest.fnWaitTest( 
-		"Length changing div exists",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Filtering div exists",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Information div exists",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Pagination div exists",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is off by default",
-		null,
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"10 rows shown on the first page",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Initial sort occured",
-		null,
-		function () { return $('#example tbody td:eq(0)').html() == "Gecko"; }
-	);
-	
-	/* Need to use the WaitTest for sorting due to the setTimeout datatables uses */
-	oTest.fnWaitTest( 
-		"Sorting (first click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting (second click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting (third click) on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting (first click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting (second click) on numeric column",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column (first click)",
-		function () { 
-			$('#example thead th:eq(0)').click();
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () { var b = 
-			$('#example tbody td:eq(0)').html() == "Gecko" && 
-			$('#example tbody td:eq(1)').html() == "Camino 1.0"; return b; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - sorting first column only",
-		function () { 
-			$('#example thead th:eq(0)').click(); },
-		function () { var b = 
-			$('#example tbody td:eq(0)').html() == "Gecko" && 
-			$('#example tbody td:eq(1)').html() == "Firefox 1.0"; return b; }
-	);
-	
-	/* Basic paging */
-	oTest.fnWaitTest( 
-		"Paging to second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Mozilla 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Paging to first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Attempting to page back beyond the first page",
-		function () { $('#example_previous').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	/* Changing length */
-	oTest.fnWaitTest( 
-		"Changing table length to 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Changing table length to 50 records",
-		function () { $("select[name=example_length]").val('50').change(); },
-		function () { return $('#example tbody tr').length == 50; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Changing table length to 100 records",
-		function () { $("select[name=example_length]").val('100').change(); },
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Changing table length to 10 records",
-		function () { $("select[name=example_length]").val('10').change(); },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	/*
-	 * Information element
-	 */
-	oTest.fnWaitTest(
-		"Information on zero config",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information on second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 11 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information on third page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 21 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information on last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information back on first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with 25 records",
-		function () { $("select[name=example_length]").val('25').change(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 25 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with 25 records - second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == "Showing 26 to 50 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with 100 records - first page",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('100').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 57 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information back to 10 records",
-		function () {
-			$('#example_previous').click();
-			$("select[name=example_length]").val('10').change();
-		},
-		function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win' second page",
-		function () { $('#example_next').click(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win' last page",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 31 to 31 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win' back to first page",
-		function () {
-			$('#example_previous').click();
-			$('#example_previous').click();
-			$('#example_previous').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win' second page - second time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter increased to 'Win 98'",
-		function () { $('#example_filter input').val("Win 98").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter decreased to 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter 'Win' second page - third time",
-		function () {
-			$('#example_next').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information with filter removed",
-		function () { $('#example_filter input').val("").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	/*
-	 * Filtering
-	 */
-	oTest.fnWaitTest(
-		"Filter 'W' - rows",
-		function () {
-			$('#example_filter input').val("W").keyup(); },
-		function () { return $('#example tbody tr:eq(4) td:eq(1)').html() == "Netscape 7.2"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'W' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 42 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Wi'",
-		function () { $('#example_filter input').val("Wi").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 32 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win'",
-		function () { $('#example_filter input').val("Win").keyup(); },
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win' - sorting column 1",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "AOL browser (AOL desktop)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win' - sorting column 1 info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win' - sorting column 1 reverse",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win XP' - maintaing reverse sorting col 1",
-		function () { $('#example_filter input').val("Win XP").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 7"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win XP' - sorting col 3",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "6"; }
-	);
-	
-	/* Note the filtering is different from the DOM since the server doesn't do
-	 * "smart filtering" like the client side does
-	 */
-	oTest.fnWaitTest(
-		"Filter 'Win XP' - sorting col 3 - reversed",
-		function () { $('#example thead th:eq(3)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "7"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'Win' - sorting col 3 - reversed info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 2 of 2 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'nothinghere'",
-		function () { $('#example_filter input').val("nothinghere").keyup(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == 
-			"No matching records found"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter 'nothinghere' - info",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Filter back to blank and 1st column sorting",
-		function () {
-			$('#example_filter input').val("").keyup();
-			$('#example thead th:eq(0)').click();
-		},
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aaSorting.js
+++ /dev/null
@@ -1,212 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aaSorting" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default sorting is single column",
-		null,
-		function () {
-			return oSettings.aaSorting.length == 1 && typeof oSettings.aaSorting[0] == 'object';
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Default sorting is first column asc",
-		null,
-		function () {
-			return oSettings.aaSorting[0].length == 3 && oSettings.aaSorting[0][0] == 0 &&
-				oSettings.aaSorting[0][1] == 'asc';
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting is applied",
-		null,
-		function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single string column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single string column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single int column asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "-"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Custom sorting on single int column desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','asc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','desc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "iPod Touch / iPhone"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / string desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','desc'], ['1','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Safari 3.0"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','asc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string asc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','asc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "1.9"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / int asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','desc'], ['3','asc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "125.5"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (2 column) - string desc / int desc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','desc'], ['3','desc']]
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multi-column sorting (3 column) - string asc / int asc / string asc",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSorting": [['0','asc'], ['3','asc'], ['1','asc']]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(7) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aaSortingFixed.js
+++ /dev/null
@@ -1,67 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aaSortingFixed" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"No fixed sorting by default",
-		null,
-		function () {
-			return oSettings.aaSortingFixed == null;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSortingFixed": [['0','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on first column (string/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/asc)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aaSortingFixed": [['3','asc']]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Fixed sorting on fourth column (int/asc) with user sorting on second column (string/desc)",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "PSP browser"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.bSearchable.js
+++ /dev/null
@@ -1,25 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bSeachable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Columns are searchable by default",
-		function () { oTable.fnFilter("Camino"); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Camino 1.0"; }
-	);
-	
-	/* NOT ACTUALLY GOING TO TEST BSEARCHABLE HERE. Reason being is that it requires the server
-	 * side to alter it's processing, and this information about columns is not actually sent to
-	 * the server
-	 */
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.bSortable.js
+++ /dev/null
@@ -1,112 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bSortable" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"All columns are sortable by default",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can disable sorting from one column",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					null,
-					null
-				]
-			} );
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disabled column has no sorting class",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 4.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Disable sorting on multiple columns - no sorting classes",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "bSortable": false },
-					null,
-					{ "bSortable": false },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example thead th:eq(1)').hasClass("sorting") ||
-				$('#example thead th:eq(3)').hasClass("sorting")
-			return bReturn == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on disabled column 1 has no effect",
-		function () {
-			$('#example thead th:eq(1)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Second sort on disabled column 2 has no effect",
-		function () {
-			$('#example thead th:eq(3)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Even with multiple disabled sorting columns other columns can still sort",
-		function () {
-			$('#example thead th:eq(4)').click();
-			$('#example thead th:eq(4)').click();
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 4.0"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.bUseRendered.js
+++ /dev/null
@@ -1,43 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bUseRendered" );
 
-/* bUseRendered is used to alter sorting data, if false then the original data is used for
- * sorting rather than the rendered data
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				if ( mTmp == 0 ) {
-					mTmp++;
-					return "aaa";
-				} else
-					return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default for bUseRendered is true - rendered data is used for sorting",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'aaa'; }
-	);
-	
-	/* Limited to what we can do here as the sorting is done on the server side. So stop here. */
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.bVisible.js
+++ /dev/null
@@ -1,123 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.bVisible" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"All columns are visible by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td').length == 5; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can hide one column and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 4; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Can hide one column and it removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 4; }
-	);
-	
-	oTest.fnWaitTest( 
-		"The correct thead column has been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Platform(s)" &&
-				jqNodes[2].innerHTML == "Engine version" &&
-				jqNodes[3].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"The correct tbody column has been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "Win 98+ / OSX.2+" &&
-				jqNodes[2].innerHTML == "1.7" &&
-				jqNodes[3].innerHTML == "A";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Can hide multiple columns and it removes td column from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "bVisible": false },
-					{ "bVisible": false },
-					null,
-					{ "bVisible": false }
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - removes thead th column from DOM",
-		null,
-		function () { return $('#example thead tr:eq(0) th').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - the correct thead columns have been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Engine version"
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Multiple hide - the correct tbody columns have been hidden",
-		null,
-		function () {
-			var jqNodes = $('#example tbody tr:eq(0) td');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Gecko" &&
-				jqNodes[1].innerHTML == "1.7"
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js
+++ /dev/null
@@ -1,189 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.fnRender" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var mTmp = 0;
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"aoColumns": [
-			null,
-			{ "fnRender": function (a) {
-				mTmp++;
-				return a.aData[a.iDataColumn];
-			} },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Single column - fnRender is called once for each row",
-		null,
-		function () { return mTmp == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Confirm that fnRender passes one argument (an object) with three parameters",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( arguments.length != 1 || typeof a.iDataRow=='undefined' ||
-						 	typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender iDataColumn is row number",
-		function () {
-			var iCount = 0;
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( iCount != a.iDataRow )
-						{
-							mTmp = false;
-						}
-						iCount++;
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender iDataColumn is the column",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.iDataColumn != 1 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRender aData is data array of correct size",
-		function () {
-			mTmp = true;
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						if ( a.aData.length != 5 )
-						{
-							mTmp = false;
-						}
-						return a.aData[a.iDataColumn];
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return mTmp; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest';
-					} },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == 'unittest'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Passed back data is put into the DOM",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					null,
-					{ "fnRender": function (a) {
-						return 'unittest1';
-					} },
-					{ "fnRender": function (a) {
-						return 'unittest2';
-					} },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(0) td:eq(2)').html() == 'unittest1' &&
-				$('#example tbody tr:eq(0) td:eq(3)').html() == 'unittest2';
-			return bReturn; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.sClass.js
+++ /dev/null
@@ -1,118 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sClass" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"By default the test class hasn't been applied to the column (sanity!)",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(2)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					null,
-					{ "sClass": 'unittest' },
-					null,
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - third row",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - last row",
-		null,
-		function () { return $('#example tbody tr:eq(9) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to other columns - 1st",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to other columns - 5th",
-		null,
-		function () { return $('#example tbody tr:eq(3) td:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - seventh row - second page",
-		function () { $('#example_next').click(); },
-		function () { return $('#example tbody tr:eq(6) td:eq(2)').hasClass('unittest'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to header",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Add a class to a single column - has not applied to footer",
-		null,
-		function () { return $('#example thead tr:eq(3) th:eq(4)').hasClass('unittest') == false; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - first row",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					{ "sClass": 'unittest2' },
-					null,
-					null,
-					{ "sClass": 'unittest1' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn = 
-				$('#example tbody tr:eq(3) td:eq(0)').hasClass('unittest2') &&
-				$('#example tbody tr:eq(8) td:eq(3)').hasClass('unittest1');
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 1",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(4)').hasClass('unittest1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Class defined for multiple columns - has not applied to other columns - 5th 2",
-		null,
-		function () { return $('#example tbody tr:eq(6) td:eq(4)').hasClass('unittest2') == false; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.sName.js
+++ /dev/null
@@ -1,29 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sName" );
 
-/* This has no effect at all in DOM methods - so we just check that it has applied the name */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"aoColumns": [
-			null,
-			null,
-			null,
-			{ "sName": 'unit test' },
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Names are stored in the columns object",
-		null,
-		function () { return oSettings.aoColumns[3].sName =="unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.sTitle.js
+++ /dev/null
@@ -1,85 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sTitle" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"If not given, then the columns titles are empty",
-		null,
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "Browser" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Can set a single column title - and others are read from DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test' },
-					null,
-					null,
-					null
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "CSS grade";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Can set multiple column titles",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					{ "sTitle": 'unit test 1' },
-					null,
-					null,
-					{ "sTitle": 'unit test 2' }
-				]
-			} );
-		},
-		function () {
-			var jqNodes = $('#example thead tr:eq(0) th');
-			var bReturn = 
-				jqNodes[0].innerHTML == "Rendering engine" &&
-				jqNodes[1].innerHTML == "unit test 1" &&
-				jqNodes[2].innerHTML == "Platform(s)" &&
-				jqNodes[3].innerHTML == "Engine version" &&
-				jqNodes[4].innerHTML == "unit test 2";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.sWidth.js
+++ /dev/null
@@ -1,90 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoColumns.sWidth" );
 
-/* NOTE - we need to disable the auto width for the majority of these test in order to preform 
- * these tests as the auto width will convert the width to a px value. We can do 'non-exact' tests
- * with auto width enabled however to ensure it scales columns as required
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"bAutoWidth": false,
-		"aoColumns": [
-			null,
-			{ "sWidth": '40%' },
-			null,
-			null,
-			null
-		]
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"With auto width disabled the width for one column is appled",
-		null,
-		function () { return $('#example thead th:eq(1)')[0].style.width == "40%"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"With auto width disabled the width for one column is appled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bAutoWidth": false,
-				"aoColumns": [
-					null,
-					null,
-					{ "sWidth": '20%' },
-					{ "sWidth": '30%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var bReturn =
-				$('#example thead th:eq(2)')[0].style.width == "20%" &&
-				$('#example thead th:eq(3)')[0].style.width == "30%";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"With auto width, it will make the smallest column the largest with percentage width given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"aoColumns": [
-					null,
-					null,
-					null,
-					{ "sWidth": '40%' },
-					null
-				]
-			} );
-		},
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			
-			if ( a3>a0 && a3>a1 && a3>a2 && a3>a4 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/aoSearchCols.js
+++ /dev/null
@@ -1,70 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "aoSearchCols" );
 
-/* We could be here forever testing this one, so we test a limited subset on a couple of colums */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing_filter_col.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default should be to have a empty colums array",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.aoPreSearchCols[0].sSearch == 0 && !oSettings.aoPreSearchCols[0].bRegex &&
-				oSettings.aoPreSearchCols[1].sSearch == 0 && !oSettings.aoPreSearchCols[1].bRegex &&
-				oSettings.aoPreSearchCols[2].sSearch == 0 && !oSettings.aoPreSearchCols[2].bRegex &&
-				oSettings.aoPreSearchCols[3].sSearch == 0 && !oSettings.aoPreSearchCols[3].bRegex &&
-				oSettings.aoPreSearchCols[4].sSearch == 0 && !oSettings.aoPreSearchCols[4].bRegex;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Search on a single column - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing_filter_col.php",
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search on two columns - no regex statement given",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing_filter_col.php",
-				"aoSearchCols": [
-					null,
-					{ "sSearch": "Mozilla" },
-					null,
-					{ "sSearch": "1.5" },
-					null
-				]
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1.5"; }
-	);
-	
-	/* No regex escape searches here - would need to be implemented on the server-side */
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/asStripClasses.js
+++ /dev/null
@@ -1,109 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "asStripClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Default row striping is applied",
-		null,
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Row striping on the second page",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('odd') &&
-			       $('#example tbody tr:eq(1)').hasClass('even') &&
-			       $('#example tbody tr:eq(2)').hasClass('odd') &&
-			       $('#example tbody tr:eq(3)').hasClass('even');
-		}
-	);
-	
-	/* No striping */
-	oTest.fnWaitTest( 
-		"No row striping",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"asStripClasses": []
-			} );
-		},
-		function () {
-			if ( typeof $('#example tbody tr:eq(1)')[0] == 'undefined' )
-			{
-				/* Use the 'wait for' to allow this to become true */
-				return false;
-			}
-			return $('#example tbody tr:eq(0)')[0].className == "" &&
-			       $('#example tbody tr:eq(1)')[0].className == "" &&
-			       $('#example tbody tr:eq(2)')[0].className == "" &&
-			       $('#example tbody tr:eq(3)')[0].className == "";
-		}
-	);
-	
-	/* Custom striping */
-	oTest.fnWaitTest( 
-		"Custom striping [2]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"asStripClasses": [ 'test1', 'test2' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test1') &&
-			       $('#example tbody tr:eq(3)').hasClass('test2');
-		}
-	);
-	
-	
-	/* long array of striping */
-	oTest.fnWaitTest( 
-		"Custom striping [4]",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"asStripClasses": [ 'test1', 'test2', 'test3', 'test4' ]
-			} );
-		},
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Custom striping is restarted on second page [2]",
-		function () { $('#example_next').click(); },
-		function () {
-			return $('#example tbody tr:eq(0)').hasClass('test1') &&
-			       $('#example tbody tr:eq(1)').hasClass('test2') &&
-			       $('#example tbody tr:eq(2)').hasClass('test3') &&
-			       $('#example tbody tr:eq(3)').hasClass('test4');
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bAutoWidth.js
+++ /dev/null
@@ -1,145 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bAutoWidth" );
 
-/* It's actually a little tricky to test this. We can't test absolute numbers because
- * different browsers and different platforms will render the width of the columns slightly
- * differently. However, we certainly can test the principle of what should happen (column 
- * width doesn't change over pages)
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Auto width is enabled by default",
-		null,
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	oTest.fnWaitTest( 
-		"First column has a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style').match(/width/i); }
-	);
-	
-	/*
-	This would seem like a better test - but there appear to be difficulties with tables
-	which are bigger (calculated) than there is actually room for. I suspect this is actually
-	a bug in datatables
-	oTest.fnWaitTest( 
-		"Check column widths on first page match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			console.log( a0, b0, a1, b1, a2, b2, a3, b3 );
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check column widths on second page match thid page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return true;
-			else
-				return false;
-		}
-	);
-	*/
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Auto width can be disabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bAutoWidth": false
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"First column does not have a width assigned to it",
-		null,
-		function () { return $('#example thead th:eq(0)').attr('style') == null; }
-	);
-	
-	/*
-	oTest.fnWaitTest( 
-		"Check column widths on first page do not match second page",
-		null,
-		function () {
-			var anThs = $('#example thead th');
-			var a0 = anThs[0].offsetWidth;
-			var a1 = anThs[1].offsetWidth;
-			var a2 = anThs[2].offsetWidth;
-			var a3 = anThs[3].offsetWidth;
-			var a4 = anThs[4].offsetWidth;
-			$('#example_next').click();
-			var b0 = anThs[0].offsetWidth;
-			var b1 = anThs[1].offsetWidth;
-			var b2 = anThs[2].offsetWidth;
-			var b3 = anThs[3].offsetWidth;
-			var b4 = anThs[4].offsetWidth;
-			if ( a0==b0 && a1==b1 && a2==b2 && a3==b3 )
-				return false;
-			else
-				return true;
-		}
-	);
-	*/
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Auto width enabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bAutoWidth": true
-			} );
-	 		oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bAutoWidth; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bFilter.js
+++ /dev/null
@@ -1,47 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bFilter" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Filtering div exists by default",
-		null,
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Fltering can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bFilter": false
-			} );
-		},
-		function () { return document.getElementById('example_filter') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Filtering enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bFilter": true
-			} );
-		},
-		function () { return document.getElementById('example_filter') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bInfiniteScroll.js
+++ /dev/null
@@ -1,165 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bInfiniteScroll" );
 
-
-$(document).ready( function () {
-	var oTable = $('#example').dataTable( {
-		"bScrollInfinite": true,
-		"sScrollY": "200px",
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"10 rows by default",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Info",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes",
-		null,
-		function () { return $('#example tbody>tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll on 20px adds 10 rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 20px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after 20px scroll",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function after 20px scroll",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 20; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll on 10px more results in the same number of rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(30); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 10 more px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll to 240px adds another 10 rows",
-		function () { $('div.dataTables_scrollBody').scrollTop(240); },
-		function () { return $('#example tbody tr').length == 30; }
-	);
-	
-	oTest.fnTest( 
-		"Info after 240px scroll",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 30 of 57 entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after 240px scroll",
-		null,
-		function () { return $('#example tbody>tr').length == 30; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function after 240px scroll",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 30; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Filtering will drop back to 10 rows",
-		function () { oTable.fnFilter('gec') },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Info after filtering",
-		null,
-		function () { return $('#example_info').html() == "Showing 1 to 10 of 20 entries (filtered from 57 total entries)"; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after filtering",
-		null,
-		function () { return $('#example tbody>tr').length == 10; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function after filtering",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll after filtering adds 10",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after filtering",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function after filtering",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 20; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting will drop back to 10 rows",
-		function () { oTable.fnSort([[1,'asc']]) },
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Scroll after sorting adds 10",
-		function () { $('div.dataTables_scrollBody').scrollTop(20); },
-		function () { return $('#example tbody tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes after scrolling",
-		null,
-		function () { return $('#example tbody>tr').length == 20; }
-	);
-	
-	oTest.fnTest( 
-		"Get nodes function after scrolling",
-		null,
-		function () { return $('#example').dataTable().fnGetNodes().length == 20; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bInfo.js
+++ /dev/null
@@ -1,47 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Info div exists by default",
-		null,
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Info can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bInfo": false
-			} );
-		},
-		function () { return document.getElementById('example_info') == null; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Info enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bInfo": true
-			} );
-		},
-		function () { return document.getElementById('example_info') != null; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bLengthChange.js
+++ /dev/null
@@ -1,78 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bLengthChange" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Length div exists by default",
-		null,
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Four default options",
-		null,
-		function () { return $("select[name=example_length] option").length == 4; }
-	);
-	
-	oTest.fnWaitTest(
-		"Default options",
-		null,
-		function () {
-			var opts = $("select[name='example_length'] option");
-			return opts[0].getAttribute('value') == 10 && opts[1].getAttribute('value') == 25 &&
-				opts[2].getAttribute('value') == 50 && opts[3].getAttribute('value') == 100;
-		}
-	);
-	
-	oTest.fnWaitTest(
-		"Info takes length into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Change length can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bLengthChange": false
-			} );
-		},
-		function () { return document.getElementById('example_length') == null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information takes length disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Length change enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bLengthChange": true
-			} );
-		},
-		function () { return document.getElementById('example_length') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bPaginate.js
+++ /dev/null
@@ -1,62 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bPaginate" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Pagiantion div exists by default",
-		null,
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information div takes paging into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 10 of 57 entries"; }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bPaginate": false
-			} );
-		},
-		function () { return document.getElementById('example_paginate') == null; }
-	);
-	
-	oTest.fnWaitTest(
-		"Information div takes paging disabled into account",
-		null,
-		function () { return document.getElementById('example_info').innerHTML == 
-			"Showing 1 to 57 of 57 entries"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Pagiantion enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bPaginate": true
-			} );
-		},
-		function () { return document.getElementById('example_paginate') != null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bProcessing.js
+++ /dev/null
@@ -1,106 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bProcessing" );
 
-/* It's actually a bit hard to set this one due to the fact that it will only be shown
- * when DataTables is doing some kind of processing. The server-side processing is a bit
- * better to test this than here - so we just the interal functions to enable it and check
- * that it is available
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Processing is off by default",
-		null,
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div cannot be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div cannot be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Processing can be enabled",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bProcessing": true
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is hidden by default",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div can be shown",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing').style.visibility = "visible"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div can be hidden",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, false ); },
-		function () { return document.getElementById('example_processing').style.visibility = "hidden"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Processing disabled override",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bProcessing": false
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oFeatures.bProcessing == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Processing div is not in the DOM",
-		function () { oTable.oApi._fnProcessingDisplay( oSettings, true ); },
-		function () { return document.getElementById('example_processing') == null; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bServerSide.js
+++ /dev/null
@@ -1,21 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bServerSide" );
 
-/* All the other scripts blast the ssp processing */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Server side can be set to on",
-		null,
-		function () { return oSettings.oFeatures.bServerSide == true; }
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bSort.js
+++ /dev/null
@@ -1,102 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bSort" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Sorting is on by default",
-		null,
-		function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting Asc by default class applied",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnWaitTest(
-		"Click on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "All others"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting class removed from first column",
-		null,
-		function () { return $('#example thead th:eq(0)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting asc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc"); }
-	);
-	
-	oTest.fnWaitTest(
-		"Reverse on second column",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting acs class removed from second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_asc") != true; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting desc class applied to second column",
-		null,
-		function () { return $('#example thead th:eq(1)').hasClass("sorting_desc"); }
-	);
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Pagiantion can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bSort": false
-			} );
-		},
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Click on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Reverse on second column has no effect",
-		function () { $('#example thead th:eq(1)').click(); },
-		function () { return $('#example tbody td:eq(3)').html() == "4"; }
-	);
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Sorting enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bSort": true
-			} );
-		},
-		function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.0"; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/bSortClasses.js
+++ /dev/null
@@ -1,135 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "bSortClasses" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are applied by default",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are applied to all required cells",
-		null,
-		function () { return $('#example tbody tr:eq(7) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes are not applied to non-sorting columns",
-		null,
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 1",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 2",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting multi-column - add column 3",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(3)')[0], { 'shift': true } );
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3');
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Remove sorting classes on single column sort",
-		function () { 
-			$('#example thead th:eq(4)').click();
-		},
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false &&
-						 $('#example tbody tr:eq(0) td:eq(3)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting class 1 was added",
-		null,
-		function () { return $('#example tbody tr:eq(1) td:eq(4)').hasClass('sorting_1'); }
-	);
-	
-	
-	/* Check can disable */
-	oTest.fnWaitTest( 
-		"Sorting classes can be disabled",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bSortClasses": false
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes disabled - add column 1 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Sorting classes disabled - add column 2 - no effect",
-		function () { 
-			oDispacher.click( $('#example thead th:eq(2)')[0], { 'shift': true } ); },
-		function () {
-			return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1') == false &&
-						 $('#example tbody tr:eq(0) td:eq(1)').hasClass('sorting_2') == false &&
-						 $('#example tbody tr:eq(0) td:eq(2)').hasClass('sorting_3') == false;
-		}
-	);
-	
-	
-	/* Enable makes no difference */
-	oTest.fnWaitTest( 
-		"Sorting classes enabled override",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bSortClasses": true
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').hasClass('sorting_1'); }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/fnDrawCallback.js
+++ /dev/null
@@ -1,89 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnDrawCallback" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnDrawCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"One argument passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnDrawCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnDrawCallback": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnDrawCallback": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once on each draw there after as well",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass > 1; }
-	);
-	
-	
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/fnHeaderCallback.js
+++ /dev/null
@@ -1,191 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnHeaderCallback" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnHeaderCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Five arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 5; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once per draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called on paging (i.e. another draw)",
-		function () { $('#example_next').click(); },
-		function () { return mPass == 2; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-				}
-			} );
-		},
-		function () { return $('#example thead th:eq(0)').html() == "Displaying 10 records"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iStart correct on first page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart != 0 )
-					{
-						mPass = false;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iStart correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iStart == 0 )
-					{
-						mPass = true;
-					}
-				},
-				"fnInitComplete": function () {
-					$('#example_next').click();
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"iEnd correct on second page",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( iEnd == 10 )
-					{
-						mPass = true;
-					}
-				},
-				"fnInitComplete": function () {
-					$('#example_next').click();
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"aiDisplay length is full data when not filtered",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 10 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnWaitTest( 
-		"aiDisplay length is 9 when filtering on 'Mozilla'",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = false;
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) {
-					if ( aiDisplay.length == 9 )
-					{
-						mPass = true;
-					}
-				}
-			} );
-			oTable.fnFilter( "Mozilla" );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/fnInitComplete.js
+++ /dev/null
@@ -1,105 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnInitComplete" );
 
-/* Fairly boring function compared to the others! */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnInitComplete == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"One argument passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnInitComplete": function ( ) {
-					mPass = arguments.length;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"That one argument is the settings object",
-		function () {
-			oSession.fnRestore();
-			
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnInitComplete": function ( oSettings ) {
-					mPass = oSettings;
-				}
-			} );
-		},
-		function () { return oTable.fnSettings() == mPass; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnInitComplete called once on first draw",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnInitComplete": function ( ) {
-					mPass++;
-				}
-			} );
-		},
-		function () { return mPass == 1; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnInitComplete never called there after",
-		function () {
-			$('#example_next').click();
-			$('#example_next').click();
-			$('#example_next').click();
-		},
-		function () { return mPass == 1; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"10 rows in the table on complete",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnInitComplete": function ( ) {
-					mPass = $('#example tbody tr').length;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/fnRowCallback.js
+++ /dev/null
@@ -1,118 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "fnRowCallback" );
 
-/* Note - fnRowCallback MUST return the first arguments (modified or not) */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	var mPass;
-	
-	oTest.fnWaitTest( 
-		"Default should be null",
-		null,
-		function () { return oSettings.fnRowCallback == null; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Four arguments passed",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = -1;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnRowCallback": function ( nTr ) {
-					mPass = arguments.length;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 4; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback called once for each drawn row",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					mPass++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"fnRowCallback allows us to alter row information",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					$(nTr).addClass('unit_test');
-					return nTr;
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(1)').hasClass('unit_test'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( asData.length != 5 )
-						mPass = false;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Data array has length matching columns",
-		function () {
-			oSession.fnRestore();
-			
-			mPass = true;
-			var iCount = 0;
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) {
-					if ( iCount != iDrawIndex )
-						mPass = false;
-					iCount++;
-					return nTr;
-				}
-			} );
-		},
-		function () { return mPass; }
-	);
-	
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/iDisplayLength.js
+++ /dev/null
@@ -1,85 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "iDisplayLength" );
 
-$(document).ready( function () {
-	/* Check the default */
-	$('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	
-	oTest.fnWaitTest( 
-		"Default length is ten",
-		null,
-		function () { return $('#example tbody tr').length == 10; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 10",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 25",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"iDisplayLength": 25
-			} );
-		},
-		function () { return $('#example tbody tr').length == 25; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 25; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 100",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"iDisplayLength": 100
-			} );
-		},
-		function () { return $('#example tbody tr').length == 57; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 25",
-		null,
-		function () { return $('#example_length select').val() == 100; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Set initial length to 23 (unknown select menu length)",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"iDisplayLength": 23
-			} );
-		},
-		function () { return $('#example tbody tr').length == 23; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Select menu shows 10 (since 23 is unknow)",
-		null,
-		function () { return $('#example_length select').val() == 10; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.oPaginate.js
+++ /dev/null
@@ -1,86 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.oPaginate" );
 
-/* Note that the paging language information only has relevence in full numbers */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"sPaginationType": "full_numbers"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"oLanguage.oPaginate defaults",
-		null,
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "First" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Previous" &&
-				oSettings.oLanguage.oPaginate.sNext == "Next" &&
-				oSettings.oLanguage.oPaginate.sLast == "Last";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate defaults are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "First" &&
-				$('#example_paginate .previous').html() == "Previous" &&
-				$('#example_paginate .next').html() == "Next" &&
-				$('#example_paginate .last').html() == "Last";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"oLanguage.oPaginate can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sPaginationType": "full_numbers",
-				"oLanguage": {
-					"oPaginate": {
-						"sFirst":    "unit1",
-						"sPrevious": "test2",
-						"sNext":     "unit3",
-						"sLast":     "test4"
-					}
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.oPaginate.sFirst == "unit1" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "test2" &&
-				oSettings.oLanguage.oPaginate.sNext == "unit3" &&
-				oSettings.oLanguage.oPaginate.sLast == "test4";
-			return bReturn;
-		}
-	);
-	
-	oTest.fnTest( 
-		"oLanguage.oPaginate definitions are in the DOM",
-		null,
-		function () {
-			var bReturn = 
-				$('#example_paginate .first').html() == "unit1" &&
-				$('#example_paginate .previous').html() == "test2" &&
-				$('#example_paginate .next').html() == "unit3" &&
-				$('#example_paginate .last').html() == "test4";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfo.js
+++ /dev/null
@@ -1,124 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfo" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info language is 'Showing _START_ to _END_ of _TOTAL_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sInfo == "Showing _START_ to _END_ of _TOTAL_ entries"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - without any macros",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfo == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "unit test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _START_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit _START_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _END_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 10 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macro _TOTAL_ only",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 57 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macros _START_ and _END_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info language can be defined - with macros _START_, _END_ and _TOTAL_",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfo": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "unit 1 10 57 test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoEmpty.js
+++ /dev/null
@@ -1,82 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfoEmpty" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info empty language is 'Showing 0 to 0 of 0 entries' by default",
-		function () { oTable.fnFilter("nothinghere"); },
-		function () { return oSettings.oLanguage.sInfoEmpty == "Showing 0 to 0 of 0 entries"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"Showing 0 to 0 of 0 entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info empty language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfoEmpty": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return oSettings.oLanguage.sInfoEmpty == "unit test"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Macro's not replaced",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfoEmpty": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () {
-			var bReturn = document.getElementById('example_info').innerHTML.replace( 
-				' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) ==
-					"unit _START_ _END_ _TOTAL_ test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoPostFix.js
+++ /dev/null
@@ -1,82 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sInfoPostFix" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Info post fix language is '' (blank) by default",
-		null,
-		function () { return oSettings.oLanguage.sInfoPostFix == ""; }
-	);
-	
-	oTest.fnTest( 
-		"Width no post fix, the basic info shows",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Info post fix language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sInfoPostFix == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info empty language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit test"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Macros have no effect in the post fix",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfoPostFix": "unit _START_ _END_ _TOTAL_ test"
-				}
-			} );
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 1 to 10 of 57 entries unit _START_ _END_ _TOTAL_ test"; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Post fix is applied after fintering info",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sInfoPostFix": "unit test"
-				}
-			} );
-			oTable.fnFilter("nothinghere");
-		},
-		function () { return document.getElementById('example_info').innerHTML = "Showing 0 to 0 of 0 entries unit (filtered from 57 total entries) test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sLengthMenu.js
+++ /dev/null
@@ -1,110 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sLengthMenu" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Menu language is 'Show _MENU_ entries' by default",
-		null,
-		function () { return oSettings.oLanguage.sLengthMenu == "Show _MENU_ entries"; }
-	);
-	
-	oTest.fnTest(
-		"_MENU_ macro is replaced by select menu in DOM",
-		null,
-		function () { return $('select', oSettings.aanFeatures.l[0]).length == 1 }
-	);
-	
-	oTest.fnTest(
-		"Default is put into DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "Show " &&
-				anChildren[2].nodeValue == " entries";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Menu length language can be defined - no _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sLengthMenu": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sLengthMenu == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Menu length language definition is in the DOM",
-		null,
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			return anChildren[0].nodeValue == "unit test";
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Menu length language can be defined - with _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sLengthMenu": "unit _MENU_ test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren[0].nodeValue == "unit " &&
-				anChildren[2].nodeValue == " test";
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Only the _MENU_ macro",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sLengthMenu": "_MENU_"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var anChildren = oSettings.aanFeatures.l[0].childNodes;
-			var bReturn =
-				anChildren.length == 1 &&
-				$('select', oSettings.aanFeatures.l[0]).length == 1;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sProcessing.js
+++ /dev/null
@@ -1,51 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sProcessing" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-		"bProcessing": true
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Processing language is 'Processing...' by default",
-		null,
-		function () { return oSettings.oLanguage.sProcessing == "Processing..."; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "Processing..."; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Processing language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"bProcessing": true,
-				"oLanguage": {
-					"sProcessing": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sProcessing == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Processing language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_processing').innerHTML = "unit test"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sSearch.js
+++ /dev/null
@@ -1,68 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sSearch" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Search language is 'Search:' by default",
-		null,
-		function () { return oSettings.oLanguage.sSearch == "Search:"; }
-	);
-	
-	oTest.fnTest( 
-		"Search language default is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "Search: "; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Search language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sSearch": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sSearch == "unit test"; }
-	);
-	
-	oTest.fnTest( 
-		"Info language definition is in the DOM",
-		null,
-		function () { return document.getElementById('example_filter').childNodes[0].nodeValue
-		 	== "unit test "; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Blank search has no space (separator) inserted",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sSearch": ""
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return document.getElementById('example_filter').childNodes.length == 1; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sUrl.js
+++ /dev/null
@@ -1,64 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sUrl" );
 
-/* Note that we only test the internal storage of language information pulled form a file here
- * as the other language tests will check it goes into the DOM correctly
- */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnTest( 
-		"sUrl is blank by default",
-		null,
-		function () { return oSettings.oLanguage.sUrl == ""; }
-	);
-	
-	
-	oTest.fnWaitTest( 
-		"Loading of German file loads language information",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sUrl": "../../../examples/examples_support/de_DE.txt"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			var bReturn = 
-				oSettings.oLanguage.sProcessing == "Bitte warten..." &&
-				oSettings.oLanguage.sLengthMenu == "_MENU_ Einträge anzeigen" &&
-				oSettings.oLanguage.sZeroRecords == "Keine Einträge vorhanden." &&
-				oSettings.oLanguage.sInfo == "_START_ bis _END_ von _TOTAL_ Einträgen" &&
-				oSettings.oLanguage.sInfoEmpty == "0 bis 0 von 0 Einträgen" &&
-				oSettings.oLanguage.sInfoFiltered == "(gefiltert von _MAX_  Einträgen)" &&
-				oSettings.oLanguage.sInfoPostFix == "" &&
-				oSettings.oLanguage.sSearch == "Suchen" &&
-				oSettings.oLanguage.oPaginate.sFirst == "Erster" &&
-				oSettings.oLanguage.oPaginate.sPrevious == "Zurück" &&
-				oSettings.oLanguage.oPaginate.sNext == "Nächster" &&
-				oSettings.oLanguage.oPaginate.sLast == "Letzter";
-				
-			return bReturn;
-		}
-	);
-	
-	/* One DOM check just to ensure that they go into the DOM */
-	oTest.fnTest(
-		"Loaded language goes into the DOM",
-		null,
-		function () { return document.getElementById('example_info').innerHTML = "1 bis 10 von 57 Einträgen"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sZeroRecords.js
+++ /dev/null
@@ -1,58 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oLanguage.sZeroRecords" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Zero records language is 'No matching records found' by default",
-		null,
-		function () { return oSettings.oLanguage.sZeroRecords == "No matching records found"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere'); },
-		function () {
-			if ( $('#example tbody tr td').length == 0 )
-				return false;
-			return $('#example tbody tr td')[0].innerHTML == "No matching records found";
-		}
-	);
-	
-	
-	
-	oTest.fnWaitTest( 
-		"Zero records language can be defined",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oLanguage": {
-					"sZeroRecords": "unit test"
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.oLanguage.sZeroRecords == "unit test"; }
-	);
-	
-	oTest.fnWaitTest(
-		"Text is shown when empty table (after filtering)",
-		function () { oTable.fnFilter('nothinghere2'); },
-		function () {
-			if ( $('#example tbody tr td').length == 0 )
-				return false;
-			return $('#example tbody tr td')[0].innerHTML == "unit test"
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/oSearch.js
+++ /dev/null
@@ -1,100 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "oSearch" );
 
-/* Note with my server-side scripts the regex option has no effect - this just runs that down */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default values should be blank",
-		null,
-		function () {
-			var bReturn = oSettings.oPreviousSearch.sSearch == "" && 
-			              !oSettings.oPreviousSearch.bRegex;
-			return bReturn;
-		}
-	);
-	
-	/* This test might be considered iffy since the full object isn't given, but it's reasonable to
-	 * expect DataTables to cope with this. It should just assumine regex false
-	 */
-	oTest.fnWaitTest( 
-		"Search term only in object",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oSearch": {
-					"sSearch": "Mozilla"
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "1"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"New search will kill old one",
-		function () {
-			oTable.fnFilter("Opera");
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Opera 7.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search plain text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oSearch": {
-					"sSearch": "DS",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Nintendo DS browser"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search plain text term and escape regex false",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oSearch": {
-					"sSearch": "Opera",
-					"bRegex": true
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Opera 7.0"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Search regex text term and escape regex true",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-				"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"oSearch": {
-					"sSearch": "1.*",
-					"bRegex": false
-				}
-			} );
-		},
-		function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "No matching records found"; }
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/sAjaxSource.js
+++ /dev/null
@@ -1,23 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sAjaxSource" );
 
-/* Sanitfy check really - all the other tests blast this */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Server side is off by default",
-		null,
-		function () { 
-			return oSettings.sAjaxSource == "../../../examples/examples_support/server_processing.php";
-		}
-	);
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/sDom.js
+++ /dev/null
@@ -1,269 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sDom" );
 
-/* This is going to be brutal on the browser! There is a lot that can be tested here... */
-
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Default DOM varaible",
-		null,
-		function () { return oSettings.sDom == "lfrtip"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Default DOM in document",
-		null,
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 1 in code propagates",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": '<"wrapper"flipt>'
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () { return oSettings.sDom == '<"wrapper"flipt>'; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 1 in DOM",
-		null,
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			var nCustomWrapper = $('div.wrapper')[0];
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrapper &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nLength &&
-				nNodes[4] == nInfo &&
-				nNodes[5] == nPaging &&
-				nNodes[6] == nTable;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check example 2 in DOM",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": '<lf<t>ip>'
-			} );
-		},
-		function () {
-			var jqNodes = $('#demo div, #demo table');
-			var nNodes = [];
-			var nCustomWrappers = []
-			
-			/* Strip the paging nodes */
-			for ( var i=0, iLen=jqNodes.length ; i<iLen ; i++ )
-			{
-				if ( jqNodes[i].getAttribute('id') != "example_previous" &&
-				     jqNodes[i].getAttribute('id') != "example_next" )
-				{
-					nNodes.push( jqNodes[i] );
-				}
-				
-				/* Only the two custom divs don't have class names */
-				if ( !jqNodes[i].getAttribute('class') )
-				{
-					nCustomWrappers.push( jqNodes[i] );
-				}
-			}
-			
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nCustomWrappers[0] &&
-				nNodes[2] == nLength &&
-				nNodes[3] == nFilter &&
-				nNodes[4] == nCustomWrappers[1] &&
-				nNodes[5] == nTable &&
-				nNodes[6] == nInfo &&
-				nNodes[7] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no length element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": 'frtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				null == nLength &&
-				nNodes[1] == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no filter element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": 'lrtip'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				null == nFilter &&
-				nNodes[2] == nTable &&
-				nNodes[3] == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	/* Note we don't test for no table as this is not supported (and it would be fairly daft! */
-	
-	oTest.fnWaitTest( 
-		"Check no info element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": 'lfrtp'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				null == nInfo &&
-				nNodes[4] == nPaging;
-			return bReturn;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check no paging element",
-		function () {
-			oSession.fnRestore();
-			$('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sDom": 'lfrti'
-			} );
-		},
-		function () {
-			var nNodes = $('#demo div, #demo table');
-			var nWrapper = document.getElementById('example_wrapper');
-			var nLength = document.getElementById('example_length');
-			var nFilter = document.getElementById('example_filter');
-			var nInfo = document.getElementById('example_info');
-			var nPaging = document.getElementById('example_paginate');
-			var nTable = document.getElementById('example');
-			
-			var bReturn = 
-				nNodes[0] == nWrapper &&
-				nNodes[1] == nLength &&
-				nNodes[2] == nFilter &&
-				nNodes[3] == nTable &&
-				nNodes[4] == nInfo &&
-				null == nPaging;
-			return bReturn;
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/tests_onhold/4_server-side/sPaginationType.js
+++ /dev/null
@@ -1,138 +1,1 @@
-// DATA_TEMPLATE: empty_table
-oTest.fnStart( "sPaginationType" );
 
-$(document).ready( function () {
-	/* Check the default */
-	var oTable = $('#example').dataTable( {
-		"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php"
-	} );
-	var oSettings = oTable.fnSettings();
-	
-	oTest.fnWaitTest( 
-		"Check two button paging is the default",
-		null,
-		function () { return oSettings.sPaginationType == "two_button"; }
-	);
-	
-	oTest.fnWaitTest( 
-		"Check class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_two_button'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Two div elements are in the wrapper",
-		null,
-		function () { return $('#example_paginate div').length == 2; }
-	);
-	
-	oTest.fnWaitTest( 
-		"We have the previous button",
-		null,
-		function () { return document.getElementById('example_previous'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"We have the next button",
-		null,
-		function () { return document.getElementById('example_next'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Previous button is disabled",
-		null,
-		function () { return $('#example_previous').hasClass('paginate_disabled_previous'); }
-	);
-	
-	oTest.fnWaitTest( 
-		"Next button is enabled",
-		null,
-		function () { return $('#example_next').hasClass('paginate_enabled_next'); }
-	);
-	
-	/* Don't test paging - that's done by the zero config test script. */
-	
-	
-	/* Two buttons paging */
-	var bComplete = false;
-	oTest.fnWaitTest( 
-		"Can enabled full numbers paging",
-		function () {
-			oSession.fnRestore();
-			oTable = $('#example').dataTable( {
-				"bServerSide": true,
-		"sAjaxSource": "../../../examples/examples_support/server_processing.php",
-				"sPaginationType": "full_numbers",
-				"fnInitComplete": function () {
-					setTimeout( function () {
-						bComplete = true;
-					}, 500 );
-				}
-			} );
-			oSettings = oTable.fnSettings();
-		},
-		function () {
-			if ( bComplete )
-				return oSettings.sPaginationType == "full_numbers";
-			else
-				return false;
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Check full numbers class is applied",
-		null,
-		function () { return $('#example_paginate').hasClass('paging_full_numbers'); }
-	);
-	
-	
-	var nFirst, nPrevious, nNext, nLast;
-	oTest.fnWaitTest( 
-		"Jump to last page",
-		function () {
-			nFirst = $('div.dataTables_paginate span.first');
-			nPrevious = $('div.dataTables_paginate span.previous');
-			nNext = $('div.dataTables_paginate span.next');
-			nLast = $('div.dataTables_paginate span.last');
-			nLast.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Go to two pages previous",
-		function () {
-			nPrevious.click();
-			nPrevious.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 31 to 40 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Next (second last) page",
-		function () {
-			nNext.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 41 to 50 of 57 entries";
-		}
-	);
-	
-	oTest.fnWaitTest( 
-		"Jump to first page",
-		function () {
-			nFirst.click();
-		},
-		function () {
-			return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries";
-		}
-	);
-	
-	
-	oTest.fnComplete();
-} );

--- a/media/unit_testing/unit_test.js
+++ /dev/null
@@ -1,406 +1,1 @@
-/*
- * File:        unit_test.js
- * Version:     0.0.1
- * CVS:         $Id$
- * Description: Unit test framework
- * Author:      Allan Jardine (www.sprymedia.co.uk)
- * Created:     Sun Mar  8 22:02:49 GMT 2009
- * Modified:    $Date$ by $Author$
- * Language:    Javascript
- * License:     GPL v2 or BSD 3 point style
- * Project:     DataTables
- * Contact:     allan.jardine@sprymedia.co.uk
- * 
- * Copyright 2009 Allan Jardine, all rights reserved.
- *
- * Description:
- * This is a javascript library suitable for use as a unit testing framework. Employing a queuing
- * mechanisim to take account of async events in javascript, this library will communicates with
- * a controller frame (to report individual test status).
- * 
- */
 
-
-var oTest = {
-	/* Block further tests from occuring - might be end of tests or due to async wait */
-	bBlock: false,
-	
-	/* Number of times to try retesting for a blocking test */
-	iReTestLimit: 20,
-	
-	/* Amount of time to wait between trying for an async test */
-	iReTestDelay: 150,
-	
-	/* End tests - external control */
-	bEnd: false,
-	
-	/* Internal variables */
-	_aoQueue: [],
-	_iReTest: 0,
-	_bFinished: false,
-	
-	
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Recommened public functions
-	 */
-	
-	/*
-	 * Function: fnTest
-	 * Purpose:  Add a test to the queue
-	 * Returns:  -
-	 * Inputs:   string:sMessage - name of the test
-	 *           function:fnTest - function which will be evaludated to get the test result
-	 */
-	"fnTest": function ( sMessage, fnSetup, fnTest )
-	{
-		this._aoQueue.push( {
-			"sMessage": sMessage,
-			"fnSetup": fnSetup,
-			"fnTest": fnTest,
-			"bPoll": false
-		} );
-		this._fnNext();
-	},
-	
-	/*
-	 * Function: fnWaitTest
-	 * Purpose:  Add a test to the queue which has a re-test cycle
-	 * Returns:  -
-	 * Inputs:   string:sMessage - name of the test
-	 *           function:fnTest - function which will be evaludated to get the test result
-	 */
-	"fnWaitTest": function ( sMessage, fnSetup, fnTest )
-	{
-		this._aoQueue.push( {
-			"sMessage": sMessage,
-			"fnSetup": fnSetup,
-			"fnTest": fnTest,
-			"bPoll": true
-		} );
-		this._fnNext();
-	},
-	
-	/*
-	 * Function: fnStart
-	 * Purpose:  Indicate that this is a new unit and what it is testing (message to end user)
-	 * Returns:  -
-	 * Inputs:   string:sMessage - message to give to the user about this unit
-	 */
-	"fnStart": function ( sMessage )
-	{
-		window.parent.controller.fnStartMessage( sMessage );
-	},
-	
-	/*
-	 * Function: fnComplete
-	 * Purpose:  Tell the controller that we are all done here
-	 * Returns:  -
-	 * Inputs:   -
-	 */
-	"fnComplete": function ()
-	{
-		this._bFinished = true;
-		this._fnNext();
-	},
-	
-	/*
-	 * Function: fnCookieDestroy
-	 * Purpose:  Destroy a cookie of a given name
-	 * Returns:  -
-	 * Inputs:   -
-	 */
-	"fnCookieDestroy": function ( oTable )
-	{
-		var sName = oTable.fnSettings().sCookiePrefix+oTable.fnSettings().sInstance;
-		var aParts = window.location.pathname.split('/');
-		var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
-		document.cookie = sNameFile+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
-			aParts.join('/') + "/";
-	},
-	
-	
-	
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 * Internal functions
-	 */
-	
-	
-	"_fnReTest": function ( oTestInfo )
-	{
-		var bResult = oTestInfo.fnTest( );
-		if ( bResult )
-		{
-			/* Test passed on retry */
-			this._fnResult( true );
-			this._fnNext();
-		}
-		else
-		{
-			if ( this._iReTest < this.iReTestLimit )
-			{
-				this._iReTest++;
-				setTimeout( function() {
-					oTest._fnReTest( oTestInfo );
-				}, this.iReTestDelay );
-			}
-			else
-			{
-				this._fnResult( false );
-			}
-		}
-	},
-	
-	"_fnNext": function ()
-	{
-		if ( this.bEnd )
-		{
-			return;
-		}
-		
-		if ( !this.bBlock && this._aoQueue.length > 0 )
-		{
-			var oNextTest = this._aoQueue.shift();
-			window.parent.controller.fnTestStart( oNextTest.sMessage );
-			this.bBlock = true;
-			
-			if ( typeof oNextTest.fnSetup == 'function' )
-			{
-				oNextTest.fnSetup( );
-			}
-			var bResult = oNextTest.fnTest( );
-			//bResult = false;
-			
-			if ( oNextTest.bPoll )
-			{
-				if ( bResult )
-				{
-					this._fnResult( true );
-					this._fnNext();
-				}
-				else
-				{
-					_iReTest = 0;
-					setTimeout( function() {
-						oTest._fnReTest( oNextTest );
-					}, this.iReTestDelay );
-				}
-			}
-			else
-			{
-				this._fnResult( bResult );
-				this._fnNext();
-			}
-		}
-		else if ( !this.bBlock && this._aoQueue.length == 0 && this._bFinished )
-		{
-			window.parent.controller.fnUnitComplete( );
-		}
-	},
-	
-	"_fnResult": function ( b )
-	{
-		window.parent.controller.fnTestResult( b );
-		this.bBlock = false;
-		if ( !b )
-		{
-			this.bEnd = true;
-		}
-	}
-};
-
-
-var oDispacher = {
-	"click": function ( nNode, oSpecial )
-	{
-		var evt = this.fnCreateEvent( 'click', nNode, oSpecial );
-		if ( nNode.dispatchEvent )
-			nNode.dispatchEvent(evt);
-		else
-			nNode.fireEvent('onclick', evt);
-	},
-	
-	"change": function ( nNode )
-	{
-		var evt = this.fnCreateEvent( 'change', nNode );
-		if ( nNode.dispatchEvent )
-		nNode.dispatchEvent(evt);
-		else
-			nNode.fireEvent('onchange', evt);
-	},
-	
-	
-	/*
-	 * Function: fnCreateEvent
-	 * Purpose:  Create an event oject based on the type to trigger an event - x-platform
-	 * Returns:  event:evt
-	 * Inputs:   string:sType - type of event
-	 *           node:nTarget - target node of the event
-	 */
-	fnCreateEvent: function( sType, nTarget, oSpecial )
-	{
-		var evt = null;
-		var oTargetPos = this._fnGetPos( nTarget );
-		var sTypeGroup = this._fnEventTypeGroup( sType );
-		if ( typeof oSpecial == 'undefined' )
-		{
-			oSpecial = {};
-		}
-		
-		var ctrlKey = false;
-		var altKey = false;
-		var shiftKey = (typeof oSpecial.shift != 'undefined') ? oSpecial.shift : false;
-		var metaKey = false;
-		var button = false;
-		
-		if ( document.createEvent )
-		{
-			switch ( sTypeGroup )
-			{
-				case 'mouse':
-					evt = document.createEvent( "MouseEvents" );
-					evt.initMouseEvent( sType, true, true, window, 0, oTargetPos[0], oTargetPos[1], 
-						oTargetPos[0], oTargetPos[1], ctrlKey, altKey, shiftKey, 
-						metaKey, button, null );
-					break;
-				
-				case 'html':
-					evt = document.createEvent( "HTMLEvents" );
-					evt.initEvent( sType, true, true );
-					break;
-					
-				case 'ui':
-					evt = document.createEvent( "UIEvents" );
-					evt.initUIEvent( sType, true, true, window, 0 );
-					break;
-				
-				default:
-					break;
-			}
-		}
-		else if ( document.createEventObject )
-		{
-			switch ( sTypeGroup )
-			{
-				case 'mouse':
-					evt = document.createEventObject();
-					evt.screenX = oTargetPos[0];
-					evt.screenX = oTargetPos[1];
-					evt.clientX = oTargetPos[0];
-					evt.clientY = oTargetPos[1];
-					evt.ctrlKey = ctrlKey;
-					evt.altKey = altKey;
-					evt.shiftKey = shiftKey;
-					evt.metaKey = metaKey;
-					evt.button = button;
-					evt.relatedTarget = null;
-					break;
-				
-				case 'html':
-					/* fall through to basic event object */
-					
-				case 'ui':
-					evt = document.createEventObject();
-					break;
-				
-				default:
-					break;
-			}
-		}
-		
-		return evt;
-	},
-	
-	/* 
-	 * Function: DesignCore.fnGetPos
-	 * Purpose:  Get the position of an element on the page
-	 * Returns:  array[ 0-int:left, 1-int:top ]
-	 * Inputs:   node:obj - node to analyse
-	 */
-	_fnGetPos: function ( obj ) 
-	{
-		var curleft = 0;
-		var curtop = 0;
-		
-		if (obj.offsetParent) 
-		{
-			curleft = obj.offsetLeft;
-			curtop = obj.offsetTop;
-			while (obj = obj.offsetParent ) 
-			{
-				curleft += obj.offsetLeft;
-				curtop += obj.offsetTop;
-			}
-		}
-		return [curleft,curtop];
-	},
-	
-	
-	/*
-	 * Function: _fnEventTypeGroup
-	 * Purpose:  Group the event types as per w3c groupings
-	 * Returns:  -
-	 * Inputs:   string:sType
-	 */
-	_fnEventTypeGroup: function ( sType )
-	{
-		switch ( sType )
-		{
-			case 'click':
-			case 'dblclick':
-			case 'mousedown':
-			case 'mousemove':
-			case 'mouseout':
-			case 'mouseover':
-			case 'mouseup':
-				return 'mouse';
-			
-			case 'change':
-			case 'focus':
-			case 'blur':
-			case 'select':
-			case 'submit':
-				return 'html';
-				
-			case 'keydown':
-			case 'keypress':
-			case 'keyup':
-			case 'load':
-			case 'unload':
-				return 'ui';
-			
-			default:
-				return 'custom';
-		}
-	}
-}
-
-
-var oSession = {
-	nTable: null,
-	
-	fnCache: function ()
-	{
-		this.nTable = document.getElementById('demo').cloneNode(true);
-	},
-	
-	fnRestore: function ()
-	{
-		while( $.fn.dataTableSettings.length > 0 )
-		{
-			$.fn.dataTableSettings[0].oInstance.fnDestroy();
-		}
-		//$.fn.dataTableSettings.splice( 0, $.fn.dataTableSettings.length );
-		var nDemo = document.getElementById('demo');
-		nDemo.innerHTML = "";
-		for ( var i=0, iLen=this.nTable.childNodes.length ; i<iLen ; i++ )
-		{
-			nDemo.appendChild( this.nTable.childNodes[0] );
-		}
-		this.fnCache();
-	}
-}
-
-$(document).ready( function () {
-	oSession.fnCache();
-} );
-