From 68d2c5083289a6134087d9a1b5b31ef9c9909d6d Mon Sep 17 00:00:00 2001
From: MoyuScript <i@moyu.moe>
Date: Fri, 2 Mar 2012 18:22:23 +0100
Subject: [PATCH] update tests/origin.html to use the new options overriding

allow tests to override selector and rendering options
---
 tests/origin.html | 15 ++++-----------
 tests/test.js     |  5 +++--
 2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/tests/origin.html b/tests/origin.html
index ce596ca..57207ed 100644
--- a/tests/origin.html
+++ b/tests/origin.html
@@ -1,22 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html>
     <head>
-
-        <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
-        <script type="text/javascript" src="../build/html2canvas.js"></script>
-        <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
+        <script type="text/javascript" src="test.js"></script>
         <script type="text/javascript">
-            $(document).ready(function() {
-                $('#bar').html2canvas();
-                // var ss = $('ul').offset();
-                // alert(ss.left);
-            });
+        h2cSelector = '#bar';
         </script>
         <title>
-			 display/box/float/clear test 
+            display/box/float/clear test
         </title>
         <style type="text/css">
-            /* last modified: 1 Dec 98 */ 	
+            /* last modified: 1 Dec 98 */
 
             html {
                 font: 10px/1 Verdana, sans-serif;
diff --git a/tests/test.js b/tests/test.js
index 81bbf5f..74135bc 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -5,6 +5,7 @@
 
   Released under MIT License
 */
+var h2cSelector = document.body, h2cOptions;
 (function(document, window) {
     var scrStart = '<script type="text/javascript" src="', scrEnd = '"></script>';
     document.write(scrStart + '../external/jquery-1.6.2.js' + scrEnd);
@@ -17,12 +18,12 @@
             window.setUp();
         }
         setTimeout(function() {
-            $(document.body).html2canvas((typeof h2cOptions !== "undefined") ? h2cOptions : {
+            $(h2cSelector).html2canvas($.extend({
                 flashcanvas: "../external/flashcanvas.min.js",
                 logging: true,
                 profile: true,
                 useCORS: true
-            });
+            }, h2cOptions));
         }, 100);
     };
 }(document, window));
