merging in davsket:uglifyjsfix by @davsket

olado · Sep 7, 2013 · daf27a4 · daf27a4
2 parents cecedd8 + 46f3f88
commit daf27a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/doT.js b/doT.js
@@ -24,14 +24,15 @@
 		},
 		template: undefined, //fn, compile template
 		compile:  undefined  //fn, for express
-	};
+	}, global;
 
 	if (typeof module !== 'undefined' && module.exports) {
 		module.exports = doT;
 	} else if (typeof define === 'function' && define.amd) {
 		define(function(){return doT;});
 	} else {
-		(function(){ return this || (0,eval)('this'); }()).doT = doT;
+		global = (function(){ return this || (0,eval)('this'); }());
+		global.doT = doT;
 	}
 
 	function encodeHTMLSource() {

diff --git a/doT.min.js b/doT.min.js