Skip to content

Commit 187ae98

Browse files
cobexercobexer
committed
update tests/origin.html to use the new options overriding
allow tests to override selector and rendering options
1 parent 38fe643 commit 187ae98

2 files changed

Lines changed: 7 additions & 13 deletions

File tree

‎tests/origin.html‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
22
<html>
33
<head>
4-
5-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
6-
<script type="text/javascript" src="../build/html2canvas.js"></script>
7-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
4+
<script type="text/javascript" src="test.js"></script>
85
<script type="text/javascript">
9-
$(document).ready(function() {
10-
$('#bar').html2canvas();
11-
// var ss = $('ul').offset();
12-
// alert(ss.left);
13-
});
6+
h2cSelector = '#bar';
147
</script>
158
<title>
16-
display/box/float/clear test
9+
display/box/float/clear test
1710
</title>
1811
<style type="text/css">
19-
/* last modified: 1 Dec 98 */
12+
/* last modified: 1 Dec 98 */
2013

2114
html {
2215
font: 10px/1 Verdana, sans-serif;

‎tests/test.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
66
Released under MIT License
77
*/
8+
var h2cSelector = document.body, h2cOptions;
89
(function(document, window) {
910
var scrStart = '<script type="text/javascript" src="', scrEnd = '"></script>';
1011
document.write(scrStart + '../external/jquery-1.6.2.js' + scrEnd);
@@ -17,12 +18,12 @@
1718
window.setUp();
1819
}
1920
setTimeout(function() {
20-
$(document.body).html2canvas((typeof h2cOptions !== "undefined") ? h2cOptions : {
21+
$(h2cSelector).html2canvas($.extend({
2122
flashcanvas: "../external/flashcanvas.min.js",
2223
logging: true,
2324
profile: true,
2425
useCORS: true
25-
});
26+
}, h2cOptions));
2627
}, 100);
2728
};
2829
}(document, window));

0 commit comments

Comments
 (0)