Merge branch 'master' into chrome44
This commit is contained in:
commit
9212a1db8e
47 changed files with 885 additions and 2234 deletions
|
@ -97,7 +97,7 @@ wrapWebContents = (webContents) ->
|
|||
printingSetting.marginsType = options.marginsType
|
||||
if options.printSelectionOnly
|
||||
printingSetting.shouldPrintSelectionOnly = options.printSelectionOnly
|
||||
if options.printBackgrounds
|
||||
if options.printBackground
|
||||
printingSetting.shouldPrintBackgrounds = options.printBackground
|
||||
|
||||
if options.pageSize and PDFPageSize[options.pageSize]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue