diff --git a/coffee/http-listener.coffee b/coffee/http-listener.coffee index a208385..1f80909 100644 --- a/coffee/http-listener.coffee +++ b/coffee/http-listener.coffee @@ -46,7 +46,8 @@ exports = module.exports = ( args ) => indexEvent = ( event, body, resp ) -> try - obj = JSON.parse body + if typeof body is 'string' + obj = JSON.parse body timestamp = ( new Date() ).toISOString() rand = ( Math.floor Math.random() * 10e9 ).toString( 16 ).toUpperCase() obj.event = event diff --git a/webpages/handlers/js/forge_rule.js b/webpages/handlers/js/forge_rule.js index 82a80ff..9b64b9d 100644 --- a/webpages/handlers/js/forge_rule.js +++ b/webpages/handlers/js/forge_rule.js @@ -162,7 +162,7 @@ }; fAddEventParams = function(id) { return function(data) { - var fAppendParam, i, name, shielded, table; + var fAppendParam, fDelayed, i, name, shielded, table; if (data.message) { oParams = JSON.parse(data.message); table = $(''); @@ -188,7 +188,10 @@ $('#event_poller_params').html('Required Global Parameters:'); $('#event_poller_params').append(table); } - return fFillEventParams(id); + fDelayed = function() { + return fFillEventParams(id); + }; + return setTimeout(fDelayed, 200); } }; }; @@ -285,7 +288,7 @@ return _results; }).fail(fFailedRequest('Error fetching event poller')); fAddSelectedAction = function(name) { - var arrEls, arrName, div, img, subdiv, table, td, tr, _ref; + var arrEls, arrName, div, fDelayed, img, subdiv, table, td, tr, _ref; arrName = name.split(' -> '); arrEls = $("#action_params div.modName").map(function() { return $(this).text(); @@ -308,7 +311,10 @@ return $(this).remove(); } }); - return fFillActionFunction(arrName[0]); + fDelayed = function() { + return fFillActionFunction(arrName[0]); + }; + return setTimeout(fDelayed, 300); }; fFetchActionParams = function(div, modName) { obj = {