diff --git a/HISTORY.md b/HISTORY.md index 973409d9..59519dca 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,12 @@ +[1.2.2](https://github.com/paularmstrong/swig/tree/v1.2.2) / 2013-12-02 +----------------------------------------------------------------------- + +* **Fixed** CTX var output in imported macros. gh-363 + [1.2.1](https://github.com/paularmstrong/swig/tree/v1.2.1) / 2013-12-02 ----------------------------------------------------------------------- -* Fix scoping for Express. gh-363 +* **Fixed** Scoping for Express. gh-363 [1.2.0](https://github.com/paularmstrong/swig/tree/v1.2.0) / 2013-12-01 ----------------------------------------------------------------------- diff --git a/browser/comments.js b/browser/comments.js index d9a1d2fa..b9f470e0 100644 --- a/browser/comments.js +++ b/browser/comments.js @@ -1,2 +1,2 @@ -/*! Swig v1.2.1 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ +/*! Swig v1.2.2 | 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 5199c1fb..736a14cc 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -1,3 +1,3 @@ { - "version": "v1.2.1" + "version": "v1.2.2" } diff --git a/docs/index.json b/docs/index.json index 5199c1fb..736a14cc 100644 --- a/docs/index.json +++ b/docs/index.json @@ -1,3 +1,3 @@ { - "version": "v1.2.1" + "version": "v1.2.2" } diff --git a/lib/swig.js b/lib/swig.js index 30599ad8..4e315bcd 100644 --- a/lib/swig.js +++ b/lib/swig.js @@ -9,11 +9,11 @@ var fs = require('fs'), /** * Swig version number as a string. * @example - * if (swig.version === "1.2.1") { ... } + * if (swig.version === "1.2.2") { ... } * * @type {String} */ -exports.version = "1.2.1"; +exports.version = "1.2.2"; /** * 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 3c7b86a9..f4ed8c9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swig", - "version": "1.2.1", + "version": "1.2.2", "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 466810ad..773f367c 100644 --- a/tests/basic.test.js +++ b/tests/basic.test.js @@ -13,8 +13,8 @@ function resetOptions() { } describe('version', function () { - it('is 1.2.1', function () { - expect(swig.version).to.equal('1.2.1'); + it('is 1.2.2', function () { + expect(swig.version).to.equal('1.2.2'); }); });