#178 build new node-worker and update index.html

webgme · Feb 25, 2015 · d8086b9 · d8086b9
1 parent 4a292b9
commit d8086b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/middleware/executor/worker/index.html b/src/middleware/executor/worker/index.html
@@ -83,7 +83,7 @@ <h1 class="hostname"><span></span> <small></small></h1>\
                             "blob": "middleware/blob",
 
                             // "jszip": 'lib/jszip/jszip',
-                            "executor": 'extlib/' + getconfig.paths.executor
+                            "executor": 'middleware/executor'
                         },
                         nodeRequire: nodeRequire
                     });

diff --git a/src/middleware/executor/worker/node_worker.classes.build.js b/src/middleware/executor/worker/node_worker.classes.build.js
@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.16 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -12,7 +12,7 @@ var requirejs, require, define;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.15',
+        version = '2.1.16',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -1123,6 +1123,13 @@ var requirejs, require, define;
 
                         if (this.errback) {
                             on(depMap, 'error', bind(this, this.errback));
+                        } else if (this.events.error) {
+                            // No direct errback on this module, but something
+                            // else is listening for errors, so be sure to
+                            // propagate the error correctly.
+                            on(depMap, 'error', bind(this, function(err) {
+                                this.emit('error', err);
+                            }));
                         }
                     }
 
@@ -3806,13 +3813,15 @@ define('logManager',[], function () {
 	};
 });
 
+/*globals define, WebGMEGlobal, require*/
 /**
- * Created by Zsolt on 5/21/2014.
- *
+ * @author lattmann / https://github.com/lattmann
+ * @author ksmyth / https://github.com/ksmyth
  */
 
 
 define('executor/ExecutorClient',['superagent'], function (superagent) {
+
 
     var ExecutorClient = function (parameters) {
         parameters = parameters || {};