Error handler tweaks, closes #26

darsain · Dec 23, 2013 · c1364da · c1364da
1 parent 4b551c7
commit c1364da
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/public/js/main.js b/public/js/main.js
@@ -115,27 +115,6 @@ jQuery(function ($) {
 
 		$controls.html(tmpl('controls_loading'));
 		execution.then(responseDone, responseFail);
-/*
-		execution.done(function (res) {
-			console.log('done response:', res);
-			$response.show();
-
-			if (res && res.output !== undefined) {
-				$controls.html(tmpl('controls', res));
-				$response.html(tmpl('output', res));
-				activate(tabs.active, 1);
-			} else {
-				$controls.html(tmpl('ended_unexpectedly'));
-				$response.html(tmpl('output', res));
-				activate(tabs.initial, 1);
-			}
-		}).fail(function (res) {
-			console.log('fail response:', res);
-			$controls.html(tmpl('controls_error', res));
-			$response.html(tmpl('output', res.responseText));
-		}).always(function () {
-			$response.imagesLoaded(resize);
-		});*/
 	}
 
 	/**

diff --git a/src/Darsain/Console/Console.php b/src/Darsain/Console/Console.php
@@ -113,7 +113,7 @@ public static function execute($code)
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		// Retrieve an error
+		// When error occurred, add it to profile.
 		if ($estatus === false) {
 			static::addProfile('error', error_get_last());
 		}

diff --git a/src/controllers/ConsoleController.php b/src/controllers/ConsoleController.php
@@ -1,6 +1,6 @@
 <?php namespace Darsain\Console;
 
-use \Controller, \View, \Input, \App, \Response, \Route;
+use \Controller, \View, \Input, \Response;
 
 class ConsoleController extends Controller {
 
@@ -16,6 +16,11 @@ public function postExecute()
 		// Execute and profile the code
 		$profile = Console::execute($code);
 
+		// Terminate on error, as Error Handler already responded.
+		if (isset($profile['error']) and $profile['error']) {
+			exit;
+		}
+
 		// Response
 		return Response::json($profile);
 	}

diff --git a/src/routes.php b/src/routes.php
@@ -9,7 +9,7 @@
 */
 
 App::error(function (Exception $e, $code) {
-	if (Route::currentRouteName() !== 'console_execute') {
+	if (App::runningInConsole() or !(Request::url() === 'console' and $_SERVER['REQUEST_METHOD'] === 'POST')) {
 		return;
 	}
 	@ob_end_clean();

diff --git a/src/views/partials/templates.php b/src/views/partials/templates.php
@@ -48,7 +48,7 @@
 			<pre class="output_holder">{{=output}}</pre>
 		{{ } else if (typeof data !== 'undefined' && data) { }}
 			{{=data}}
-		{{ } else if (!error) { }}
+		{{ } else if (typeof error === 'undefined') { }}
 			<span class="muted"><em>Code produced no output</em></span>
 		{{ } }}