From 599d31101b7a7b896ff73e338d26ae698833f878 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 10 Apr 2012 10:43:26 -0400 Subject: [PATCH] Underscore.js 1.3.3 (tiny bugfix release) --- docs/underscore.html | 6 +++--- index.html | 8 ++++---- package.json | 2 +- underscore-min.js | 6 +++--- underscore.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/underscore.html b/docs/underscore.html index c363a1b8f..3c213270e 100644 --- a/docs/underscore.html +++ b/docs/underscore.html @@ -1,4 +1,4 @@ - underscore.js

underscore.js 

Underscore.js 1.3.2
+      underscore.js           
     
          
                
                        
               underscore.js             
           		                               
                                             
                            
                                
               
Underscore.js 1.3.3
 (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
 Underscore is freely distributable under the MIT license.
 Portions of Underscore are inspired or borrowed from Prototype,
@@ -31,7 +31,7 @@ for Closure Compiler "advanced" mode.
             
             exports._ = _;
   } else {
     root['_'] = _;
-  }                        
                               
                            
                                
               
Current version.
             		                            
  _.VERSION = '1.3.2';
             		           
                               
                            
                                
               
Collection Functions
             		                            
             		           
                               
                            
                                
               
The cornerstone, an each implementation, aka forEach.
+  }             
           
                               
                            
                                
               
Current version.
             		                            
  _.VERSION = '1.3.3';
             		           
                               
                            
                                
               
Collection Functions
             		                            
             		           
                               
                            
                                
               
The cornerstone, an each implementation, aka forEach.
 Handles objects with the built-in forEach, arrays, and raw objects.
 Delegates to ECMAScript 5's native forEach if available.
             		                            
  var each = _.each = _.forEach = function(obj, iterator, context) {
     if (obj == null) return;
@@ -601,7 +601,7 @@ that had been previously added.
             
             };                        
                               
                            
                                
               
JavaScript micro-templating, similar to John Resig's implementation.
 Underscore templating handles arbitrary delimiters, preserves whitespace,
 and correctly escapes quotes within interpolated code.
             		                            
  _.template = function(text, data, settings) {
-    settings = _.extend(_.templateSettings, settings);
             		           
                               
                            
                                
               
Compile the template source, taking care to escape characters that
+    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
 blocks.
             		                            
    var source = "__p+='" + text
       .replace(escaper, function(match) {
diff --git a/index.html b/index.html
index c00b98a8d..01c18aca4 100644
--- a/index.html
+++ b/index.html
@@ -136,7 +136,7 @@