Browse Source

Always respond with JSON

Tobias Reich 8 years ago
parent
commit
7a54476ff1
2 changed files with 3 additions and 12 deletions
  1. 2 2
      php/Modules/Response.php
  2. 1 10
      src/scripts/api.js

+ 2 - 2
php/Modules/Response.php

@@ -6,13 +6,13 @@ final class Response {
 
 	public static function warning($msg) {
 
-		exit('Warning: ' . $msg);
+		exit(json_encode('Warning: ' . $msg));
 
 	}
 
 	public static function error($msg) {
 
-		exit('Error: ' . $msg);
+		exit(json_encode('Error: ' . $msg));
 
 	}
 

+ 1 - 10
src/scripts/api.js

@@ -26,15 +26,6 @@ api.post = function(fn, params, callback) {
 			return false
 		}
 
-		// Convert true and false to real booleans
-		if (data==='true')       data = true
-		else if (data==='false') data = false
-
-		// Convert to JSON if string start with '{' and ends with '}'
-		if (typeof data==='string' && data.substring(0, 1)==='{' && data.substring(data.length - 1, data.length)==='}') {
-			data = $.parseJSON(data)
-		}
-
 		callback(data)
 
 	}
@@ -49,7 +40,7 @@ api.post = function(fn, params, callback) {
 		type: 'POST',
 		url: api.path,
 		data: params,
-		dataType: 'text',
+		dataType: 'json',
 		success,
 		error
 	})