diff --git a/common/static/js/capa/editamolecule.js b/common/static/js/capa/editamolecule.js index 42242195bd..f4c051fefe 100644 --- a/common/static/js/capa/editamolecule.js +++ b/common/static/js/capa/editamolecule.js @@ -107,11 +107,13 @@ var smiles = applet[0].smiles(); 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 }; console.log("Molecule info:"); console.log(info); + console.log(err); input_field.val(JSON.stringify(value)); diff --git a/common/static/js/capa/jsmolcalc/787A0D27E3B86B1358ECC872176CB896.cache.html b/common/static/js/capa/jsmolcalc/2F6BC62FA9B71FB5EB318145F5D37E84.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/787A0D27E3B86B1358ECC872176CB896.cache.html rename to common/static/js/capa/jsmolcalc/2F6BC62FA9B71FB5EB318145F5D37E84.cache.html index af4a2ecb7d..c141070d9b 100644 --- a/common/static/js/capa/jsmolcalc/787A0D27E3B86B1358ECC872176CB896.cache.html +++ b/common/static/js/capa/jsmolcalc/2F6BC62FA9B71FB5EB318145F5D37E84.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = '787A0D27E3B86B1358ECC872176CB896'; +var $strongName = '2F6BC62FA9B71FB5EB318145F5D37E84'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + + - diff --git a/common/static/js/capa/jsmolcalc/2264BD6A2D261E441E8A63207DEF3E41.cache.html b/common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/2264BD6A2D261E441E8A63207DEF3E41.cache.html rename to common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html index 82c128524e..7c2b151277 100644 --- a/common/static/js/capa/jsmolcalc/2264BD6A2D261E441E8A63207DEF3E41.cache.html +++ b/common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = '2264BD6A2D261E441E8A63207DEF3E41'; +var $strongName = '468C0B0171166372F064D287492CBD1E'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + + - diff --git a/common/static/js/capa/jsmolcalc/62AEDCE3B4B02EAB0CE4B5E294387270.cache.html b/common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/62AEDCE3B4B02EAB0CE4B5E294387270.cache.html rename to common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html index f564a4d509..dbd7f2dd35 100644 --- a/common/static/js/capa/jsmolcalc/62AEDCE3B4B02EAB0CE4B5E294387270.cache.html +++ b/common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = '62AEDCE3B4B02EAB0CE4B5E294387270'; +var $strongName = 'C43483CC355E7BFB7BE2F45092922897'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + + - diff --git a/common/static/js/capa/jsmolcalc/FE94467421A960F46BE7208756BA8AB4.cache.html b/common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/FE94467421A960F46BE7208756BA8AB4.cache.html rename to common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html index 3a5592bf72..b8cf726023 100644 --- a/common/static/js/capa/jsmolcalc/FE94467421A960F46BE7208756BA8AB4.cache.html +++ b/common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = 'FE94467421A960F46BE7208756BA8AB4'; +var $strongName = 'E38BF09B489084CBFD0BF2CB8A77BFAC'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + - + + - diff --git a/common/static/js/capa/jsmolcalc/280D82581672593B003FDD949FD05A1A.cache.html b/common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/280D82581672593B003FDD949FD05A1A.cache.html rename to common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html index 991e0e490b..5255e0e552 100644 --- a/common/static/js/capa/jsmolcalc/280D82581672593B003FDD949FD05A1A.cache.html +++ b/common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = '280D82581672593B003FDD949FD05A1A'; +var $strongName = 'E8EDF03FE9C26D69E2C7DB17E15CF0ED'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + + - diff --git a/common/static/js/capa/jsmolcalc/C6CC2FE28A276F9AD839FEB4866C99F7.cache.html b/common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html similarity index 69% rename from common/static/js/capa/jsmolcalc/C6CC2FE28A276F9AD839FEB4866C99F7.cache.html rename to common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html index 145a186d11..b4b1d177df 100644 --- a/common/static/js/capa/jsmolcalc/C6CC2FE28A276F9AD839FEB4866C99F7.cache.html +++ b/common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html @@ -4,14 +4,14 @@ var $gwt_version = "2.5.0"; var $wnd = parent; var $doc = $wnd.document; var $moduleName, $moduleBase; -var $strongName = 'C6CC2FE28A276F9AD839FEB4866C99F7'; +var $strongName = 'F8283183F9546F019176F75A8E25B0F0'; var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null, $sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; $stats && $stats({moduleName:'jsmolcalc',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); - + + - diff --git a/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js b/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js index 4f38a87161..3bdee52fb1 100644 --- a/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js +++ b/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js @@ -299,12 +299,12 @@ function jsmolcalc(){ $stats && $stats({moduleName:'jsmolcalc', sessionId:$sessionId_0, subSystem:'startup', evtGroup:'bootstrap', millis:(new Date).getTime(), type:'selectingPermutation'}); if (!isHostedMode()) { try { - unflattenKeylistIntoAnswers(['ie8'], '2264BD6A2D261E441E8A63207DEF3E41'); - unflattenKeylistIntoAnswers(['opera'], '280D82581672593B003FDD949FD05A1A'); - unflattenKeylistIntoAnswers(['gecko1_8'], '62AEDCE3B4B02EAB0CE4B5E294387270'); - unflattenKeylistIntoAnswers(['ie6'], '787A0D27E3B86B1358ECC872176CB896'); - unflattenKeylistIntoAnswers(['ie9'], 'C6CC2FE28A276F9AD839FEB4866C99F7'); - unflattenKeylistIntoAnswers(['safari'], 'FE94467421A960F46BE7208756BA8AB4'); + unflattenKeylistIntoAnswers(['ie6'], '2F6BC62FA9B71FB5EB318145F5D37E84'); + unflattenKeylistIntoAnswers(['ie8'], '468C0B0171166372F064D287492CBD1E'); + unflattenKeylistIntoAnswers(['gecko1_8'], 'C43483CC355E7BFB7BE2F45092922897'); + unflattenKeylistIntoAnswers(['safari'], 'E38BF09B489084CBFD0BF2CB8A77BFAC'); + unflattenKeylistIntoAnswers(['opera'], 'E8EDF03FE9C26D69E2C7DB17E15CF0ED'); + unflattenKeylistIntoAnswers(['ie9'], 'F8283183F9546F019176F75A8E25B0F0'); strongName = answers[computePropValue('user.agent')]; var idx = strongName.indexOf(':'); if (idx != -1) {