From fe95bc66c66b396484fd199b391f8868606c918a Mon Sep 17 00:00:00 2001
From: CitizenOfRome <rome@rangergo.net>
Date: Tue, 8 Jun 2021 17:26:20 +0530
Subject: [PATCH] v1.6.1: Added full canvas support

---
 README.md                |  5 +----
 bower.json               |  5 +----
 demo/index.html          | 16 +++++++++++++++-
 dist/jQuery.print.min.js |  5 ++---
 jQuery.print.js          | 30 ++++++++++++++++++++++++++----
 package.json             |  5 +----
 yarn.lock                |  8 ++++++++
 7 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 yarn.lock

diff --git a/README.md b/README.md
index c94574b..fb7909b 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,4 @@ Currently this plugin supports the following options:
 [CC-BY](http://creativecommons.org/licenses/by/3.0/).
 
 ## Demo
-[jQuery.print/demo](http://doersguild.github.io/jQuery.print/demo/)
-
----------------------------------------
-Like our [work](http://doersguild.com)? [Get in touch!](mailto:mail@doersguild.com)
+[jQuery.print/demo](http://doersguild.github.io/jQuery.print/demo/)
\ No newline at end of file
diff --git a/bower.json b/bower.json
index e3a292e..6c44c6d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,11 +1,8 @@
 {
     "name": "jQuery.print",
     "main": "dist/jQuery.print.min.js",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "homepage": "https://doersguild.github.io/jQuery.print/",
-    "authors": [
-      "Sathvik P <sathvik@doersguild.com>"
-    ],
     "description": "Easy to use, Element Printing Plugin for jQuery, for printing specific parts of a page",
     "keywords": [
       "print",
diff --git a/demo/index.html b/demo/index.html
index 34c56af..a29bd5d 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -20,6 +20,13 @@
         .b {
             color: #aaa;
         }
+        #canvasExample {
+            height: 5em;
+            max-width:  100%;
+            border: 0.2em solid #777;
+            display: block;
+            margin-bottom: 1em;
+        }
         </style>
         <!--[if lt IE 9]>
         <script src="js/vendor/html5-3.6-respond-1.1.0.min.js"></script>
@@ -46,6 +53,8 @@ <h3>Element 2</h3>
                 <p>
                 Some other random text.
                 </p>
+                Canvas:
+                <canvas id="canvasExample"></canvas>
                 <button class="print-link no-print">
                 Print this ($.print("#ele2")) and skip the button (.no-print)
                 </button>
@@ -104,6 +113,12 @@ <h3 class='avoid-this'>Element 4</h3>
         <script type='text/javascript'>
         //<![CDATA[
         jQuery(function($) { 'use strict';
+            try {
+                var original = document.getElementById('canvasExample');
+                original.getContext('2d').fillRect(20, 20, 120, 120);
+            } catch (err) {
+                console.warn(err)
+            }
             $("#ele2").find('.print-link').on('click', function() {
                 //Print ele2 with default options
                 $.print("#ele2");
@@ -129,7 +144,6 @@ <h3 class='avoid-this'>Element 4</h3>
                     deferred: $.Deferred().done(function() { console.log('Printing done', arguments); })
                 });
             });
-            // Fork https://github.com/sathvikp/jQuery.print for the full list of options
         });
         //]]>
         </script>
diff --git a/dist/jQuery.print.min.js b/dist/jQuery.print.min.js
index 811cb88..1fb25d5 100644
--- a/dist/jQuery.print.min.js
+++ b/dist/jQuery.print.min.js
@@ -1,6 +1,5 @@
 /* @license 
- * jQuery.print, version 1.6.0
- *  (c) Sathvik Ponangi, Doers' Guild
+ * jQuery.print, version 1.6.1
  * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
  *--------------------------------------------------------------------------*/
-!function(e){"use strict";function t(t,n,r){for(var o=e(t),i=o.clone(n,r),a=o.find("textarea").add(o.filter("textarea")),l=i.find("textarea").add(i.filter("textarea")),c=o.find("select").add(o.filter("select")),d=i.find("select").add(i.filter("select")),f=0,s=a.length;f<s;++f)e(l[f]).val(e(a[f]).val());for(f=0,s=c.length;f<s;++f)for(var p=0,u=c[f].options.length;p<u;++p)!0===c[f].options[p].selected&&(d[f].options[p].selected=!0);return i}function n(n){var r=e("");try{r=t(n)}catch(t){r=e("<span />").html(n)}return r}function r(t,n,r){var o=e.Deferred();try{var i=(t=t.contentWindow||t.contentDocument||t).document||t.contentDocument||t;r.doctype&&i.write(r.doctype),i.write(n),i.close();var a=!1,l=function(){if(!a){t.focus();try{t.document.execCommand("print",!1,null)||t.print(),e("body").focus()}catch(e){t.print()}t.close(),a=!0,o.resolve()}};e(t).on("load",l),setTimeout(l,r.timeout)}catch(e){o.reject(e)}return o}function o(e,t){return r(window.open(),e,t).always(function(){try{t.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}function i(e){return!!("object"==typeof Node?e instanceof Node:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName)}e.print=e.fn.print=function(){var a,l,c=this;c instanceof e&&(c=c.get(0)),i(c)?(l=e(c),arguments.length>0&&(a=arguments[0])):arguments.length>0?i((l=e(arguments[0]))[0])?arguments.length>1&&(a=arguments[1]):(a=arguments[0],l=e("html")):l=e("html");var d={globalStyles:!0,mediaPrint:!1,stylesheet:null,noPrintSelector:".no-print",iframe:!0,append:null,prepend:null,manuallyCopyFormValues:!0,deferred:e.Deferred(),timeout:750,title:null,doctype:"<!doctype html>"};a=e.extend({},d,a||{});var f=e("");a.globalStyles?f=e("style, link, meta, base, title"):a.mediaPrint&&(f=e("link[media=print]")),a.stylesheet&&(f=e.merge(f,e('<link rel="stylesheet" href="'+a.stylesheet+'">')));var s=t(l);if((s=e("<span/>").append(s)).find(a.noPrintSelector).remove(),s.append(t(f)),a.title){var p=e("title",s);0===p.length&&(p=e("<title />"),s.append(p)),p.text(a.title)}s.append(n(a.append)),s.prepend(n(a.prepend)),a.manuallyCopyFormValues&&(s.find("input").each(function(){var t=e(this);t.is("[type='radio']")||t.is("[type='checkbox']")?t.prop("checked")&&t.attr("checked","checked"):t.attr("value",t.val())}),s.find("select").each(function(){e(this).find(":selected").attr("selected","selected")}),s.find("textarea").each(function(){var t=e(this);t.text(t.val())}));var u,h,m,y,v=s.html();try{a.deferred.notify("generated_markup",v,s)}catch(e){console.warn("Error notifying deferred",e)}if(s.remove(),a.iframe)try{u=v,m=e((h=a).iframe+""),0===(y=m.length)&&(m=e('<iframe height="0" width="0" border="0" wmode="Opaque"/>').prependTo("body").css({position:"absolute",top:-999,left:-999})),r(m.get(0),u,h).done(function(){setTimeout(function(){0===y&&m.remove()},1e3)}).fail(function(e){console.error("Failed to print from iframe",e),o(u,h)}).always(function(){try{h.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}catch(e){console.error("Failed to print from iframe",e.stack,e.message),o(v,a)}else o(v,a);return this}}(jQuery);
\ No newline at end of file
+!function(e){"use strict";function t(t,n,r){var o,a,i,l,c,d=e(t),f=d.clone(n,r),s=d.find("textarea").add(d.filter("textarea")),p=f.find("textarea").add(f.filter("textarea")),u=d.find("select").add(d.filter("select")),h=f.find("select").add(f.filter("select")),m=d.find("canvas").add(d.filter("canvas")),y=f.find("canvas").add(f.filter("canvas"));for(o=0,a=s.length;o<a;++o)e(p[o]).val(e(s[o]).val());for(o=0,a=u.length;o<a;++o)for(i=0,l=u[o].options.length;i<l;++i)!0===u[o].options[i].selected&&(h[o].options[i].selected=!0);for(o=0,a=m.length;o<a;++o)(c=m[o].getContext("2d"))&&(y[o].getContext("2d").drawImage(m[o],0,0),e(y[o]).attr("data-jquery-print",c.canvas.toDataURL()));return f}function n(n){var r=e("");try{r=t(n)}catch(t){r=e("<span />").html(n)}return r}function r(t,n,r){var o=e.Deferred();try{var a=(t=t.contentWindow||t.contentDocument||t).document||t.contentDocument||t;r.doctype&&a.write(r.doctype),a.write(n);try{for(var i=a.querySelectorAll("canvas"),l=0;l<i.length;l++){var c=i[l].getContext("2d"),d=new Image;d.onload=function(){c.drawImage(d,0,0)},d.src=i[l].getAttribute("data-jquery-print")}}catch(e){console.warn(e)}a.close();var f=!1,s=function(){if(!f){t.focus();try{t.document.execCommand("print",!1,null)||t.print(),e("body").focus()}catch(e){t.print()}t.close(),f=!0,o.resolve()}};e(t).on("load",s),setTimeout(s,r.timeout)}catch(e){o.reject(e)}return o}function o(e,t){return r(window.open(),e,t).always(function(){try{t.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}function a(e){return!!("object"==typeof Node?e instanceof Node:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName)}e.print=e.fn.print=function(){var i,l,c=this;c instanceof e&&(c=c.get(0)),a(c)?(l=e(c),arguments.length>0&&(i=arguments[0])):arguments.length>0?a((l=e(arguments[0]))[0])?arguments.length>1&&(i=arguments[1]):(i=arguments[0],l=e("html")):l=e("html");var d={globalStyles:!0,mediaPrint:!1,stylesheet:null,noPrintSelector:".no-print",iframe:!0,append:null,prepend:null,manuallyCopyFormValues:!0,deferred:e.Deferred(),timeout:750,title:null,doctype:"<!doctype html>"};i=e.extend({},d,i||{});var f=e("");i.globalStyles?f=e("style, link, meta, base, title"):i.mediaPrint&&(f=e("link[media=print]")),i.stylesheet&&(f=e.merge(f,e('<link rel="stylesheet" href="'+i.stylesheet+'">')));var s=t(l,!0,!0);if((s=e("<span/>").append(s)).find(i.noPrintSelector).remove(),s.append(t(f)),i.title){var p=e("title",s);0===p.length&&(p=e("<title />"),s.append(p)),p.text(i.title)}s.append(n(i.append)),s.prepend(n(i.prepend)),i.manuallyCopyFormValues&&(s.find("input").each(function(){var t=e(this);t.is("[type='radio']")||t.is("[type='checkbox']")?t.prop("checked")&&t.attr("checked","checked"):t.attr("value",t.val())}),s.find("select").each(function(){e(this).find(":selected").attr("selected","selected")}),s.find("textarea").each(function(){var t=e(this);t.text(t.val())}));var u=s.html();try{i.deferred.notify("generated_markup",u,s)}catch(e){console.warn("Error notifying deferred",e)}if(s.remove(),i.iframe)try{!function(t,n){var a=e(n.iframe+""),i=a.length;0===i&&(a=e('<iframe height="0" width="0" border="0" wmode="Opaque"/>').prependTo("body").css({position:"absolute",top:-999,left:-999})),r(a.get(0),t,n).done(function(){setTimeout(function(){0===i&&a.remove()},1e3)}).fail(function(e){console.error("Failed to print from iframe",e),o(t,n)}).always(function(){try{n.deferred.resolve()}catch(e){console.warn("Error notifying deferred",e)}})}(u,i)}catch(e){console.error("Failed to print from iframe",e.stack,e.message),o(u,i)}else o(u,i);return this}}(jQuery);
\ No newline at end of file
diff --git a/jQuery.print.js b/jQuery.print.js
index de758f7..6493e33 100644
--- a/jQuery.print.js
+++ b/jQuery.print.js
@@ -1,6 +1,5 @@
 /* @license 
- * jQuery.print, version 1.6.0
- *  (c) Sathvik Ponangi, Doers' Guild
+ * jQuery.print, version 1.6.1
  * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
  *--------------------------------------------------------------------------*/
 (function ($) {
@@ -16,7 +15,9 @@
             $resultTextareas = $result.find('textarea').add($result.filter('textarea')),
             $mySelects       = $elmToClone.find('select').add($elmToClone.filter('select')),
             $resultSelects   = $result.find('select').add($result.filter('select')),
-            i, l, j, m;
+            $myCanvas       = $elmToClone.find('canvas').add($elmToClone.filter('canvas')),
+            $resultCanvas   = $result.find('canvas').add($result.filter('canvas')),
+            i, l, j, m, myCanvasContext;
 
         for (i = 0, l = $myTextareas.length; i < l; ++i) {
             $($resultTextareas[i]).val($($myTextareas[i]).val());
@@ -28,6 +29,14 @@
                 }
             }
         }
+        for (i = 0, l = $myCanvas.length; i < l; ++i) {
+            // https://stackoverflow.com/a/41242597
+            myCanvasContext = $myCanvas[i].getContext('2d');
+            if(myCanvasContext) {
+                $resultCanvas[i].getContext('2d').drawImage($myCanvas[i], 0,0);
+                $($resultCanvas[i]).attr("data-jquery-print", myCanvasContext.canvas.toDataURL());
+            }
+        }
         return $result;
     }
 
@@ -53,6 +62,19 @@
                 wdoc.write(options.doctype);
             }
             wdoc.write(content);
+            try {
+                var canvas = wdoc.querySelectorAll('canvas');
+                for(var i = 0; i < canvas.length; i++) {
+                    var ctx = canvas[i].getContext("2d");
+                    var image = new Image();
+                    image.onload = function() {
+                        ctx.drawImage(image, 0, 0);
+                    };
+                    image.src = canvas[i].getAttribute("data-jquery-print");
+                }
+            } catch (err) {
+                console.warn(err);
+            }
             wdoc.close();
             var printed = false,
                 callPrint = function () {
@@ -205,7 +227,7 @@
             $styles = $.merge($styles, $('<link rel="stylesheet" href="' + options.stylesheet + '">'));
         }
         // Create a copy of the element to print
-        var copy = jQueryCloneWithSelectAndTextAreaValues($this);
+        var copy = jQueryCloneWithSelectAndTextAreaValues($this, true, true);
         // Wrap it in a span to get the HTML markup string
         copy = $("<span/>")
             .append(copy);
diff --git a/package.json b/package.json
index 09a8221..cdebd56 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,8 @@
   "name": "jQuery.print",
   "filename": "jQuery.print.min.js",
   "main": "jQuery.print.js",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "homepage": "https://doersguild.github.io/jQuery.print/",
-  "authors": [
-    "Sathvik P <sathvik@doersguild.com>"
-  ],
   "description": "Easy to use, Element Printing Plugin for jQuery, for printing specific parts of a page",
   "keywords": [
     "print",
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..7bc72a6
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+jquery@>=1.7.2:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==