[charactermanager] r364 committed - [No log message]

[codesite...@google.com]

Revision: 364
Author: todd.chambery
Date: Fri Oct 16 05:24:16 2009
Log: [No log message]
http://code.google.com/p/charactermanager/source/detail?r=364

Modified:
/trunk/charmgrjs/edit.js
/trunk/charmgrjs/main.js

=======================================
--- /trunk/charmgrjs/edit.js Wed Oct 14 14:50:27 2009
+++ /trunk/charmgrjs/edit.js Fri Oct 16 05:24:16 2009
@@ -148,7 +148,7 @@
});
$("#clazz option[id='clazz_option_" + clazz.id + "']").attr("selected",
true);

- $('#hp').val((chardata.hp == null ? 0 : chardata.hp));
+ $("input[id='hp']").val((chardata.hp == null ? 0 : chardata.hp));
$('#xp').val((chardata.xp == null ? 0 : chardata.xp));

$('#weapon_style').selectOptions(chardata.weapon_style ==
null ? 'two_weapon_combat' : chardata.weapon_style);
@@ -212,7 +212,7 @@
alert("Level Advance:\n" + (ability_increase ? "+1 to ability
score\n" : "") + "HP increase: " + hp_increase);
}
chardata.xp = $('#xp').val();
- chardata.hp = $('#hp').val();
+ chardata.hp = $("input[id='hp']").val();

chardata.race_id = $('#race').val();

=======================================
--- /trunk/charmgrjs/main.js Thu Oct 15 19:00:34 2009
+++ /trunk/charmgrjs/main.js Fri Oct 16 05:24:16 2009
@@ -78,7 +78,7 @@
$('#skillspart').html(skill_html);

// AC, etc
- var ac_html = "<table><tr><td>HP</td><td id='hp' class='two_digit'
align='left'></td><td align='right' colspan='2' style='width: 100%'><input
id='hp_input' size='1' type='text' value='' /></td></tr>";
+ var ac_html = "<table><tr><td>HP</td><td id='hp' class='two_digit'
align='left'></td><td align='right' colspan='2' style='width: 100%'><input
id='hp' size='1' type='text' value='' /></td></tr>";
ac_html += "<tr><td>AC</td><td class='box numeric' id='ac'></td>";
var init_html = "<td>Init</td><td id='init' class='box
numeric'></td></tr>";
var spacer = "<tr><td colspan='4'><hr/></td></tr>";
@@ -322,7 +322,7 @@
$('#save_log').val('save');
$('#log_date').text((new Date()).toDateString());
$('#log_xp').text(chardata.xp);
- $('#log_hp').text($('#hp_input') != null && $('#hp_input').val().length
> 0 ? $('#hp_input').val() : chardata.hp);
+ $('#log_hp').text($("input['hp']") != null &&
$("input['hp']").val().length > 0 ? $("input['hp']").val() : chardata.hp);

sav(chardata, 'chardata');
$('#history:hidden').show();
@@ -341,7 +341,7 @@
var hidden = chardata.log.length == 0 ? "display: none;" : "";
var content = "<div id='history' class='box' style='max-height: 150px;
overflow: auto; border-color: #D0D0D0;" + hidden + "'>" +
populate_log_history(chardata) + "</div>";
// use the "live" hp value if it's populated
- var log_hp = ($('#hp_input').val().length > 0 ? $('#hp_input').val() :
(chardata.hp == null ? 0 : chardata.hp));
+ var log_hp = ($("input['hp']").val().length > 0 ?
$("input['hp']").val() : (chardata.hp == null ? 0 : chardata.hp));
content += "<div id='new_entry' style='height: 50%'><input
id='entry_id' type='hidden' value='' /><table style='width: 100%'>";
content += "<tr><td id='log_date' style='font-size: xx-small'
onclick=\"edit_log_metadata('log_date', $('#log_date').text())\">" + (new
Date()).toDateString() + "</td><td id='log_hp' class='numeric'
style='font-size: xx-small' onclick=\"edit_log_metadata('log_hp',
$('#log_hp').text())\">" + log_hp + "</td><td id='log_xp' class='numeric'
style='font-size: xx-small' onclick=\"edit_log_metadata('log_xp',
$('#log_xp').text())\">" + (chardata.xp == null ? 0 : chardata.xp)
+ "</td><td style='text-align: right;'><input id='save_log' type='button'
value='save' onclick='save_log(chardata)'/></td></tr>";
content += "<tr><td colspan=4><textarea id='log_note' style='width:
100%'/></td></tr></table>";
@@ -440,7 +440,7 @@
$('#race').text(race ? race : '');
$('#clazz').text(clazz ? clazz : '');
$('#hp').text(chardata.hp == null ? '' : calc_hp(chardata.hp,
chardata.feats));
- $('#hp_input').val(chardata.hp == null ? '' : chardata.hp);
+ $("input['hp']").val(chardata.hp == null ? '' : chardata.hp);
$('#level').text(calc_level(chardata.xp == null ? 0 : chardata.xp) + 1);
// $('#attack_mod').spinner();
// $('#damage_mod').spinner();