From aa618d178c114a9e2e4db5dad9200cf967fd1b4c Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 30 Oct 2013 15:50:05 +0000 Subject: [PATCH] "send" --> "message" --- index.js | 2 +- marketplace.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index b6f9828..a55c5c6 100644 --- a/index.js +++ b/index.js @@ -70,7 +70,7 @@ var g = new Ground(function () { // })); }, handleEvent: function (e) { - if (e.type === "send" && e.message[0] === "jQuery") { + if (e.type === "message" && e.message[0] === "jQuery") { if (e.message[1] === "#testButton") { console.log("got a click"); World.updateRoutes([sub(["jQuery", "#testButton2", "click", __])]); diff --git a/marketplace.js b/marketplace.js index e60059a..08b7965 100644 --- a/marketplace.js +++ b/marketplace.js @@ -104,7 +104,7 @@ function updateRoutes(routes) { } function sendMessage(m, metaLevel, isFeedback) { - return { type: "send", + return { type: "message", metaLevel: (metaLevel === undefined) ? 0 : metaLevel, message: m, isFeedback: (isFeedback === undefined) ? false : isFeedback }; @@ -155,7 +155,7 @@ function filterEvent(e, routes) { switch (e.type) { case "routes": return updateRoutes(intersectRoutes(e.routes, routes)); - case "send": + case "message": for (var i = 0; i < routes.length; i++) { var r = routes[i]; if (e.metaLevel === r.metaLevel @@ -349,7 +349,7 @@ World.prototype.performAction = function (pid, action) { } this.issueRoutingUpdate(); break; - case "send": + case "message": if (action.metaLevel === 0) { this.eventQueue.push(action); } else { @@ -397,7 +397,7 @@ World.prototype.handleEvent = function (e) { this.downwardRoutes = liftRoutes(e.routes); this.issueLocalRoutingUpdate(); break; - case "send": + case "message": this.eventQueue.push(sendMessage(e.message, e.metaLevel + 1, e.isFeedback)); break; default: