diff --git a/src/scripts/results.tag b/src/scripts/results.tag index a01ff3a..a272ed0 100644 --- a/src/scripts/results.tag +++ b/src/scripts/results.tag @@ -12,13 +12,13 @@ clicker() { this.rows = []; var self = this; -results_passer.on("loading", +resultsEv.on("loading", function() { self.notLoading = false; self.update(); }); -results_passer.on("new_results", +resultsEv.on("newResults", function(data) { console.log("new search results detected"); console.log(data); diff --git a/src/scripts/search.js b/src/scripts/search.js index 8b9f47f..a5c2eda 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -1,9 +1,4 @@ -function ResultsPasser() { - riot.observable(this); - return this; -} - -var results_passer = new ResultsPasser(); +var resultsEv = riot.observable(); riot.mount("search", { showHelp : false, diff --git a/src/scripts/search.tag b/src/scripts/search.tag index c50d85e..a79bb23 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -51,7 +51,7 @@ submit(ev) { console.log("submitted"); this.opts.booksLoading = true; this.update(); - results_passer.trigger("loading"); + resultsEv.trigger("loading"); console.log(ev); fetch("/search/fc?title="+this.title.value+"&sem="+this.sem.value).then( function(response) { @@ -60,7 +60,7 @@ submit(ev) { function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); - results_passer.trigger("new_results", cgroups); + resultsEv.trigger("newResults", cgroups); self.opts.booksLoading = false; self.update(); });