Commit ab9bd4b8 by Victor Shnayder

Have errors go through jsmolcalc's getInfo

parent d74b21e4
...@@ -107,11 +107,13 @@ ...@@ -107,11 +107,13 @@
var smiles = applet[0].smiles(); var smiles = applet[0].smiles();
var jme = applet[0].jmeFile(); var jme = applet[0].jmeFile();
var info = formatInfo(jsmol.API.getInfo(mol, smiles, jme).toString()); var info = jsmol.API.getInfo(mol, smiles, jme).toString();
var err = jsmol.API.getErrors(mol, smiles, jme).toString();
var value = { mol: mol, info: info }; var value = { mol: mol, info: info };
console.log("Molecule info:"); console.log("Molecule info:");
console.log(info); console.log(info);
console.log(err);
input_field.val(JSON.stringify(value)); input_field.val(JSON.stringify(value));
......
...@@ -299,12 +299,12 @@ function jsmolcalc(){ ...@@ -299,12 +299,12 @@ function jsmolcalc(){
$stats && $stats({moduleName:'jsmolcalc', sessionId:$sessionId_0, subSystem:'startup', evtGroup:'bootstrap', millis:(new Date).getTime(), type:'selectingPermutation'}); $stats && $stats({moduleName:'jsmolcalc', sessionId:$sessionId_0, subSystem:'startup', evtGroup:'bootstrap', millis:(new Date).getTime(), type:'selectingPermutation'});
if (!isHostedMode()) { if (!isHostedMode()) {
try { try {
unflattenKeylistIntoAnswers(['ie8'], '2264BD6A2D261E441E8A63207DEF3E41'); unflattenKeylistIntoAnswers(['ie6'], '2F6BC62FA9B71FB5EB318145F5D37E84');
unflattenKeylistIntoAnswers(['opera'], '280D82581672593B003FDD949FD05A1A'); unflattenKeylistIntoAnswers(['ie8'], '468C0B0171166372F064D287492CBD1E');
unflattenKeylistIntoAnswers(['gecko1_8'], '62AEDCE3B4B02EAB0CE4B5E294387270'); unflattenKeylistIntoAnswers(['gecko1_8'], 'C43483CC355E7BFB7BE2F45092922897');
unflattenKeylistIntoAnswers(['ie6'], '787A0D27E3B86B1358ECC872176CB896'); unflattenKeylistIntoAnswers(['safari'], 'E38BF09B489084CBFD0BF2CB8A77BFAC');
unflattenKeylistIntoAnswers(['ie9'], 'C6CC2FE28A276F9AD839FEB4866C99F7'); unflattenKeylistIntoAnswers(['opera'], 'E8EDF03FE9C26D69E2C7DB17E15CF0ED');
unflattenKeylistIntoAnswers(['safari'], 'FE94467421A960F46BE7208756BA8AB4'); unflattenKeylistIntoAnswers(['ie9'], 'F8283183F9546F019176F75A8E25B0F0');
strongName = answers[computePropValue('user.agent')]; strongName = answers[computePropValue('user.agent')];
var idx = strongName.indexOf(':'); var idx = strongName.indexOf(':');
if (idx != -1) { if (idx != -1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment