rename npm print.js package to print-js

README.md

@@ -1,6 +1,6 @@
 # Print.js
 
-[![Build Status](https://travis-ci.org/crabbly/Print.js.svg?branch=master)](https://travis-ci.org/crabbly/Print.js) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE) [![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+[![Build Status](https://travis-ci.org/crabbly/Print.js.svg?branch=master)](https://travis-ci.org/crabbly/Print.js) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE) [![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![npm](https://img.shields.io/npm/dt/print.js.svg)]()
 
 A tiny javascript library to help printing from the web.
 
@@ -14,7 +14,7 @@ You can download the latest version of [Print.js on GitHub](https://github.com/c
 To install via npm:
 
 ```bash
-npm install print.js --save
+npm install print-js --save
 ```
 
 ## Documentation

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "print.js",
+  "name": "print-js",
   "homepage": "http://printjs.crabbly.com",
   "description": "A tiny javascript library to help printing from the web.",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -22,8 +22,5 @@
     "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
-  },
-  "spm": {
-    "main": "Print.js"
   }
 }

src/js/browser.js

@@ -5,7 +5,7 @@ const Browser = {
   },
   // Internet Explorer 6-11
   isIE: () => {
-    return !!document.documentMode
+    return navigator.userAgent.indexOf('MSIE') !== -1 || !!document.documentMode
   },
   // Edge 20+
   isEdge: () => {
@@ -23,3 +23,4 @@ const Browser = {
 }
 
 export default Browser
+

src/js/init.js

@@ -80,20 +80,11 @@ export default {
     // Create a new iframe or embed element (IE prints blank pdf's if we use iframe)
     let printFrame
 
-    if (Browser.isIE() && params.type === 'pdf') {
-      // Create embed element
-      printFrame = document.createElement('embed')
-      printFrame.setAttribute('type', 'application/pdf')
-
-      // Hide embed
-      printFrame.setAttribute('style', 'width:0px;height:0px;')
-    } else {
-      // Create iframe element
-      printFrame = document.createElement('iframe')
-
-      // Hide iframe
-      printFrame.setAttribute('style', 'display:none;')
-    }
+    // Create iframe element
+    printFrame = document.createElement('iframe')
+
+    // Hide iframe
+    printFrame.setAttribute('style', 'display:none;')
 
     // Set element id
     printFrame.setAttribute('id', params.frameId)
@@ -107,7 +98,7 @@ export default {
     switch (params.type) {
       case 'pdf':
         // Check browser support for pdf and if not supported we will just open the pdf file instead
-        if (Browser.isFirefox() || Browser.isIE() || Browser.isEdge()) {
+        if (Browser.isFirefox() || Browser.isEdge() || Browser.isIE()) {
           console.log('PrintJS currently doesn\'t support PDF printing in Firefox, Internet Explorer and Edge.')
           let win = window.open(params.printable, '_blank')
           win.focus()

src/js/print.js

@@ -9,11 +9,10 @@ const Print = {
     // Get iframe element
     let iframeElement = document.getElementById(params.frameId)
 
-    // If printing pdf in IE
-    if (Browser.isIE() && params.type === 'pdf') {
-      finishPrintPdfIe(iframeElement)
+    // Wait for iframe to load all content
+    if (params.type === 'pdf' && (Browser.isIE() || Browser.isEdge())) {
+      iframeElement.setAttribute('onload', finishPrint(iframeElement, params))
     } else {
-      // Wait for iframe to load all content
       printFrame.onload = () => {
         if (params.type === 'pdf') {
           finishPrint(iframeElement, params)
@@ -38,40 +37,33 @@ const Print = {
 }
 
 function finishPrint (iframeElement, params) {
-  // Print iframe document
   iframeElement.focus()
 
-  // If IE or Edge, try catch with execCommand
-  if (Browser.isIE() || Browser.isEdge()) {
+  // If Edge or IE, try catch with execCommand
+  if (Browser.isEdge() || (Browser.isIE())) {
     try {
       iframeElement.contentWindow.document.execCommand('print', false, null)
     } catch (e) {
       iframeElement.contentWindow.print()
     }
-  } else {
-    iframeElement.contentWindow.print()
   }
 
-  // If we are showing a feedback message to user, remove it
-  if (params.showModal) {
-    Modal.close()
+  // Other browsers
+  if (!Browser.isIE() && !Browser.isEdge()) {
+    iframeElement.contentWindow.print()
   }
-}
 
-function finishPrintPdfIe (iframeElement) {
-  // Wait until pdf is ready to print
-  if (typeof iframeElement.print === 'undefined') {
-    setTimeout(() => {
-      finishPrintPdfIe()
-    }, 1000)
-  } else {
-    Print.send()
-
-    // Remove embed (just because it isn't 100% hidden when using h/w = 0)
+  // Remove embed on IE (just because it isn't 100% hidden when using h/w = 0)
+  if (Browser.isIE() && params.type === 'pdf') {
     setTimeout(() => {
       iframeElement.parentNode.removeChild(iframeElement)
     }, 2000)
   }
+
+  // If we are showing a feedback message to user, remove it
+  if (params.showModal) {
+    Modal.close()
+  }
 }
 
 function loadImageAndFinishPrint (img, iframeElement, params) {