Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-30 23:01:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #617 from urkerab/battle-exception-stack

Browse Source 
Improve stacks for exceptions in battles
This commit is contained in:
Guangcong Luo
2016-01-17 12:13:27 -08:00
parent 3fb0c4d868 cc2aac7bb9
commit 9370f0fbf0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/battle.js
View File

@@ -6023,12 +6023,16 @@ var Battle = (function () {
this.runMajor(args, kwargs, preempt);
}
} catch (e) {
this.log('<div class="chat">Error parsing: ' + Tools.escapeHTML(str) + '</div>', preempt);
this.log('<div class="chat">Error parsing: ' + Tools.escapeHTML(str) + ' (' + Tools.escapeHTML('' + e) + ')</div>', preempt);
if (e.stack) {
var stack = '' + e.stack;
this.log('<div class="chat" style="white-space:pre-wrap">' + Tools.escapeHTML(stack) + '</div>', preempt);
} else {
this.log('<div class="chat">Error: ' + Tools.escapeHTML('' + e) + '</div>', preempt);
var stack = Tools.escapeHTML('' + e.stack).split('\n');
for (var i = 0; i < stack.length; i++) {
if (/\brun\b/.test(stack[i])) {
stack.length = i;
break;
}
}
this.log('<div class="chat">' + stack.join('<br>') + '</div>', preempt);
}
if (this.errorCallback) this.errorCallback(this);
}