Merge pull request #770 from ajaxorg/issues/console-clears-debug

Issues/console clears debug
gero3 · Jan 16, 2012 · f1e02b4 · f1e02b4
2 parents a464d5a + 59cd85c
commit f1e02b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/client/ext/console/console.js b/client/ext/console/console.js
@@ -604,13 +604,17 @@ module.exports = ext.register("ext/console/console", {
         apf.importCssString((this.css || "") + " .console_date{display:inline}");
 
         stProcessRunning.addEventListener("activate", function() {
-            _self.clear();
             _self.showOutput();
 
             if (_self.autoOpen 
               && apf.isTrue(settings.model.queryValue("auto/console/@autoshow")))
                 _self.show();
         });
+
+        // before the actual run target gets called we clear the console
+        ide.addEventListener("beforeRunning", function () {
+            _self.clear();
+        });
 
         ide.addEventListener("socketMessage", this.onMessage.bind(this));
         ide.addEventListener("consoleresult.internal-isfile", function(e) {

diff --git a/client/ext/runpanel/runpanel.js b/client/ext/runpanel/runpanel.js
@@ -339,6 +339,10 @@ module.exports = ext.register("ext/runpanel/runpanel", {
         if (lastNode)
             apf.xmldb.removeAttribute(lastNode, "last");
         apf.xmldb.setAttribute(config, "last", "true");
+
+        // dispatch here instead of in the implementation because the implementations
+        // will vary over time
+        ide.dispatchEvent("beforeRunning");
 
         noderunner.run(config.getAttribute("path"), (config.getAttribute("args") || "").split(" "), debug);
     },