From f53cd387a62cb70ecbb76b9850dfa4b683eaf25f Mon Sep 17 00:00:00 2001
From: Bryce Allen <ballen@ci.uchicago.edu>
Date: Sat, 27 Jun 2015 11:18:32 -0500
Subject: [PATCH] weaponplanner: fix double display

* clear weapon on type change
* add weapon name to stats line
---
 web/js/common.js              | 7 +++++--
 web/templates/weaponstats.ejs | 1 +
 web/weaponplanner.html        | 5 +----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/js/common.js b/web/js/common.js
index 4048b77..49cd2ab 100644
--- a/web/js/common.js
+++ b/web/js/common.js
@@ -124,6 +124,7 @@ function setup_weapon_autocomplete(type_selector, weapon_selector, ready_fn,
                                                      weapon_selector,
                                                      change_fn);
                                 $(type_selector).change(function(evt) {
+                                    $(weapon_selector).val("");
                                     _setup_weapon_autocomplete(
                                                 $(type_selector).val(),
                                                 weapon_selector, change_fn);
@@ -149,15 +150,17 @@ function _setup_weapon_autocomplete(type, weapon_selector, change_fn) {
       { source: source,
         change: function (event, ui) {
             if (!ui.item) return;
+            console.log("weapon autocomplete change");
             if (change_fn) {
-                change_fn(ui.item["value"]);
+                change_fn();
             }
         }
       }
     );
     $(weapon_selector).keypress(function(e) {
        if (e.which == 13 && change_fn) {
-           change_fn($(weapon_selector).val());
+           console.log("weapon enter keypress");
+           change_fn();
        }
     });
 }
diff --git a/web/templates/weaponstats.ejs b/web/templates/weaponstats.ejs
index 063e0d1..84d3dec 100644
--- a/web/templates/weaponstats.ejs
+++ b/web/templates/weaponstats.ejs
@@ -1,5 +1,6 @@
 <table>
 <tr>
+<td><%= name %>:</td>
 <td><%= attack %></td>
 <td>
 <% if (awaken) { %>
diff --git a/web/weaponplanner.html b/web/weaponplanner.html
index 088606a..2f36116 100644
--- a/web/weaponplanner.html
+++ b/web/weaponplanner.html
@@ -92,15 +92,12 @@
 
     $(document).ready(function(){
         setup_weapon_autocomplete("#weapon_type", "#weapon",
-                                  init_page, show_trees);
+                                  init_page, update_search);
     });
 
     function init_page() {
         load_qs();
         $("#search").click(update_search);
-        $("#weapon").keypress(function(e) {
-            if (e.which == 13) { update_search(); }
-        });
         $(window).on("popstate", function(e) {
             var oe = e.originalEvent;
             if (oe.state !== null) {