GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-24 21:32:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made room.js jshint compliant

Browse Source
This commit is contained in:
Lucas Lois
2016-10-02 17:52:39 -03:00
parent 05edb2a98a
commit c1ce1a89d9
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/room.js
+18 -18
View File
@@ -1092,9 +1092,9 @@ var Room = {
var costTooltip = $('.tooltip', craftable.button); var costTooltip = $('.tooltip', craftable.button);
costTooltip.empty(); costTooltip.empty();
var cost = craftable.cost(); var cost = craftable.cost();
for(var k in cost) { for(var c in cost) {
$("<div>").addClass('row_key').text(_(k)).appendTo(costTooltip); $("<div>").addClass('row_key').text(_(c)).appendTo(costTooltip);
$("<div>").addClass('row_val').text(cost[k]).appendTo(costTooltip); $("<div>").addClass('row_val').text(cost[c]).appendTo(costTooltip);
} }
if(max && !craftable.button.hasClass('disabled')) { if(max && !craftable.button.hasClass('disabled')) {
Notifications.notify(Room, craftable.maxMsg); Notifications.notify(Room, craftable.maxMsg);
@@ -1107,33 +1107,33 @@ var Room = {
} }
} }
for(var k in Room.TradeGoods) { for(var g in Room.TradeGoods) {
good = Room.TradeGoods[k]; good = Room.TradeGoods[g];
var max = $SM.num(k, good) + 1 > good.maximum; var goodsMax = $SM.num(g, good) + 1 > good.maximum;
if(good.button == null) { if(good.button == null) {
if(Room.buyUnlocked(k)) { if(Room.buyUnlocked(g)) {
good.button = new Button.Button({ good.button = new Button.Button({
id: 'build_' + k, id: 'build_' + g,
cost: good.cost(), cost: good.cost(),
text: _(k), text: _(g),
click: Room.buy, click: Room.buy,
width: '80px' width: '80px'
}).css('opacity', 0).attr('buildThing', k).appendTo(buySection).animate({opacity:1}, 300, 'linear'); }).css('opacity', 0).attr('buildThing', g).appendTo(buySection).animate({opacity:1}, 300, 'linear');
} }
} else { } else {
// refresh the tooltip // refresh the tooltip
var costTooltip = $('.tooltip', good.button); var goodsCostTooltip = $('.tooltip', good.button);
costTooltip.empty(); goodsCostTooltip.empty();
var cost = good.cost(); var goodCost = good.cost();
for(var k in cost) { for(var gc in goodCost) {
$("<div>").addClass('row_key').text(_(k)).appendTo(costTooltip); $("<div>").addClass('row_key').text(_(gc)).appendTo(goodsCostTooltip);
$("<div>").addClass('row_val').text(cost[k]).appendTo(costTooltip); $("<div>").addClass('row_val').text(goodCost[gc]).appendTo(goodsCostTooltip);
} }
if(max && !good.button.hasClass('disabled')) { if(goodsMax && !good.button.hasClass('disabled')) {
Notifications.notify(Room, good.maxMsg); Notifications.notify(Room, good.maxMsg);
} }
} }
if(max) { if(goodsMax) {
Button.setDisabled(good.button, true); Button.setDisabled(good.button, true);
} else { } else {
Button.setDisabled(good.button, false); Button.setDisabled(good.button, false);