Commit 339518 by dries
- Patch #673884 by casey, mfer: optimize Drupal.parseJSON.
--- <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js</a> 2010/03/06 07:28:29 1.11
+++ <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js</a> 2010/03/10 15:14:38 1.12
@@ -132,7 +132,7 @@
// Sanity check for browser support (object expected).
// When using iFrame uploads, responses must be returned as a string.
if (typeof response == 'string') {
- response = Drupal.parseJson(response);
+ response = $.parseJson(response);
}
return ajax.success(response, status);
},
--- <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js</a> 2010/03/09 20:52:27 1.64
+++ <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js</a> 2010/03/10 15:14:38 1.65
@@ -248,18 +248,6 @@
};
/**
- * Parse a JSON response.
- *
- * The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
- */
-Drupal.parseJson = function (data) {
- if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
- return { status: 0, data: data.length ? data : Drupal.t('Unspecified error') };
- }
- return eval('(' + data + ');');
-};
-
-/**
* Freeze the current body height (as minimum height). Used to prevent
* unnecessary upwards scrolling when doing DOM manipulations.
*/
+++ <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/ajax.js</a> 2010/03/10 15:14:38 1.12
@@ -132,7 +132,7 @@
// Sanity check for browser support (object expected).
// When using iFrame uploads, responses must be returned as a string.
if (typeof response == 'string') {
- response = Drupal.parseJson(response);
+ response = $.parseJson(response);
}
return ajax.success(response, status);
},
--- <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js</a> 2010/03/09 20:52:27 1.64
+++ <a href="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" title="http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js" rel="nofollow">http://drupalcode.org/viewvc/drupal/drupal/misc/drupal.js</a> 2010/03/10 15:14:38 1.65
@@ -248,18 +248,6 @@
};
/**
- * Parse a JSON response.
- *
- * The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
- */
-Drupal.parseJson = function (data) {
- if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
- return { status: 0, data: data.length ? data : Drupal.t('Unspecified error') };
- }
- return eval('(' + data + ');');
-};
-
-/**
* Freeze the current body height (as minimum height). Used to prevent
* unnecessary upwards scrolling when doing DOM manipulations.
*/