diff --git a/HISTORY.md b/HISTORY.md index cce95caa..b993a77d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,17 @@ +[1.4.0](https://github.com/paularmstrong/swig/tree/v1.4.0) / 2014-07-03 +----------------------------------------------------------------------- + +* **Changed** Allow variable tokens to start with `$`. gh-455 +* **Changed** `fs` loader should take `cwd` as default base path. gh-419 +* **Changed** handle errors which occur at the time of rendering. gh-417 +* **Changed** default options in bin (`varControls`, `tagControls`, `cmtControls`). gh-415 +* **Changed** `null` should yield empty string when resolving variable. gh-408 +* **Added** Escape character for `date` filter argument. gh-427, gh-432 +* **Added** Make `if` and `elseif` throw a better error message when a tag body is omitted. gh-425 +* **Fixed** don't throw errors on accessing property of `null` object. gh-471 +* **Fixed** `loop` variables work correctly in nested loops. gh-433 +* **Fixed** Some IE8 compatibility (require es5). gh-428 + [1.3.2](https://github.com/paularmstrong/swig/tree/v1.3.2) / 2014-01-27 ----------------------------------------------------------------------- diff --git a/browser/comments.js b/browser/comments.js index a5840168..01f724c5 100644 --- a/browser/comments.js +++ b/browser/comments.js @@ -1,2 +1,2 @@ -/*! Swig v1.3.2 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ +/*! Swig v1.4.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */ diff --git a/docs/docs.json b/docs/docs.json index 98714259..1eb646e6 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -1,3 +1,3 @@ { - "version": "v1.3.2" + "version": "v1.4.0" } diff --git a/docs/index.json b/docs/index.json index 98714259..1eb646e6 100644 --- a/docs/index.json +++ b/docs/index.json @@ -1,3 +1,3 @@ { - "version": "v1.3.2" + "version": "v1.4.0" } diff --git a/lib/swig.js b/lib/swig.js index 5f834f9b..358cabb5 100644 --- a/lib/swig.js +++ b/lib/swig.js @@ -8,11 +8,11 @@ var utils = require('./utils'), /** * Swig version number as a string. * @example - * if (swig.version === "1.3.2") { ... } + * if (swig.version === "1.4.0") { ... } * * @type {String} */ -exports.version = "1.3.2"; +exports.version = "1.4.0"; /** * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional. diff --git a/package.json b/package.json index 07f631f9..a74b3b14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swig", - "version": "1.3.2", + "version": "1.4.0", "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.", "keywords": [ "template", diff --git a/tests/basic.test.js b/tests/basic.test.js index 88288782..9a9815f6 100644 --- a/tests/basic.test.js +++ b/tests/basic.test.js @@ -13,8 +13,8 @@ function resetOptions() { } describe('version', function () { - it('is 1.3.2', function () { - expect(swig.version).to.equal('1.3.2'); + it('is 1.4.0', function () { + expect(swig.version).to.equal('1.4.0'); }); });