diff --git a/HISTORY.md b/HISTORY.md index b993a77d..5005f1a4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,9 @@ +[1.4.1](https://github.com/paularmstrong/swig/tree/v1.4.1) / 2014-07-03 +----------------------------------------------------------------------- + +* **Fixed** `macro` argument names colliding with context variable names. gh-457 +* **Fixed** filter chaining within tags. gh-441 + [1.4.0](https://github.com/paularmstrong/swig/tree/v1.4.0) / 2014-07-03 ----------------------------------------------------------------------- diff --git a/browser/comments.js b/browser/comments.js index 01f724c5..62858d4a 100644 --- a/browser/comments.js +++ b/browser/comments.js @@ -1,2 +1,2 @@ -/*! Swig v1.4.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ +/*! Swig v1.4.1 | 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/index.json b/docs/index.json index 1eb646e6..75fca278 100644 --- a/docs/index.json +++ b/docs/index.json @@ -1,3 +1,3 @@ { - "version": "v1.4.0" + "version": "v1.4.1" } diff --git a/lib/swig.js b/lib/swig.js index 0588b1a1..869fe233 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.4.0") { ... } + * if (swig.version === "1.4.1") { ... } * * @type {String} */ -exports.version = "1.4.0"; +exports.version = "1.4.1"; /** * 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 a74b3b14..5bb50336 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swig", - "version": "1.4.0", + "version": "1.4.1", "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 2a9273cb..3e81a71d 100644 --- a/tests/basic.test.js +++ b/tests/basic.test.js @@ -13,8 +13,8 @@ function resetOptions() { } describe('version', function () { - it('is 1.4.0', function () { - expect(swig.version).to.equal('1.4.0'); + it('is 1.4.1', function () { + expect(swig.version).to.equal('1.4.1'); }); });