From 79baf9a96cb92859876863d0f7271f61a0bba6fd Mon Sep 17 00:00:00 2001 From: Jon Nordby Date: Sat, 1 Feb 2014 18:04:00 +0100 Subject: [PATCH 1/2] ComponentLoader: Fix compatibility with CoffeeScript >1.7.0 The Node.JS .coffee handler now needs to be registered explicitly. --- src/lib/nodejs/ComponentLoader.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/nodejs/ComponentLoader.coffee b/src/lib/nodejs/ComponentLoader.coffee index fd97ddd04..94a09aa38 100644 --- a/src/lib/nodejs/ComponentLoader.coffee +++ b/src/lib/nodejs/ComponentLoader.coffee @@ -13,7 +13,10 @@ loader = require '../ComponentLoader' internalSocket = require '../InternalSocket' # We allow components to be un-compiled CoffeeScript -require 'coffee-script' +CoffeeScript = require 'coffee-script' +if typeof CoffeeScript.register != 'undefined' + CoffeeScript.register() + # Disable NPM logging in normal NoFlo operation log = require 'npmlog' From 71887d3a770acf1fa4fbbb86c3059b865089eb50 Mon Sep 17 00:00:00 2001 From: Jon Nordby Date: Sat, 1 Feb 2014 19:51:27 +0100 Subject: [PATCH 2/2] ComponentLoader: Don't fail on missing getIcon function This can happen when loaded component is using an older version of NoFlo which does not define the getIcon method. --- src/lib/ComponentLoader.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ComponentLoader.coffee b/src/lib/ComponentLoader.coffee index f42ad4ba7..da270cd28 100644 --- a/src/lib/ComponentLoader.coffee +++ b/src/lib/ComponentLoader.coffee @@ -121,7 +121,7 @@ class ComponentLoader setIcon: (name, instance) -> # See if component has an icon - return if instance.getIcon() + return if not instance.getIcon or instance.getIcon() # See if library has an icon [library, componentName] = name.split '/'