Merge pull request #372 from blikblum/remove-bbevents

Remove BackboneEvents from agent build
marionettejs · Jun 2, 2018 · f732206 · f732206
2 parents fe6deb8 + 9e47cfa
commit f732206
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/extension/js/agent/build/core.js b/extension/js/agent/build/core.js
@@ -7,11 +7,6 @@ if (typeof window._ == "undefined") {
 // @include ../../lib/nanodom.js
 var nanodom = this.nanodom;
 
-// @include ../../lib/backbone-events-standalone/backbone-events-standalone.js
-
-// define BackboneEvents locally in the agent closure
-var BackboneEvents = this.BackboneEvents || window.BackboneEvents;
-
 var Agent = this;
 
  /*

diff --git a/extension/js/agent/utils/lazyWorker.js b/extension/js/agent/utils/lazyWorker.js
@@ -7,7 +7,7 @@
     // this.logSize();
   };
 
-  _.extend(Agent.LazyWorker.prototype, BackboneEvents, {
+  _.extend(Agent.LazyWorker.prototype, {
 
     // time to wait until starting work
     deferTime: 160,
@@ -17,6 +17,9 @@
 
     jobId: 0,
 
+    // abstract method
+    trigger: function() {},
+
     push: function(job) {
       // console.log('** callee', Agent.stackFrame(8));
       // console.log('push called', this.queue.length, new Date() - this.initTime);

diff --git a/extension/js/test/unit/agent_test_setup.js b/extension/js/test/unit/agent_test_setup.js
@@ -50,6 +50,7 @@
 
         window.startAnalytics();
         window.Backbone = window.BackboneFactory(window._, window.jQuery || window.$);
+        Object.assign(window.LazyWorker.prototype, window.Backbone.Events);
         window.Marionette = window.MarionetteFactory(Backbone);
         window.patchBackbone(Backbone);
         window.patchMarionette(Backbone, Marionette);