fixed image search for iframes + added default content for iframes and flash content

build/html2canvas.js

@@ -43,6 +43,7 @@ function html2canvas(el, userOptions) {
         ready: function (canvas) {
             document.body.appendChild(canvas);
         },
+        iframeDefault: "default",
         flashCanvasPath: "http://html2canvas.hertzen.com/external/flashcanvas/flashcanvas.js",
         renderViewport: false		
     });
@@ -60,7 +61,7 @@ function html2canvas(el, userOptions) {
     this.fontData = [];
     this.ignoreElements = "IFRAME|OBJECT|PARAM";
     
-  
+    this.ignoreRe = new RegExp("("+this.ignoreElements+")");
     
     // test how to measure text bounding boxes
     this.useRangeBounds = false;
@@ -475,6 +476,17 @@ html2canvas.prototype.newElement = function(el){
 
 
 
+    if (this.ignoreRe.test(el.nodeName) && this.opts.iframeDefault != "transparent"){ 
+        if (this.opts.iframeDefault=="default"){
+            bgcolor = "#efefef";
+            /*
+             * TODO write X over frame
+             */
+        }else{
+            bgcolor = this.opts.iframeDefault;           
+        }
+    }
+               
     // draw base element bgcolor       
     this.newRect(
         x+borders[3].width,
@@ -546,6 +558,7 @@ html2canvas.prototype.getImages = function(el) {
         
     var self = this;
     
+    if (!this.ignoreRe.test(el.nodeName)){
         // TODO remove jQuery dependancy
         this.each($(el).contents(),function(i,element){    
             var ignRe = new RegExp("("+this.ignoreElements+")");
@@ -553,6 +566,7 @@ html2canvas.prototype.getImages = function(el) {
                 self.getImages(element);
             }
         })
+    }
           
     if (el.nodeType==1 || typeof el.nodeType == "undefined"){
         var background_image = this.getCSS(el,'background-image');
@@ -839,12 +853,14 @@ html2canvas.prototype.parseElement = function(element){
         
 html2canvas.prototype.parsing = function(el){
     
-    var ignRe = new RegExp("("+this.ignoreElements+")");
     var _ = this;
-    if (!ignRe.test(el.nodeName)){
-            
     
     this.newElement(el);
+   
+    if (!this.ignoreRe.test(el.nodeName)){
+            
+         		
+        
         // TODO remove jQuery dependancy
 
         var contents = $(el).contents();

src/Core.js

@@ -13,6 +13,7 @@ function html2canvas(el, userOptions) {
         ready: function (canvas) {
             document.body.appendChild(canvas);
         },
+        iframeDefault: "default",
         flashCanvasPath: "http://html2canvas.hertzen.com/external/flashcanvas/flashcanvas.js",
         renderViewport: false		
     });
@@ -30,7 +31,7 @@ function html2canvas(el, userOptions) {
     this.fontData = [];
     this.ignoreElements = "IFRAME|OBJECT|PARAM";
     
-  
+    this.ignoreRe = new RegExp("("+this.ignoreElements+")");
     
     // test how to measure text bounding boxes
     this.useRangeBounds = false;

src/Draw.js

@@ -59,6 +59,17 @@ html2canvas.prototype.newElement = function(el){
 
 
 
+    if (this.ignoreRe.test(el.nodeName) && this.opts.iframeDefault != "transparent"){ 
+        if (this.opts.iframeDefault=="default"){
+            bgcolor = "#efefef";
+            /*
+             * TODO write X over frame
+             */
+        }else{
+            bgcolor = this.opts.iframeDefault;           
+        }
+    }
+               
     // draw base element bgcolor       
     this.newRect(
         x+borders[3].width,

src/Images.js

@@ -5,6 +5,7 @@ html2canvas.prototype.getImages = function(el) {
         
     var self = this;
     
+    if (!this.ignoreRe.test(el.nodeName)){
         // TODO remove jQuery dependancy
         this.each($(el).contents(),function(i,element){    
             var ignRe = new RegExp("("+this.ignoreElements+")");
@@ -12,6 +13,7 @@ html2canvas.prototype.getImages = function(el) {
                 self.getImages(element);
             }
         })
+    }
           
     if (el.nodeType==1 || typeof el.nodeType == "undefined"){
         var background_image = this.getCSS(el,'background-image');

src/Traversing.js

@@ -14,12 +14,14 @@ html2canvas.prototype.parseElement = function(element){
         
 html2canvas.prototype.parsing = function(el){
     
-    var ignRe = new RegExp("("+this.ignoreElements+")");
     var _ = this;
-    if (!ignRe.test(el.nodeName)){
-            
     
     this.newElement(el);
+   
+    if (!this.ignoreRe.test(el.nodeName)){
+            
+         		
+        
         // TODO remove jQuery dependancy
 
         var contents = $(el).contents();

tests/external-content.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>External content tests</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link href="#" type="text/css" rel="stylesheet"> 
+
+        <script type="text/javascript" src="../external/jquery-1.6.2.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">
+            $(window).ready(function() {       
+                $('body').html2canvas();
+            });
+        </script>
+
+
+    </head>
+    <body>         
+        <h1>Iframe</h1>
+        <iframe src="http://www.google.com" style="width:400px;height:300px;border:5px solid black;"></iframe>
+    </body>
+</html>