Global require.on error handler

GMOD · Feb 6, 2018 · 8f42970 · 8f42970
1 parent 1f063e1
commit 8f42970
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -109,6 +109,9 @@
 
                    // create a JBrowse global variable holding the JBrowse instance
                    JBrowse = new Browser( config );
+                   require.on('error', function(error) {
+                       JBrowse.fatalError('Failed to load resource: '+error.info[0]);
+                   });
         });
     </script>
 

diff --git a/src/JBrowse/Browser.js b/src/JBrowse/Browser.js
@@ -320,15 +320,9 @@ initPlugins: function() {
             return new Deferred();
         });
 
-        var handler = require.on("error", function(error) {
-            console.error(error);
-            deferred.reject('A resource failed to load '+error.src + ':' + error.info[0]);
-        });
-
         // fire the "all plugins done" deferred when all of the plugins are done loading
         (new DeferredList( pluginDeferreds ))
             .then( function() {
-            handler && handler.remove();
             deferred.resolve({success: true});
         });
 

diff --git a/src/JBrowse/View/Track/CanvasFeatures.js b/src/JBrowse/View/Track/CanvasFeatures.js
@@ -322,14 +322,8 @@ return declare(
             var thisB = this;
             this.glyphsBeingLoaded[glyphClassName] = [callback];
 
-            var handler = require.on("error", function(error) {
-                console.error(error);
-                errorCallback('A resource failed to load '+error.src + ':' + error.info[0]);
-            });
 
             require( [glyphClassName], function( GlyphClass ) {
-
-                         handler && handler.remove();
                          // if this require came back after we are already destroyed, just ignore it
                          if( thisB.destroyed )
                              return;