bda/mhapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weaponplanner: fix double display

Browse Source 
* clear weapon on type change
* add weapon name to stats line
This commit is contained in:
Bryce Allen
2015-06-27 11:18:32 -05:00
parent 1da416c974
commit f53cd387a6
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/js/common.js
View File

@@ -124,6 +124,7 @@ function setup_weapon_autocomplete(type_selector, weapon_selector, ready_fn,
weapon_selector, weapon_selector,
change_fn); change_fn);
$(type_selector).change(function(evt) { $(type_selector).change(function(evt) {
$(weapon_selector).val("");
_setup_weapon_autocomplete( _setup_weapon_autocomplete(
$(type_selector).val(), $(type_selector).val(),
weapon_selector, change_fn); weapon_selector, change_fn);
@@ -149,15 +150,17 @@ function _setup_weapon_autocomplete(type, weapon_selector, change_fn) {
{ source: source, { source: source,
change: function (event, ui) { change: function (event, ui) {
if (!ui.item) return; if (!ui.item) return;
console.log("weapon autocomplete change");
if (change_fn) { if (change_fn) {
change_fn(ui.item["value"]); change_fn();
} }
} }
} }
); );
$(weapon_selector).keypress(function(e) { $(weapon_selector).keypress(function(e) {
if (e.which == 13 && change_fn) { if (e.which == 13 && change_fn) {
change_fn($(weapon_selector).val()); console.log("weapon enter keypress");
change_fn();
} }
}); });
} }

1
web/templates/weaponstats.ejs
View File

@@ -1,5 +1,6 @@
<table> <table>
<tr> <tr>
<td><%= name %>:</td>
<td><%= attack %></td> <td><%= attack %></td>
<td> <td>
<% if (awaken) { %> <% if (awaken) { %>

5
web/weaponplanner.html
View File

@@ -92,15 +92,12 @@
$(document).ready(function(){ $(document).ready(function(){
setup_weapon_autocomplete("#weapon_type", "#weapon", setup_weapon_autocomplete("#weapon_type", "#weapon",
init_page, show_trees); init_page, update_search);
}); });
function init_page() { function init_page() {
load_qs(); load_qs();
$("#search").click(update_search); $("#search").click(update_search);
$("#weapon").keypress(function(e) {
if (e.which == 13) { update_search(); }
});
$(window).on("popstate", function(e) { $(window).on("popstate", function(e) {
var oe = e.originalEvent; var oe = e.originalEvent;
if (oe.state !== null) { if (oe.state !== null) {