Merge pull request #128 from avoidwork/edge

Fixing argument passing from new $.fire()
avoidwork · Dec 19, 2012 · 7e5349c · 7e5349c
2 parents 239c0f1 + 5e00423
commit 7e5349c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/abaaso.js b/lib/abaaso.js
@@ -7211,7 +7211,7 @@ bootstrap = function () {
 	if (!server) {
 		$.on(global, "hashchange", function ()  { $.fire("beforeHash, hash, afterHash", location.hash); }, "hash", global, "all");
 		$.on(global, "resize",     function ()  { $.client.size = abaaso.client.size = client.size(); $.fire("resize", abaaso.client.size); }, "resize", global, "all");
-		$.on(global, "load",       function ()  { $.fire("render").un("render"); $.un(this, "load"); });
+		$.on(global, "load",       function ()  { $.fire("render").un("render").un(this, "load"); });
 		$.on(global, "DOMNodeInserted", function (e) {
 			var obj = e.target;
 
@@ -7374,7 +7374,7 @@ return {
 		var all  = typeof obj === "object",
 		    o    = all ? obj   : abaaso,
 		    e    = all ? event : obj,
-		    args = [o, e].concat(array.cast(arguments).remove(0, 1));
+		    args = [o, e].concat(array.cast(arguments).remove(0, !all ? 0 : 1));
 
 		return observer.fire.apply(observer, args);
 	},

diff --git a/lib/abaaso.min.js b/lib/abaaso.min.js
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -266,7 +266,7 @@ bootstrap = function () {
 	if (!server) {
 		$.on(global, "hashchange", function ()  { $.fire("beforeHash, hash, afterHash", location.hash); }, "hash", global, "all");
 		$.on(global, "resize",     function ()  { $.client.size = abaaso.client.size = client.size(); $.fire("resize", abaaso.client.size); }, "resize", global, "all");
-		$.on(global, "load",       function ()  { $.fire("render").un("render"); $.un(this, "load"); });
+		$.on(global, "load",       function ()  { $.fire("render").un("render").un(this, "load"); });
 		$.on(global, "DOMNodeInserted", function (e) {
 			var obj = e.target;
 

diff --git a/src/interface.js b/src/interface.js
@@ -98,7 +98,7 @@ return {
 		var all  = typeof obj === "object",
 		    o    = all ? obj   : abaaso,
 		    e    = all ? event : obj,
-		    args = [o, e].concat(array.cast(arguments).remove(0, 1));
+		    args = [o, e].concat(array.cast(arguments).remove(0, !all ? 0 : 1));
 
 		return observer.fire.apply(observer, args);
 	},