Commit90c2cc1

committed

Merge branch '2.4' into 2.5

* 2.4: [#4249] Tiny tweak to language update uglifyjs.rst Update uglifyjs.rst Update uglifyjs.rst provide node path on configuration

2 parents73d44d1 +4485637 commit90c2cc1Copy full SHA for 90c2cc1

File tree

+40

-0

lines changed

+40

-0

lines changed

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,46 @@ your JavaScripts:`
`111`	`111`
`112`	`112`	You now have access to the ``uglifyjs2`` filter in your application.
`113`	`113`
	`114`	+Configure the ``node`` Binary
	`115`	`+-----------------------------`
	`116`	`+`
	`117`	`+Assetic tries to find the node binary automatically. If it cannot be found, you`
	`118`	+can configure its location using the ``node`` key:
	`119`	`+`
	`120`	`+..configuration-block::`
	`121`	`+`
	`122`	`+ ..code-block::yaml`
	`123`	`+`
	`124`	`+# app/config/config.yml`
	`125`	`+assetic:`
	`126`	`+# the path to the node executable`
	`127`	`+node:/usr/bin/nodejs`
	`128`	`+filters:`
	`129`	`+uglifyjs2:`
	`130`	`+# the path to the uglifyjs executable`
	`131`	`+bin:/usr/local/bin/uglifyjs`
	`132`	`+`
	`133`	`+ ..code-block::xml`
	`134`	`+`
	`135`	`+<!-- app/config/config.xml-->`
	`136`	`+ <assetic:config`
	`137`	`+node="/usr/bin/nodejs" >`
	`138`	`+ <assetic:filter`
	`139`	`+name="uglifyjs2"`
	`140`	`+bin="/usr/local/bin/uglifyjs" />`
	`141`	`+ </assetic:config>`
	`142`	`+`
	`143`	`+ ..code-block::php`
	`144`	`+`
	`145`	`+ // app/config/config.php`
	`146`	`+ $container->loadFromExtension('assetic', array(`
	`147`	`+ 'node' => '/usr/bin/nodejs',`
	`148`	`+ 'uglifyjs2' => array(`
	`149`	`+ // the path to the uglifyjs executable`
	`150`	`+ 'bin' => '/usr/local/bin/uglifyjs',`
	`151`	`+ ),`
	`152`	`+ ));`
	`153`	`+`
`114`	`154`	`Minify your Assets`
`115`	`155`	`------------------`
`116`	`156`

Comments

(0)