update collectStyles match, skip empty properties

crabbly · Jun 5, 2018 · 6135a43 · 6135a43
1 parent 6568e37
commit 6135a43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "print-js",
   "homepage": "http://printjs.crabbly.com",
   "description": "A tiny javascript library to help printing from the web.",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "main": "dist/print.js",
   "repository": "https://github.com/crabbly/Print.js",
   "license": "MIT",

diff --git a/src/js/functions.js b/src/js/functions.js
@@ -10,8 +10,6 @@ export function capitalizePrint (string) {
 export function collectStyles (element, params) {
   let win = document.defaultView || window
 
-  let styles = win.getComputedStyle
-
   // String variable to hold styling for each element
   let elementStyle = ''
 
@@ -22,12 +20,12 @@ export function collectStyles (element, params) {
   if (params.honorColor) params.targetStyles.push('color')
 
   // Loop over computed styles
-  styles = win.getComputedStyle(element, '')
+  let styles = win.getComputedStyle(element, '')
 
   Object.keys(styles).map(key => {
     // Check if style should be processed
-    if (params.targetStyles === ['*'] || params.targetStyle.indexOf(styles[key]) !== -1 || targetStylesMatch(params.targetStyles, styles[key])) {
-      elementStyle += styles[key] + ':' + styles.getPropertyValue(styles[key]) + ';'
+    if (params.targetStyles.indexOf('*') !== -1 || params.targetStyle.indexOf(styles[key]) !== -1 || targetStylesMatch(params.targetStyles, styles[key])) {
+      if (styles.getPropertyValue(styles[key])) elementStyle += styles[key] + ':' + styles.getPropertyValue(styles[key]) + ';'
     }
   })