aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/script.js
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2011-08-19 10:45:03 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:13 +0200
commitdce38f44de04bd7a1f91f8e57f6d266bd5e1af86 (patch)
tree8c12244b1c2e052e03c06675848bff5d2297859a /phpBB/styles/script.js
parent94172b54dd09b28e19b4b12933b3f96e498d264a (diff)
downloadforums-dce38f44de04bd7a1f91f8e57f6d266bd5e1af86.tar
forums-dce38f44de04bd7a1f91f8e57f6d266bd5e1af86.tar.gz
forums-dce38f44de04bd7a1f91f8e57f6d266bd5e1af86.tar.bz2
forums-dce38f44de04bd7a1f91f8e57f6d266bd5e1af86.tar.xz
forums-dce38f44de04bd7a1f91f8e57f6d266bd5e1af86.zip
[ticket/10328] Added a JSON class.
The JSON class adds a consistent way to send JSON to the client, making it perfect for AJAX (jQuery automatically parses it). PHPBB3-10328
Diffstat (limited to 'phpBB/styles/script.js')
-rw-r--r--phpBB/styles/script.js3
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/styles/script.js b/phpBB/styles/script.js
index 54248cc31c..3ed12bfee8 100644
--- a/phpBB/styles/script.js
+++ b/phpBB/styles/script.js
@@ -216,8 +216,6 @@ phpbb.ajaxify = function(options, refresh, callback) {
function return_handler(res)
{
- res = JSON.parse(res);
-
if (typeof res.S_CONFIRM_ACTION === 'undefined')
{
/**
@@ -243,7 +241,6 @@ phpbb.ajaxify = function(options, refresh, callback) {
path = res.S_CONFIRM_ACTION;
phpbb.loading_alert();
$.post(path, data + '&confirm=' + res.YES_VALUE, function(res) {
- res = JSON.parse(res);
var alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
callback = phpbb.ajax_callbacks[callback];
if (typeof callback === 'function')