1 files changed, 8 insertions, 4 deletions
diff --git a/app/webpack/src/javascript/index/query_generator.js b/app/webpack/src/javascript/index/query_generator.js
index fb0871d..6a1128b 100644
--- a/app/webpack/src/javascript/index/query_generator.js
+++ b/app/webpack/src/javascript/index/query_generator.js
@@ -40,6 +40,7 @@ function parseSearchTerm(term){
 
 function addInput(self){
     var new_input = document.querySelector('#search-container > .row').cloneNode(true);
+    setEventListener(new_input);
     resetInput(new_input);
     document.querySelector('#search-container').append(new_input);
     checkDeleteButtons();
@@ -86,10 +87,13 @@ function getSecondParent(self) {
     return self.parentElement.parentElement;
 }
 
+function setEventListener(element){
+    element.querySelector(".pgo-query-add-btn").addEventListener("click", addInput);
+    element.querySelector(".pgo-query-delete-btn").addEventListener("click", function(){ deleteInput(this); });
+}
+
 checkDeleteButtons();
 
-windows.addInput = addInput
+setEventListener(document);
 
-$(".pgo-query-add-btn").click(function() {
-                         alert( "Handler for .click() called." );
-                       });
-\ No newline at end of file
+document.getElementById("buildAdvancedQuery").addEventListener("click", function(){ buildAdvancedQuery(); });
+\ No newline at end of file