Merge branch 'master' into gh-pages

Author: jashkenas

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "underscore",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "main": "underscore.js",
   "keywords": ["util", "functional", "server", "client", "browser"],
   "ignore" : ["docs", "test", "*.yml", "CNAME", "index.html", "favicon.ico", "CONTRIBUTING.md"]

component.json

@@ -5,6 +5,6 @@
   "repo"          : "jashkenas/underscore",
   "main"          : "underscore.js",
   "scripts"       : ["underscore.js"],
-  "version"       : "1.8.0",
+  "version"       : "1.8.1",
   "license"       : "MIT"
 }

docs/underscore.html

@@ -180,7 +180,7 @@
   <div id="sidebar" class="interface">
 
     <a class="toc_title" href="#">
-      Underscore.js <span class="version">(1.8.0)</span>
+      Underscore.js <span class="version">(1.8.1)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="https://github.com/jashkenas/underscore">GitHub Repository</a></li>
@@ -403,13 +403,13 @@ <h2>Downloads <i style="padding-left: 12px; font-size:12px;">(Right-click, and u
 
     <table style="min-width: 640px;">
       <tr>
-        <td><a href="underscore.js">Development Version (1.8.0)</a></td>
-        <td><i>51kb, Uncompressed with Plentiful Comments</i></td>
+        <td><a href="underscore.js">Development Version (1.8.1)</a></td>
+        <td><i>49kb, Uncompressed with Plentiful Comments</i></td>
       </tr>
       <tr>
-        <td><a href="underscore-min.js">Production Version (1.8.0)</a></td>
+        <td><a href="underscore-min.js">Production Version (1.8.1)</a></td>
         <td>
-          <i>5.7kb, Minified and Gzipped <b>(3x smaller than Lodash ;)</b></i>
+          <i>5.4kb, Minified and Gzipped <b>(3x smaller than Lodash ;)</b></i>
           &nbsp;<small>(<a href="underscore-min.map">Source Map</a>)</small>
         </td>
       </tr>
@@ -2191,6 +2191,17 @@ <h2 id="links">Links &amp; Suggested Reading</h2>
 
       <h2 id="changelog">Change Log</h2>
 
+      <p id="1.8.1">
+        <b class="header">1.8.1</b> &mdash; <small><i>Feb. 19, 2015</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.8.0...1.8.1">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.8.1/index.html">Docs</a><br />
+        <ul>
+          <li>
+            Fixes/changes some old-Internet-Explorer and related edge case 
+            behavior. Test your app with Underscore 1.8.1 in an old IE and let
+            us know how its doing...
+          </li>
+        </ul>
+      </p>
+
       <p id="1.8.0">
         <b class="header">1.8.0</b> &mdash; <small><i>Feb. 19, 2015</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.7.0...1.8.0">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.8.0/index.html">Docs</a><br />
         <ul>

index.html

@@ -15,7 +15,7 @@
     "url": "git://github.com/jashkenas/underscore.git"
   },
   "main": "underscore.js",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "devDependencies": {
     "docco": "0.6.x",
     "eslint": "0.6.x",

package.json

@@ -15,24 +15,6 @@
     deepEqual(_.keys(1), []);
     deepEqual(_.keys('a'), []);
     deepEqual(_.keys(true), []);
-
-    // keys that may be missed if the implementation isn't careful
-    var trouble = {
-      'constructor': Object,
-      'valueOf': _.noop,
-      'hasOwnProperty': null,
-      'toString': 5,
-      'toLocaleString': undefined,
-      'propertyIsEnumerable': /a/,
-      'isPrototypeOf': this,
-      '__defineGetter__': Boolean,
-      '__defineSetter__': {},
-      '__lookupSetter__': false,
-      '__lookupGetter__': []
-    };
-    var troubleKeys = ['constructor', 'valueOf', 'hasOwnProperty', 'toString', 'toLocaleString', 'propertyIsEnumerable',
-                  'isPrototypeOf', '__defineGetter__', '__defineSetter__', '__lookupSetter__', '__lookupGetter__'].sort();
-    deepEqual(_.keys(trouble).sort(), troubleKeys, 'matches non-enumerable properties');
   });
 
   test('allKeys', function() {
@@ -48,25 +30,11 @@
       deepEqual(_.allKeys(val), []);
     });
 
-    // allKeys that may be missed if the implementation isn't careful
-    var trouble = {
-      constructor: Object,
-      valueOf: _.noop,
-      hasOwnProperty: null,
-      toString: 5,
-      toLocaleString: undefined,
-      propertyIsEnumerable: /a/,
-      isPrototypeOf: this
-    };
-    var troubleKeys = ['constructor', 'valueOf', 'hasOwnProperty', 'toString', 'toLocaleString', 'propertyIsEnumerable',
-                  'isPrototypeOf'].sort();
-    deepEqual(_.allKeys(trouble).sort(), troubleKeys, 'matches non-enumerable properties');
-
     function A() {}
     A.prototype.foo = 'foo';
     var b = new A();
     b.bar = 'bar';
-    deepEqual(_.allKeys(b), ['bar', 'foo'], 'should include inherited keys');
+    deepEqual(_.allKeys(b).sort(), ['bar', 'foo'], 'should include inherited keys');
 
     function y() {}
     y.x = 'z';
@@ -543,10 +511,6 @@
     var args = function(){ return arguments; };
     ok(_.isEmpty(args()), 'empty arguments object is empty');
     ok(!_.isEmpty(args('')), 'non-empty arguments object is not empty');
