Merge branch 'master' of github.com:sstephenson/prototype

Author: savetheclocktower

src/prototype/ajax/request.js

@@ -49,7 +49,7 @@
  *  status-specific callback is defined, it gets invoked. Otherwise, if
  *  `onSuccess` is defined and the response is deemed a success (see below), it
  *  is invoked. Otherwise, if `onFailure` is defined and the response is *not*
- *  deemed a sucess, it is invoked. Only after that potential first callback is
+ *  deemed a success, it is invoked. Only after that potential first callback is
  *  `onComplete` called.
  *  
  *  ##### A note on portability

src/prototype/dom/event.js

@@ -260,8 +260,7 @@
    *  its ancestor chain. If `expression` is not given, the element which fired
    *  the event is returned.
    *  
-   *  *If no matching element is found, the document itself (`HTMLDocument` node)
-   *  is returned.*
+   *  *If no matching element is found, `undefined` is returned.*
    *  
    *  ##### Example
    *  

src/prototype/lang/array.js

@@ -647,16 +647,15 @@ Array.from = $A;
   }
 
   /**
-   *  Array#some([iterator = Prototype.K[, context]]) -> Array
+   *  Array#some([iterator = Prototype.K[, context]]) -> Boolean
    *  - iterator (Function): An optional function to use to evaluate each
    *    element in the enumeration; the function should return the value to
    *    test. If this is not provided, the element itself is tested.
    *  - context (Object): An optional object to use as `this` within
    *    calls to the iterator.
    *
-   *  Returns the result of applying `iterator` to each item in the array. If
-   *  no iterator is provided, the elements are simply copied to the returned
-   *  array.
+   *  Determines whether at least one element is truthy (boolean-equivalent to
+   *  `true`), either directly or through computation by the provided iterator.
    *
    *  `Array#some` acts as an ECMAScript 5 [polyfill](http://remysharp.com/2010/10/08/what-is-a-polyfill/).
    *  It is only defined if not already present in the user's browser, and it
@@ -692,7 +691,7 @@ Array.from = $A;
    *  - context (Object): An optional object to use as `this` within
    *    calls to the iterator.
    *
-   *  Determines whether at least one element is truthy (boolean-equivalent to
+   *  Determines whether all elements are truthy (boolean-equivalent to
    *  `true`), either directly or through computation by the provided iterator.
    *
    *  `Array#every` acts as an ECMAScript 5 [polyfill](http://remysharp.com/2010/10/08/what-is-a-polyfill/).

src/prototype/lang/function.js

@@ -123,7 +123,7 @@ Object.extend(Function.prototype, (function() {
     var __method = this, args = slice.call(arguments, 1);
 
     var bound = function() {
-      var a = merge(args, arguments), c = context;
+      var a = merge(args, arguments);
       // Ignore the supplied context when the bound function is called with
       // the "new" keyword.
       var c = this instanceof bound ? this : context;

src/prototype/lang/hash.js

@@ -94,11 +94,13 @@ var Hash = Class.create(Enumerable, (function() {
 
   // Our _internal_ each
   function _each(iterator, context) {
+    var i = 0;
     for (var key in this._object) {
       var value = this._object[key], pair = [key, value];
       pair.key = key;
       pair.value = value;
-      iterator.call(context, pair);
+      iterator.call(context, pair, i);
+      i++;
     }
   }
 

src/prototype/lang/range.js

@@ -108,9 +108,9 @@ var ObjectRange = Class.create(Enumerable, (function() {
   }
 
   function _each(iterator, context) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator.call(context, value);
+    var value = this.start, i;
+    for (i = 0; this.include(value); i++) {
+      iterator.call(context, value, i);
       value = value.succ();
     }
   }

test/unit/hash_test.js

@@ -182,6 +182,15 @@ new Test.Unit.Runner({
     var foo = new FooMaker('bar');
     this.assertEqual("key=bar", new Hash(foo).toQueryString());
     this.assertEqual("key=bar", new Hash(new Hash(foo)).toQueryString());
+  },
+
+  testIterationWithEach: function()  {
+    var h = $H({a:1, b:2});
+    var result = []
+    h.each(function(kv, i){
+      result.push(i);
+    });
+   this.assertEnumEqual([0,1], result);
   }
 
 });

test/unit/range_test.js

@@ -27,6 +27,13 @@ new Test.Unit.Runner({
     });
 
     this.assertEnumEqual([0, 1, 2, 3], results);
+
+    results = [];
+    $R(2, 4, true).each(function(value, index) {
+      results.push(index);
+    });
+    this.assertEnumEqual([0, 1], results);
+
   },
 
   testAny: function() {