From b76ccb6cbcc06458f0780cd65f5a8bc313c105ea Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 31 May 2012 15:32:06 -0700 Subject: [PATCH 1/5] Fix bug that was preventing printing of PDF. I changed an "=" to "==" in the delayedPrintPageLoadComplete() function in the mininav.js file. --- src/chrome/content/mininav.js | 2 +- src/version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/mininav.js b/src/chrome/content/mininav.js index 6fe8175..03646da 100644 --- a/src/chrome/content/mininav.js +++ b/src/chrome/content/mininav.js @@ -353,7 +353,7 @@ function delayedPrintPageLoadComplete() { } // We can't convert from XUL to printable format. - if (content.document.contentType = "text/xul") { + if (content.document.contentType == "text/xul") { delayedShutdown(); return; } diff --git a/src/version.txt b/src/version.txt index a918a2a..9472c79 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -0.6.0 +0.6.0.eobrain From 93df5f1fd74bb8691fc5992dc64ec4fa0b36cda3 Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 31 May 2012 16:19:24 -0700 Subject: [PATCH 2/5] supress headers and footers --- src/chrome/content/mininav.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/content/mininav.js b/src/chrome/content/mininav.js index 03646da..83c9c7d 100644 --- a/src/chrome/content/mininav.js +++ b/src/chrome/content/mininav.js @@ -309,6 +309,8 @@ function delayedPrintPageLoadComplete() { else gLocked = true; + var noHeadOrFoot = true; /* TODO: pass in as command-line option */ + var mode = printmode(); if (mode == 2) { @@ -410,6 +412,15 @@ function delayedPrintPageLoadComplete() { */ settings.printerName = printerName; + if (noHeadOrFoot) { + settings.headerStrLeft = ""; + settings.headerStrCenter = ""; + settings.headerStrRight = ""; + settings.footerStrLeft = ""; + settings.footerStrCenter = ""; + settings.footerStrRight = ""; + } + /* We have no interest on those other than prefs. */ printSettingsService.initPrintSettingsFromPrefs (settings, true, Components.interfaces.nsIPrintSettings.kInitSaveAll); From b6d1af1c17ec28c10827e76baa66cd59d287799d Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 31 May 2012 16:52:36 -0700 Subject: [PATCH 3/5] added -noheadfoot as command-line option --- src/chrome/content/mininav.js | 8 +++++--- src/components/cmdlnprint.js | 4 +++- src/version.txt | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/mininav.js b/src/chrome/content/mininav.js index 83c9c7d..bbfbfb7 100644 --- a/src/chrome/content/mininav.js +++ b/src/chrome/content/mininav.js @@ -236,6 +236,10 @@ function printmode() { return mode; } +function noheadfoot() { + return window.arguments && window.arguments[5]; +} + function printWithCanvas() { var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas"); @@ -309,8 +313,6 @@ function delayedPrintPageLoadComplete() { else gLocked = true; - var noHeadOrFoot = true; /* TODO: pass in as command-line option */ - var mode = printmode(); if (mode == 2) { @@ -412,7 +414,7 @@ function delayedPrintPageLoadComplete() { */ settings.printerName = printerName; - if (noHeadOrFoot) { + if ( noheadfoot() ) { settings.headerStrLeft = ""; settings.headerStrCenter = ""; settings.headerStrRight = ""; diff --git a/src/components/cmdlnprint.js b/src/components/cmdlnprint.js index 704c687..01496c9 100644 --- a/src/components/cmdlnprint.js +++ b/src/components/cmdlnprint.js @@ -122,10 +122,12 @@ var gComponent = { param = aCmdLine.handleFlagWithParam("printprinter", false); var printer = param; + + var noheadfoot = aCmdLine.handleFlag("noheadfoot",false); openWindow(null, "chrome://cmdlnprint/content/mininav.xul", "_blank", "chrome,dialog=no,all", - [uri.spec, mode.toString(), path, delay, printer]); + [uri.spec, mode.toString(), path, delay, printer, noheadfoot]); } }, diff --git a/src/version.txt b/src/version.txt index 9472c79..033c855 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -0.6.0.eobrain +0.6.0.eobrain-2 From bd217a9d07032460fad011c87f0c85a975975358 Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 31 May 2012 17:07:52 -0700 Subject: [PATCH 4/5] Add README --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..88c60c9 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +Firefox Extension for Command-Line Print +======================================== + +This is a fork of Torisugari's code, which adds a `-noheadfoot` +option. See [his documentation of an older +version](http://sites.google.com/site/torisugari/commandlineprint2). + +When this extension is installed in your Firefox you can use it like this: + + firefox -print http://www.example.com/index.html + firefox -print http://www.example.com/index.html -printmode PNG + firefox -print http://www.example.com/index.html -printdelay 10 + firefox -print http://www.example.com/index.html -printmode pdf -printfile ../foo.pdf + firefox -print http://www.example.com/index.html -printmode pdf -printfile ../foo.pdf -noheadfoot + +The new `-noheadfoot` options suppresses the header and footer that +would otherwise be added to the printed page. From 4b3386e43fad4718d03b39b8eca423b32ab29689 Mon Sep 17 00:00:00 2001 From: Eamonn O'Brien-Strain Date: Thu, 31 May 2012 17:13:45 -0700 Subject: [PATCH 5/5] update XPI package to make consistent --- .gitignore | 2 ++ ...0_.xpi => cmdlnprint_0.6.0.eobrain-2_.xpi} | Bin 26487 -> 26917 bytes 2 files changed, 2 insertions(+) create mode 100644 .gitignore rename dist/{cmdlnprint_0.6.0_.xpi => cmdlnprint_0.6.0.eobrain-2_.xpi} (91%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5113569 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +src/install.rdf diff --git a/dist/cmdlnprint_0.6.0_.xpi b/dist/cmdlnprint_0.6.0.eobrain-2_.xpi similarity index 91% rename from dist/cmdlnprint_0.6.0_.xpi rename to dist/cmdlnprint_0.6.0.eobrain-2_.xpi index d71ec4d2cf9d16b6e7e52f21c0eb487dfafde06b..39a6fcaf4df5095b3170abd0bcd2552ed3b7a174 100644 GIT binary patch delta 1160 zcmex1gdR8(a$joo}m={(=&35GK4^_gi38VV>HU|K-hic?EUGV{`l z^*{!u76q3S`J|?mDA+0}DOrQf#jeOXHLoPKh@i5d%=G#UoTh=?PtZ!ZBK%gul>x0p zv5~1(Ve>KzQ)Y0O-?KJ>h52Sln?LLiv>9O7~wBB<_a0au#ln#u?fJ@2Lt z7yaw@npIf6ZNJ0%nvGt{0t^fwEWsc%IX_LBi<5!5lKF(cEz^n33cjnk?V({=mRN)o z7r^jKbk0rj$;?aD%Sg;i$w_s~Nle#JLd2GmPFiA4ajNFzlM#KB!y*lNbda=fZjbC> zhPX>O)*kMz$k+rXZA+lLI+Lx_cQG?CfG{_M3`1sKaYwR;vNhP$r(lYxvBa&naQbn#i@EF6(yk|2(Kw%rU;}^Yc%nj zoR=mKN*f?ALENz+4dlX=ag)!a8N%FQiWz~(#snuaphhRq0l?^-9GI@a7L*E#Bmjjz BZh-&* delta 802 zcmZ2_iShe6M!o=VW)?065MbF{Z#R)og}uCCitnTLEgLPrGBWR}+&I~g$$(vD`WFBD z+}kGS+p2EvWwKxq%q!pIFwNR3=CBC^0|-k_wr7%>{DF;~-Qnq0kkZZn*e*$LmRCN= zxA~!=H2Y>ID}83>*R~rco7kGLSL%U{+njIvhn?legrgRd^Ic8YpR95B09rhGkDKIV zcQ=8_mtB{!ESGh+n_TN=!EW`&59F%Nd)!hPStd*=HJhyJq0YYG4}%*>G}z-cD_^Mc zMu+dN%Ar^J85pkePxkRsW-t7|8SI!czt!B6lcIVizmGE5tR3CK%ra9NXz=zpd-kLk z5QG25B`|3(=-uSt#C|e)12Y2y2y-*YFl6Qxmn7!o=oO`;g@$l4Fmv;4^9N#JSg224 zpZII@=A_k3vY^1b{4T8MHX{QA2=g;YfCCjoESX%LD#-#0*2xdkrDcI(>cIG-w!xW& zfdPc2P?TOsRbd8(_T&fYGO`$fjH1#YO_>=O*dUb}z<_lKSLLsH#LmC~!g9ze8!uWj zFeGOb<>#hOKA0lG5gNkEzzmE6kWNKV=(~E%$=nKbC;hJH?Fa%x_2s$NM& z3D`BDcm$cCh#H3sK>bMJ*m%!}VRE3KG#k)4z?cQO9};DV|wk64+cmn{1a{@#F