Fix jashkenas#547 - _.templateSettings is unchanged by custom settings.

quantaoflight · Apr 10, 2012 · d17834a · d17834a
1 parent e80bbe6
commit d17834a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test/utility.js b/test/utility.js
@@ -186,4 +186,10 @@ $(document).ready(function() {
     strictEqual(_.template(s)(data), 'x')
   });
 
+  test('#547 - _.templateSettings is unchanged by custom settings.', function() {
+    ok(!_.templateSettings.variable);
+    _.template('', {}, {variable: 'x'});
+    ok(!_.templateSettings.variable);
+  });
+
 });
diff --git a/underscore.js b/underscore.js
@@ -952,7 +952,7 @@
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
   _.template = function(text, data, settings) {
-    settings = _.extend(_.templateSettings, settings);
+    settings = _.defaults(settings || {}, _.templateSettings);
 
     // Compile the template source, taking care to escape characters that
     // cannot be included in a string literal and then unescape them in code