From f5d1c673ce4c6feef7eb25b92d3c1d29ef4c49a9 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Tue, 13 Dec 2016 22:47:39 +0700
Subject: [PATCH] Reload after engine changes, fix randomElt for RSS

---
 manifest.json    |  2 +-
 option-script.js | 11 ++++++++++-
 package.json     |  2 +-
 trackmenot.js    | 15 +++++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index f858872..4ec3ff4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "TrackMeNot",
   "description": "TMN WebExtension portage",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "background": {
     "scripts": [
       "trackmenot.js"
diff --git a/option-script.js b/option-script.js
index c32dbf2..c1f726b 100644
--- a/option-script.js
+++ b/option-script.js
@@ -51,6 +51,9 @@ function loadHandlers() {
       'tmn':"TMNDelEngine",
       'engine':del_engine
     });
+    setTimeout(function() {
+      window.location.reload()
+    }, 500);
   });
 
   $("#help-faq").click( function() {
@@ -70,7 +73,13 @@ function loadHandlers() {
       alert("Did not find 'trackmenot' in the URL");
       return;
     }
-    browser.runtime.sendMessage({'tmn':"TMNAddEngine",'engine': engine});
+    browser.runtime.sendMessage({
+      'tmn':"TMNAddEngine",
+      'engine': engine
+    });
+    setTimeout(function() {
+      window.location.reload()
+    }, 500);
   });
 }
 
diff --git a/package.json b/package.json
index e75967d..9d5278a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "fullName" : "TrackMeNot",
   "license": "GPL 2.0",
   "author": "Daniel Howe, Helen Nissenbaum, Vincent Toubiana",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "homepage": "http://www.cs.nyu.edu/trackmenot/",
   "icon":"data/images/skin/tmn.png",
   "main": "trackmenot",
diff --git a/trackmenot.js b/trackmenot.js
index 3eeb156..2cfdef1 100644
--- a/trackmenot.js
+++ b/trackmenot.js
@@ -24,7 +24,7 @@ TRACKMENOT.TMNSearch = function() {
   let tmn_tab = null;
   let useTab = false;
   let enabled = true;
-  let debug_ = true;
+  let debug_ = false;
   let load_full_pages = false;
   let last_url = "";
   let stop_when = "start";
@@ -542,15 +542,15 @@ TRACKMENOT.TMNSearch = function() {
     let qtype = randomElt(typeoffeeds);
     let queries = TMNQueries[qtype];
     queries = randomElt(queries);
-    if (queries.words) {
-      queries = queries.words;
-      queries = randomElt(queries);
-    }
     if (queries === null || queries === undefined) {
       console.log(TMNQueries);
       debug(qtype);
       debug(typeoffeeds);
     }
+    if (queries.words && queries.words.length > 0) {
+      queries = queries.words;
+      queries = randomElt(queries);
+    }
     let term = trim( queries );
     if (!term || term.length === 0) {
       if (debug_)
@@ -726,6 +726,9 @@ TRACKMENOT.TMNSearch = function() {
     //console.log (feedObject.name + " : " + feedObject.words)
 
     if (useRss) {
+      if (TMNQueries.rss === undefined) {
+        TMNQueries.rss = [];
+      }
       TMNQueries.rss.push(feedObject);
     }
 
@@ -1440,7 +1443,7 @@ TRACKMENOT.TMNSearch = function() {
         sendResponse({});
         break;
       case "TMNAddEngine":
-        alert(request.engine);
+        console.log(request.engine);
         addEngine(request.engine);
         sendResponse({});
         break;