[incubator-flagon-useralejs] branch FLAGON-434 updated: [FLAGON-434] resolving merge conflicts

[poorejc]

This is an automated email from the ASF dual-hosted git repository.

poorejc pushed a commit to branch FLAGON-434
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git


The following commit(s) were added to refs/heads/FLAGON-434 by this push:
     new a382e91  [FLAGON-434] resolving merge conflicts
a382e91 is described below

commit a382e9191df7d387d10e769bee31aeb5680e65da
Author: poorejc <poor...@apache.org>
AuthorDate: Fri Sep 27 01:58:12 2019 -0400

    [FLAGON-434] resolving merge conflicts
---
 build/UserAleWebExtension/content.js | 14 +-------------
 src/UserALEWebExtension/content.js   |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/build/UserAleWebExtension/content.js 
b/build/UserAleWebExtension/content.js
index 19d620f..ae2be33 100644
--- a/build/UserAleWebExtension/content.js
+++ b/build/UserAleWebExtension/content.js
@@ -773,18 +773,6 @@ function setup(config) {
 }
 
 /**
- * Used to start the logging process if the
- * autostart configuration option is set to false.
- */
-function start() {
-  if (!started) {
-    setup(config$1);
-  }
-
-  config$1.on = true;
-}
-
-/**
  * Updates the current configuration
  * object with the provided values.
  * @param  {Object} newConfig The configuration options to use.
@@ -848,7 +836,7 @@ function queueLog(log) {
 
 function injectScript(config) {
   options(config);
-  start();
+//  start();  not necessary given that autostart in place, and option is 
masked from WebExt users
   setLogFilter(function (log) {
     queueLog(Object.assign({}, log, {
       pageUrl: document.location.href,
diff --git a/src/UserALEWebExtension/content.js 
b/src/UserALEWebExtension/content.js
index 385fa8d..be80806 100644
--- a/src/UserALEWebExtension/content.js
+++ b/src/UserALEWebExtension/content.js
@@ -54,7 +54,7 @@ function queueLog(log) {
 
 function injectScript(config) {
   options(config);
-  start();
+//  start();  not necessary given that autostart in place, and option is 
masked from WebExt users
   filter(function (log) {
     queueLog(Object.assign({}, log, {
       pageUrl: document.location.href,