Merge pull request #132 from jonnor/fix-componentloader-compat

Fix componentloader compat
noflo · Feb 2, 2014 · c747fbb · c747fbb
2 parents 5cebeef + 71887d3
commit c747fbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/lib/ComponentLoader.coffee b/src/lib/ComponentLoader.coffee
@@ -129,7 +129,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 '/'

diff --git 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'