-
-    // covers collecting non-enumerable properties in IE < 9
-    var nonEnumProp = {'toString': 5};
-    ok(!_.isEmpty(nonEnumProp), 'non-enumerable property is not empty');
   });
 
   if (typeof document === 'object') {
@@ -772,10 +736,6 @@
 
     Prototest.x = 5;
     ok(_.isMatch({x: 5, y: 1}, Prototest), 'spec can be a function');
-
-    //null edge cases
-    var oCon = {'constructor': Object};
-    deepEqual(_.map([null, undefined, 5, {}], _.partial(_.isMatch, _, oCon)), [false, false, false, true], 'doesnt fasley match constructor on undefined/null');
   });
 
   test('matcher', function() {
@@ -828,11 +788,6 @@
     o.b = 2;
     o.a = 1;
     equal(m({'b': 1}), true, 'changing spec object doesnt change matches result');
-
-
-    //null edge cases
-    var oCon = _.matcher({'constructor': Object});
-    deepEqual(_.map([null, undefined, 5, {}], oCon), [false, false, false, true], 'doesnt fasley match constructor on undefined/null');
   });
 
   test('matcher', function() {
@@ -885,11 +840,6 @@
     o.b = 2;
     o.a = 1;
     equal(m({'b': 1}), true, 'changing spec object doesnt change matches result');
-
-
-    //null edge cases
-    var oCon = _.matcher({'constructor': Object});
-    deepEqual(_.map([null, undefined, 5, {}], oCon), [false, false, false, true], 'doesnt fasley match constructor on undefined/null');
   });
 
   test('findKey', function() {

test/objects.js

@@ -1,4 +1,4 @@
-//     Underscore.js 1.8.0
+//     Underscore.js 1.8.1
 //     http://underscorejs.org
 //     (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
@@ -32,7 +32,7 @@
     nativeBind         = FuncProto.bind,
     nativeCreate       = Object.create;
 
-  // Reusable constructor function for prototype setting.
+  // Naked function reference for surrogate-prototype-swapping.
   var Ctor = function(){};
 
   // Create a safe reference to the Underscore object for use below.
@@ -55,7 +55,7 @@
   }
 
   // Current version.
-  _.VERSION = '1.8.0';
+  _.VERSION = '1.8.1';
 
   // Internal function that returns an efficient (for current engines) version
   // of the passed-in callback, to be repeatedly applied in other Underscore
@@ -705,17 +705,18 @@
     if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
     if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
     var args = slice.call(arguments, 2);
-    return function bound() {
+    var bound = function() {
       return executeBound(func, bound, context, this, args.concat(slice.call(arguments)));
     };
+    return bound;
   };
 
   // Partially apply a function by creating a version that has had some of its
   // arguments pre-filled, without changing its dynamic `this` context. _ acts
   // as a placeholder, allowing any combination of arguments to be pre-filled.
   _.partial = function(func) {
     var boundArgs = slice.call(arguments, 1);
-    return function bound() {
+    var bound = function() {
       var position = 0, length = boundArgs.length;
       var args = Array(length);
       for (var i = 0; i < length; i++) {
@@ -724,6 +725,7 @@
       while (position < arguments.length) args.push(arguments[position++]);
       return executeBound(func, bound, this, this, args);
     };
+    return bound;
   };
 
   // Bind a number of an object's methods to that object. Remaining arguments
@@ -892,33 +894,13 @@
   // Object Functions
   // ----------------
 
-  // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
-  var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
-  var nonEnumerableProps = ['constructor', 'valueOf', 'isPrototypeOf', 'toString',
-                      'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
-
-  function collectNonEnumProps(obj, keys) {
-    var nonEnumIdx = nonEnumerableProps.length;
-    var proto = typeof obj.constructor === 'function' ? FuncProto : ObjProto;
-
-    while (nonEnumIdx--) {
-      var prop = nonEnumerableProps[nonEnumIdx];
-      if (prop === 'constructor' ? _.has(obj, prop) : prop in obj &&
-        obj[prop] !== proto[prop] && !_.contains(keys, prop)) {
-        keys.push(prop);
-      }
-    }
-  }
-
   // Retrieve the names of an object's own properties.
   // Delegates to **ECMAScript 5**'s native `Object.keys`
   _.keys = function(obj) {
     if (!_.isObject(obj)) return [];
     if (nativeKeys) return nativeKeys(obj);
     var keys = [];
     for (var key in obj) if (_.has(obj, key)) keys.push(key);
-    // Ahem, IE < 9.
-    if (hasEnumBug) collectNonEnumProps(obj, keys);
     return keys;
   };
 
@@ -927,8 +909,6 @@
     if (!_.isObject(obj)) return [];
     var keys = [];
     for (var key in obj) keys.push(key);
-    // Ahem, IE < 9.
-    if (hasEnumBug) collectNonEnumProps(obj, keys);
     return keys;
   };
 
@@ -1012,7 +992,9 @@
     if (obj == null) return result;
     if (_.isFunction(iteratee)) {
       iteratee = optimizeCb(iteratee, context);
-      for (key in obj) {
+      var keys = _.allKeys(obj);
+      for (var i = 0; i < keys.length; i++) {
+        var key = keys[i];
         var value = obj[key];
         if (iteratee(value, key, obj)) result[key] = value;
       }