Update CHANGELOG and compiled browser files for v1.0.5

CHANGELOG.md

@@ -8,6 +8,20 @@ Next version:
 * publish in bower
 * cleanup WebLoader.fetch
 
+# v1.0.5 (May 1, 2014)
+
+* Added support for browserify
+* Added option to specify template output path when precompiling templates
+* Keep version comment in browser minified files
+* Speed up SafeString implementation
+* Handle null and non-matching cases for word count filter
+* Added support for node-webkit
+* Other various minor bugfixes
+
+# v1.0.4 (April 4, 2014)
+
+* Use v0.8.2 of chokidar from NPM rather than Github
+
 # v1.0.2 (March 25, 2014)
 
 * Use chokidar for watching file changes. This should fix a lot of problems on OS X machines.

browser/nunjucks-slim.js

@@ -764,15 +764,14 @@ modules['web-loaders'] = {
 };
 })();
 (function() {
-if(typeof window === 'undefined') {
+if(typeof window === 'undefined' || window !== this) {
     modules['loaders'] = modules["node-loaders"];
 }
 else {
     modules['loaders'] = modules["web-loaders"];
 }
 })();
 (function() {
-
 var lib = modules["lib"];
 var r = modules["runtime"];
 
@@ -1185,7 +1184,8 @@ var filters = {
     },
 
     wordcount: function(str) {
-        return str.match(/\w+/g).length;
+        var words = (str) ? str.match(/\w+/g) : null;
+        return (words) ? words.length : null;
     },
 
     'float': function(val, def) {
@@ -1809,6 +1809,7 @@ if(typeof define === 'function' && define.amd) {
 }
 else {
     window.nunjucks = nunjucks;
+    if(typeof module !== 'undefined') module.exports = nunjucks;
 }
 
 })();

browser/nunjucks.js

@@ -3849,7 +3849,6 @@ modules['compiler'] = {
 };
 })();
 (function() {
-
 var lib = modules["lib"];
 var r = modules["runtime"];
 
@@ -4262,7 +4261,8 @@ var filters = {
     },
 
     wordcount: function(str) {
-        return str.match(/\w+/g).length;
+        var words = (str) ? str.match(/\w+/g) : null;
+        return (words) ? words.length : null;
     },
 
     'float': function(val, def) {
@@ -4445,7 +4445,7 @@ modules['web-loaders'] = {
 };
 })();
 (function() {
-if(typeof window === 'undefined') {
+if(typeof window === 'undefined' || window !== this) {
     modules['loaders'] = modules["node-loaders"];
 }
 else {
@@ -4988,6 +4988,7 @@ if(typeof define === 'function' && define.amd) {
 }
 else {
     window.nunjucks = nunjucks;
+    if(typeof module !== 'undefined') module.exports = nunjucks;
 }
 
 })();