GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-04 19:47:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made events.js jshint compliant

Browse Source
This commit is contained in:
Lucas Lois
2016-10-02 17:40:54 -03:00
parent 4ced5337da
commit 8370eac8aa
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+15 -11
View File
@@ -153,7 +153,7 @@ var Events = {
string = 'resume.'; string = 'resume.';
log = 'paused'; log = 'paused';
} }
btn.children('.text').first().text( _(string) ) btn.children('.text').first().text( _(string) );
Events.paused = (state == 'auto') ? 'auto' : true; Events.paused = (state == 'auto') ? 'auto' : true;
event.addClass('paused'); event.addClass('paused');
Button.clearCooldown(btn); Button.clearCooldown(btn);
@@ -189,6 +189,7 @@ var Events = {
break; break;
case 'auto': case 'auto':
Button.cooldown(btn); Button.cooldown(btn);
/* falls through */
default: default:
log = 'resumed'; log = 'resumed';
time = Events._PAUSE_COOLDOWN * 1000; time = Events._PAUSE_COOLDOWN * 1000;
@@ -373,8 +374,8 @@ var Events = {
out = true; out = true;
} }
} }
for(var k in mod) { for(var m in mod) {
Path.outfit[k] += mod[k]; Path.outfit[m] += mod[m];
} }
if(out) { if(out) {
Button.setDisabled(btn, true); Button.setDisabled(btn, true);
@@ -596,11 +597,12 @@ var Events = {
if(weight > freeSpace) { if(weight > freeSpace) {
// Draw the drop menu // Draw the drop menu
Engine.log('drop menu'); Engine.log('drop menu');
var dropMenu;
if($('#dropMenu').length){ if($('#dropMenu').length){
var dropMenu = $('#dropMenu'); dropMenu = $('#dropMenu');
$('#dropMenu').empty(); $('#dropMenu').empty();
} else { } else {
var dropMenu = $('<div>').attr({'id': 'dropMenu', 'data-legend': _('drop:')}); dropMenu = $('<div>').attr({'id': 'dropMenu', 'data-legend': _('drop:')});
needsAppend = true; needsAppend = true;
} }
for(var k in Path.outfit) { for(var k in Path.outfit) {
@@ -676,9 +678,10 @@ var Events = {
} }
} }
lootButtons.appendTo(desc); lootButtons.appendTo(desc);
var takeET = null;
if(lootButtons.children().length > 0) { if(lootButtons.children().length > 0) {
var takeETrow = $('<div>').addClass('takeETrow'); var takeETrow = $('<div>').addClass('takeETrow');
var takeET = new Button.Button({ takeET = new Button.Button({
id: 'loot_takeEverything', id: 'loot_takeEverything',
text: '', text: '',
cooldown: Events._LEAVE_COOLDOWN, cooldown: Events._LEAVE_COOLDOWN,
@@ -773,10 +776,10 @@ var Events = {
World.updateSupplies(); World.updateSupplies();
}, },
getLoot: function(btn, skipButtonSet) { getLoot: function(btn, stateSkipButtonSet) {
var name = btn.attr('id').substring(5).replace('-', ' '); var name = btn.attr('id').substring(5).replace('-', ' ');
if(btn.data('numLeft') > 0) { if(btn.data('numLeft') > 0) {
var skipButtonSet = skipButtonSet || false; var skipButtonSet = stateSkipButtonSet || false;
var weight = Path.getWeight(name); var weight = Path.getWeight(name);
var freeSpace = Path.getFreeSpace(); var freeSpace = Path.getFreeSpace();
if(weight <= freeSpace) { if(weight <= freeSpace) {
@@ -857,8 +860,9 @@ var Events = {
} }
// Draw any loot // Draw any loot
var takeETbtn;
if(scene.loot) { if(scene.loot) {
var takeETbtn = Events.drawLoot(scene.loot); takeETbtn = Events.drawLoot(scene.loot);
} }
// Draw the buttons // Draw the buttons
@@ -1113,7 +1117,7 @@ var Events = {
if(typeof target[i] == 'function'){ if(typeof target[i] == 'function'){
target[i](); target[i]();
} else { } else {
$SM.remove(stateName) $SM.remove(stateName);
} }
} }
} }
@@ -1127,7 +1131,7 @@ var Events = {
if(delay){ if(delay){
$SM.set(state, delay); $SM.set(state, delay);
} else { } else {
var delay = $SM.get(state, true) delay = $SM.get(state, true);
} }
var time = Engine.setInterval(function(){ var time = Engine.setInterval(function(){
// update state every half second // update state every half second