Merge branch 'Villentrenmerth-master'

Sathvik P · Sathvik P · commit 8b72130c0008 · 2016-09-15T19:06:06.000+05:30
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ You can submit the options object like:
         	prepend: null,
         	manuallyCopyFormValues: true,
         	deferred: $.Deferred(),
-        	timeout: 250,
+        	timeout: 750,
                 title: null,
                 doctype: '<!doctype html>'
 	});
@@ -93,9 +93,9 @@ Currently this plugin supports the following options:
 
 ####timeout
 
- - Default: `250`
+ - Default: `750`
  - Acceptable-Values: Time in Milliseconds for `setTimeout`
- - Function: To change the amount of time to wait for the content, etc to load before printing the element from the new window/iframe created
+ - Function: To change the amount of max time to wait for the content, etc to load before printing the element from the new window/iframe created, as a fallback if the [`load` event](https://developer.mozilla.org/en-US/docs/Web/Events/load) for the new window/iframe has not fired yet
  
 ####title
 
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "jQuery.print",
     "main": "jQuery.print.js",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "homepage": "https://doersguild.github.io/jQuery.print/",
     "authors": [
       "Sathvik P <sathvik@doersguild.com>"
diff --git a/demo/index.html b/demo/index.html
@@ -47,7 +47,7 @@ <h3>Element 2</h3>
                 Some other random text.
                 </p>
                 <button class="print-link no-print">
-                Print this ($.print("#ele2")) and skip the button
+                Print this ($.print("#ele2")) and skip the button (.no-print)
                 </button>
             </div>
             <div id="ele3" class="a">
@@ -64,13 +64,34 @@ <h3 class='avoid-this'>Element 4</h3>
                 <p>
                 Some really random text.
                 </p>
+                <pre><code>
+                $("#ele4").find('button').on('click', function() {
+                    //Print ele4 with custom options
+                    $("#ele4").print({
+                        //Use Global styles
+                        globalStyles : false,
+                        //Add link with attrbute media=print
+                        mediaPrint : false,
+                        //Custom stylesheet
+                        stylesheet : "http://fonts.googleapis.com/css?family=Inconsolata",
+                        //Print in a hidden iframe
+                        iframe : false,
+                        //Don't print this
+                        noPrintSelector : ".avoid-this",
+                        //Add this at top
+                        prepend : "Hello World!!!<br/>",
+                        //Add this on bottom
+                        append : "<br/>Buh Bye!"
+                    });
+                });
+                </code></pre>
                 <button class="print-link avoid-this">
                 Print this in a new window, without this button and the title
                 </button>
             </div>
             <br/>
             <button class="print-link" onclick="jQuery.print()">
-            Print page
+            Print page - jQuery.print()
             </button>
         </div>
         <script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
diff --git a/jQuery.print.js b/jQuery.print.js
@@ -1,5 +1,5 @@
 /* @license 
- * jQuery.print, version 1.4.0
+ * jQuery.print, version 1.5.0
  *  (c) Sathvik Ponangi, Doers' Guild
  * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
  *--------------------------------------------------------------------------*/
@@ -30,7 +30,11 @@
             }
             wdoc.write(content);
             wdoc.close();
-            setTimeout(function () {
+            var printed = false;
+            function callPrint() {
+                if(printed) {
+                    return;
+                }
                 // Fix for IE : Allow it to render the iframe
                 frameWindow.focus();
                 try {
@@ -43,8 +47,13 @@
                     frameWindow.print();
                 }
                 frameWindow.close();
+                printed = true;
                 def.resolve();
-            }, options.timeout);
+            }
+            // Print once the frame window loads - seems to work for the new-window option but unreliable for the iframe
+            $(frameWindow).on("load", callPrint);
+            // Fallback to printing directly if the frame doesn't fire the load event for whatever reason
+            setTimeout(callPrint, options.timeout);
         } catch (err) {
             def.reject(err);
         }
@@ -151,7 +160,7 @@
             prepend: null,
             manuallyCopyFormValues: true,
             deferred: $.Deferred(),
-            timeout: 250,
+            timeout: 750,
             title: null,
             doctype: '<!doctype html>'
         };
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jQuery.print",
   "filename": "jQuery.print.min.js",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "homepage": "https://doersguild.github.io/jQuery.print/",
   "authors": [
     "Sathvik P <sathvik@doersguild.com>"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jQuery.print",`
`3`	`3`	`"main": "jQuery.print.js",`
`4`		`- "version": "1.4.1",`
	`4`	`+ "version": "1.5.0",`
`5`	`5`	`"homepage": "https://doersguild.github.io/jQuery.print/",`
`6`	`6`	`"authors": [`
`7`	`7`	`"Sathvik P <[email protected]>"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jQuery.print",`
`3`	`3`	`"filename": "jQuery.print.min.js",`
`4`		`- "version": "1.4.1",`
	`4`	`+ "version": "1.5.0",`
`5`	`5`	`"homepage": "https://doersguild.github.io/jQuery.print/",`
`6`	`6`	`"authors": [`
`7`	`7`	`"Sathvik P <[email protected]>"`