Skip to content
This repository has been archived by the owner on Apr 11, 2018. It is now read-only.

Commit

Permalink
version bump 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
paularmstrong committed Jul 3, 2014
1 parent 8475519 commit 821ee89
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 8 deletions.
14 changes: 14 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -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
-----------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion browser/comments.js
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 1 addition & 1 deletion docs/docs.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "v1.3.2"
"version": "v1.4.0"
}
2 changes: 1 addition & 1 deletion docs/index.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "v1.3.2"
"version": "v1.4.0"
}
4 changes: 2 additions & 2 deletions lib/swig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});

Expand Down

0 comments on commit 821ee89

Please sign in to comment.