3201 Commits

Author SHA1 Message Date
Matthew Eernisse
20d4c77abe Merge pull request #409 from mjgs/client-side-ejs-compiled-with-express
Client side ejs compiled with express middleware example
2018-11-19 08:31:11 -08:00
Matthew Eernisse
59ac6efe9b Merge pull request #407 from nwoltman/fix-rmwhitespace
Fix problems with rmWhitespace
2018-11-19 08:24:39 -08:00
Mark Smith
12ca920a8b Linting updates 2018-11-19 12:40:32 +07:00
Mark Smith
c9c58b9d5d Update the page title 2018-11-19 01:15:56 +07:00
Mark Smith
b6c13e5e45 Add link to the examples folder 2018-11-19 01:09:39 +07:00
Mark Smith
5a1229b35b Add client side ejs compiled with express middleware example 2018-11-19 01:06:41 +07:00
Nathan Woltman
4b1cbee458 Fix problems with rmWhitespace
Make `rmWhitespace` safer by handling empty lines better and *not* removing newlines around EJS tags.
2018-11-16 19:06:46 -05:00
mde
720ab7f4d6 Fixed indentation for linter 2018-06-09 20:31:12 -07:00
Matthew Eernisse
ff15d6d588 Merge pull request #304 from tyduptyler13/master
Added custom open and close delimiters
2018-06-09 20:25:27 -07:00
mde
76e181e722 ctor is not always async 2018-06-02 08:12:46 -07:00
mde
44954715f2 Simpler fix for passing escape function correctly 2018-05-15 09:22:18 -07:00
Alec Gibson
db11166897 Pass custom escape function to included templates
At the moment, if you have a template that includes another template,
and a custom escape function, the escape function is not correctly
passed from the outer template to the included template. For an
example of this, see the test fixture added in this commit, which
failed before this fix.

This is due to the property being renamed from `options.escape` to
`options.escapeFunction` in the `Template` constructor. Then, when a
nested `Template` is created, it tries to look for `options.escape`, but
the option has been renamed to `options.escapeFunction`.

This change replaces use of `options.escapeFunction` to `options.escape`
in order to correctly pass the escape function down to included
templates.
2018-05-09 13:59:27 +01:00
mde
ef26a6d9f2 Version 2.6.1 2018-05-05 11:52:07 -07:00
mde
ebad8d4a9a Minor version bump for async rendering release 2018-05-05 11:50:39 -07:00
mde
423d21d082 Added doc for the async rendering option 2018-05-05 11:43:34 -07:00
mde
40bb0eac50 Use generated function instead of eval to get async func ctor 2018-05-05 11:30:42 -07:00
Viko
9c9f44c928 Merge branch 'master' into async 2018-05-04 17:36:01 -06:00
Viko
40cdb21517 Fix merge conflict (again? could've sworn) 2018-05-04 16:15:28 -06:00
Viko
94841a12dc Fix merge conflict 2018-04-22 17:31:32 -06:00
Viko
37bfeb0def Move var declaration to the beginning of the function 2018-04-22 17:24:17 -06:00
mde
c4f68f628c Document the outputFunctionName feature 2018-04-22 13:57:02 -07:00
mde
c8b69a3ca8 Linting 2018-04-21 16:40:06 -07:00
mde
260f2283ef Merge branch 'oscarotero-master' 2018-04-21 16:34:08 -07:00
mde
9cfe8d537d Clean up README 2018-04-19 21:15:04 -07:00
mde
a7a0d4204b Version 2.5.9 2018-04-18 20:13:22 -07:00
mde
aaa00ded24 Fixes #358 and others -- fixes options-passing for Express 2018-04-18 19:06:17 -07:00
mde
ca2c30f4d9 Updated benchmarking tests for linting 2018-03-29 15:38:25 -07:00
mde
aaad80553d Removed superfluous whitespace 2018-03-29 15:34:03 -07:00
mde
a611ecfd1d Allow ES6 syntax 2018-03-29 15:33:21 -07:00
mde
789b57e52b Removed old JSHint files 2018-03-29 15:32:38 -07:00
mde
8dc994ec89 Re-enable perf tests 2018-03-29 15:32:07 -07:00
mde
5b60df3fe9 Updated dev deps 2018-03-27 11:19:09 -07:00
mde
b470b65141 Version 2.5.8 2018-03-25 17:17:13 -07:00
mde
b85580483a Fixed linting error 2018-03-25 17:14:29 -07:00
mde
0bafb6da46 Updated Readme again for release 2018-03-25 17:08:19 -07:00
mde
c3ef65ba30 Merge branch 'master' of github.com:mde/ejs 2018-03-25 17:06:43 -07:00
mde
16a17d3b5f Updated Changelog for release 2018-03-25 17:00:43 -07:00
Viko
756a7fdb8a Correct... whatever happened here 2018-03-01 09:09:29 -06:00
Viko
8ee3c9754e Amend a test name for clarity 2018-02-25 12:22:41 -06:00
Viko
ee12a599ce More updating documentation for async functions 2018-02-25 12:22:10 -06:00
Viko
6174284836 Small fix to tests for speed 2018-02-25 12:21:34 -06:00
Viko
bd5be52459 Update documentation for async functions 2018-02-25 12:21:13 -06:00
Viko
10d0f19d36 Fix the fail-fast without async function support 2018-02-23 15:41:56 -06:00
Viko
77ad2b9819 Add test for async 2018-02-22 16:58:30 -06:00
Viko
6b0e5b7e31 Add async option 2018-02-22 16:58:17 -06:00
Matthew Eernisse
9f93d601ec Merge pull request #336 from Betanu701/patch-1
Adding IDE Integrations
2018-01-25 15:47:06 -08:00
Betanu701
92142fd1ef Adding IDE Integrations
Adding VSCode EJS integration to the readme.
2018-01-25 18:16:06 -05:00
Matthew Eernisse
334c4e1815 Merge pull request #333 from mde/mde/promise_support
Added Promise support with capabilities test to renderFile
2018-01-05 17:05:12 -08:00
mde
7c77ceb28c Added tests for Promise/async support in renderFile 2018-01-05 16:46:37 -08:00
mde
c04ec967cd Added Promise support with capabilities test to renderFile 2018-01-04 16:22:53 -08:00