Merge branch '1.3-bind-proposal'

mootools · Aug 30, 2010 · aa8d931 · fabiomcosta · Aug 30, 2010 · sebmarkbage
2 parents 6312f84 + 6d6b481
commit aa8d931
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/Source/Core/Core.js b/Source/Core/Core.js
@@ -267,7 +267,7 @@ force('String', String, [
 ])('Number', Number, [
 	'toExponential', 'toFixed', 'toLocaleString', 'toPrecision'
 ])('Function', Function, [
-	'apply', 'call'
+	'apply', 'call', 'bind'
 ])('RegExp', RegExp, [
 	'exec', 'test'
 ])('Object', Object, [

diff --git a/Source/Types/Function.js b/Source/Types/Function.js
@@ -32,14 +32,15 @@ Function.implement({
 	attempt: function(args, bind){
 		try {
 			return this.apply(bind, Array.from(args));
-		} catch (e){
-			return null;
-		}
+		} catch (e){}
+
+		return null;
 	},
 
-	bind: function(bind, args){
-		var self = this;
-		if (args != null) args = Array.from(args);
+	bind: function(bind){
+		var self = this,
+			args = (arguments.length > 1) ? Array.slice(arguments, 1) : null;
+
 		return function(){
 			return self.apply(bind, args || arguments);
 		};
@@ -50,7 +51,11 @@ Function.implement({
 	},
 
 	pass: function(args, bind){
-		return this.bind(bind, args);
+		var self = this;
+		if (args != null) args = Array.from(args);
+		return function(){
+			return self.apply(bind, args || arguments);
+		};
 	},
 
 	periodical: function(periodical, bind, args){
@@ -65,8 +70,18 @@ Function.implement({
 
 //<1.2compat>
 
+delete Function.prototype.bind;
+
 Function.implement({
 
+	bind: function(bind, args){
+		var self = this;
+		if (args != null) args = Array.from(args);
+		return function(){
+			return self.apply(bind, args || arguments);
+		};
+	},
+
 	create: function(options){
 		var self = this;
 		options = options || {};