Commit 131c7aa

committed

Added the width and height parameters for the screenshot output type.

1 parent c5294a1 commit 131c7aaCopy full SHA for 131c7aa

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`# Change Log`
`2`	`2`
`3`	`3`	`### 1.3.0`
	`4`	+- Added the `width` and `height` parameters for the `screenshot` output type.
`4`	`5`	- Added the `cache-lifespan` parameter that determines the cache duration.
`5`	`6`	`- Added the ability to cache responses.`
`6`	`7`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,16 @@ http(s)://{app-address}/?url=https%3A%2F%2Fgithub.com&output=screenshot`
`58`	`58`
`59`	`59`	`#### file-type`
`60`	`60`
`61`		-When the `screenshot` parameter is set, the output file type can be set with the `file-type` parameter. Default: `jpg`.
	`61`	+When `screenshot` is given for the `output` parameter, the output file type can be set with the `file-type` parameter. Default: `jpg`.
`62`	`62`
`63`	`63`	It accepts the following values: `pdf`, `png`, `jpg`, `jpeg`, `bmp`, `ppm`.
`64`	`64`
	`65`	`+#### width`
	`66`	+When `screenshot` is given for the `output` parameter, `width` sets the screenshot image width.
	`67`	`+`
	`68`	`+#### height`
	`69`	+When `screenshot` is given for the `output` parameter, `height` sets the screenshot image height. Leave it unset to get full height.
	`70`	`+`
`65`	`71`	`###### Example`
`66`	`72`	```
`67`	`73`	`http(s)://{app-address}/?url=https%3A%2F%2Fgithub.com&output=screenshot&file-type=png`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ class ScreenCapture extends PhantomJSWrapper {`
`11`	`11`	`'file_path' => '', // output file path`
`12`	`12`	`'file_type' => 'jpg', // options: pdf, png, jpeg, bmp, ppm // gif causes an error`
`13`	`13`	`'width' => 1200,`
`14`		`- 'height' => 1800,`
`15`		`-`
	`14`	`+ 'height' => null, // null to get all the height`
`16`	`15`	`);`
`17`	`16`
`18`	`17`	`public function get( $sURL ) {`
`@@ -28,8 +27,13 @@ public function get( $sURL ) {`
`28`	`27`	`$request->setOutputFile( $_sOutputFilePath );`
`29`	`28`	`$request->setFormat( $this->_aRequestArguments[ 'file_type' ] );`
`30`	`29`
`31`		`- $request->setViewportSize( $_aRequestArguments[ 'width' ], $_aRequestArguments[ 'height' ] );`
`32`		`-// $request->setCaptureDimensions( $width, $height, $top, $left );`
	`30`	`+ $request->setViewportSize(`
	`31`	`+ $_aRequestArguments[ 'width' ],`
	`32`	`+ 1800 // any number will show full height`
	`33`	`+ );`
	`34`	`+ if ( $_aRequestArguments[ 'height' ] ) {`
	`35`	`+ $request->setCaptureDimensions( $_aRequestArguments[ 'width' ], $_aRequestArguments[ 'height' ], 0, 0 );`
	`36`	`+ }`
`33`	`37`
`34`	`38`	`// @see https://github.com/jonnnnyw/php-phantomjs/issues/208`
`35`	`39`	`if ( $this->_sUserAgent ) {`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,13 @@ protected function _construct() {`
`13`	`13`	`$this->_aClientArguments[ 'load-images' ] = isset( $_REQUEST[ 'load-images' ] ) && ! Utility::getBoolean( $_REQUEST[ 'load-images' ] )`
`14`	`14`	`? false`
`15`	`15`	`: true;`
	`16`	`+`
	`17`	`+ $this->_aRequestArguments[ 'width' ] = isset( $_REQUEST[ 'width' ] )`
	`18`	`+ ? ( integer ) $_REQUEST[ 'width' ]`
	`19`	`+ : 1200;`
	`20`	`+ $this->_aRequestArguments[ 'height' ] = isset( $_REQUEST[ 'height' ] )`
	`21`	`+ ? ( integer ) $_REQUEST[ 'height' ]`
	`22`	`+ : null; // to get all the height`
`16`	`23`
`17`	`24`	`}`
`18`	`25`

Comments

(0)