dist/env-js.jar @@ -8603,7 +8603,7 @@ XMLHttpRequest.prototype = { $debug("parsing response text into xml document"); responseXML = $domparser.parseFromString(_this.responseText+""); return responseXML; - } catch(e) { + } catch(e) { $error('response XML does not apear to be well formed xml', e); responseXML = $domparser.parseFromString("<html>"+ "<head/><body><p> parse error </p></body></html>"); dist/env.js @@ -9260,7 +9260,7 @@ XMLHttpRequest.prototype = { $debug("parsing response text into xml document"); responseXML = $domparser.parseFromString(_this.responseText+""); return responseXML; - } catch(e) { + } catch(e) { $error('response XML does not apear to be well formed xml', e); responseXML = $domparser.parseFromString("<html>"+ "<head/><body><p> parse error </p></body></html>"); dist/env.rhino.js @@ -15,6 +15,15 @@ package org.mozilla.javascript.tools.envjs; public class Main extends org.mozilla.javascript.tools.shell.Main { + private static class Quitter implements + org.mozilla.javascript.tools.shell.QuitAction + { + public void quit(org.mozilla.javascript.Context cx, int exitCode) + { + System.exit(exitCode); + } + } + static { // replace the generic Global object, instantiated in @@ -31,5 +40,6 @@ public class Main extends org.mozilla.javascript.tools.shell.Main // "Sharing Scopes" in // https://developer.mozilla.org/En/Rhino_documentation/Scopes_and_Contexts global = new Global(window); + global.initQuitAction(new Quitter()); } } rhino/src/org/mozilla/javascript/tools/envjs/Main.java 1b5d4de28c6732be423e3a584ba530de62c324a6 Glen E. Ivey gleneivey@wontology.org http://github.com/thatcher/env-js/commit/6c1fd5dcadbb25d6c3de5e687ce688eb021b27fb 6c1fd5dcadbb25d6c3de5e687ce688eb021b27fb

2009-10-14T19:29:13-07:00

Added support for the "quit" command/function provided by the Rhino shell before I started sub-classing it. All env.js tests pass, and I have manually confirmed that "quit();" now works when using env-js.jar as an interactive shell. 83bb84d89c9b5697ecffb7a55398534041d40638 Glen E. Ivey gleneivey@wontology.org