Updated webgme-easydag dependency and Icons/ path. Fixes #1105

deepforge-dev · Apr 24, 2018 · ac1d0a0 · ac1d0a0
1 parent d12ab2a
commit ac1d0a0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/config/config.webgme.js b/config/config.webgme.js
@@ -32,9 +32,21 @@ config.visualization.panelPaths.push(__dirname + '/../node_modules/webgme-easyda
 config.visualization.panelPaths.push(__dirname + '/../src/visualizers/panels');
 
 
-config.rest.components['execution/logs'] = __dirname + '/../src/routers/JobLogsAPI/JobLogsAPI.js';
-config.rest.components['job/origins'] = __dirname + '/../src/routers/JobOriginAPI/JobOriginAPI.js';
-config.rest.components['execution/pulse'] = __dirname + '/../src/routers/ExecPulse/ExecPulse.js';
+config.rest.components['JobLogsAPI'] = {
+  src: __dirname + '/../src/routers/JobLogsAPI/JobLogsAPI.js',
+  mount: 'execution/logs',
+  options: {}
+};
+config.rest.components['JobOriginAPI'] = {
+  src: __dirname + '/../src/routers/JobOriginAPI/JobOriginAPI.js',
+  mount: 'job/origins',
+  options: {}
+};
+config.rest.components['ExecPulse'] = {
+  src: __dirname + '/../src/routers/ExecPulse/ExecPulse.js',
+  mount: 'execution/pulse',
+  options: {}
+};
 
 // Visualizer descriptors
 config.visualization.visualizerDescriptors.push(__dirname + '/../src/visualizers/Visualizers.json');
@@ -56,7 +68,14 @@ config.requirejsPaths = {
   'panels/BreadcrumbHeader': './node_modules/webgme-breadcrumbheader/src/visualizers/panels/BreadcrumbHeader',
   'widgets/BreadcrumbHeader': './node_modules/webgme-breadcrumbheader/',
   'panels/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/panels/FloatingActionButton',
-  'widgets/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/widgets/FloatingActionButton'
+  'widgets/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/widgets/FloatingActionButton',
+  'webgme-simple-nodes': './node_modules/webgme-simple-nodes/src/common',
+  'webgme-chflayout': './node_modules/webgme-chflayout/src/common',
+  'webgme-fab': './node_modules/webgme-fab/src/common',
+  'webgme-breadcrumbheader': './node_modules/webgme-breadcrumbheader/src/common',
+  'webgme-autoviz': './node_modules/webgme-autoviz/src/common',
+  'webgme-easydag': './node_modules/webgme-easydag/src/common',
+  'deepforge': './src/common'
 };
 
 config.visualization.layout.default = 'SidebarLayout';

diff --git a/src/common/viz/Buttons.js b/src/common/viz/Buttons.js
@@ -2,7 +2,7 @@
 define([
     'deepforge/globals',
     'widgets/EasyDAG/Buttons',
-    'widgets/EasyDAG/Icons'
+    'webgme-easydag/Icons'
 ], function(
     DeepForge,
     EasyDAGButtons,

diff --git a/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js b/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js
@@ -3,7 +3,7 @@ define([
     'deepforge/viz/Buttons',
     'deepforge/Constants',
     'widgets/EasyDAG/Buttons',
-    'widgets/EasyDAG/Icons',
+    'webgme-easydag/Icons',
     'underscore',
     './lib/spectrum.min'
 ], function(