prototype: Avoid the try..catch block in Ajax.Response#_getResponseJS…

…ON unless required.
madrobby · Oct 22, 2007 · f870fba · f870fba
1 parent 0100aee
commit f870fba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Avoid the try..catch block in Ajax.Response#_getResponseJSON unless required. [Tobie Langel]
+
 * Add more tests to Element.update. Closes #9327. [Tobie Langel]
 
 * Make the Ajax.Response#headerJSON property correctly decode unicode characters. Closes #9285. [Marius Feraru, Tobie Langel]

diff --git a/src/ajax.js b/src/ajax.js
@@ -287,11 +287,11 @@ Ajax.Response = Class.create({
 
   _getResponseJSON: function() {
     var options = this.request.options;
+    if (!options.evalJSON || (options.evalJSON != 'force' && 
+      !(this.getHeader('Content-type') || '').include('application/json')))
+        return null;
     try {
-      if (options.evalJSON == 'force' || (options.evalJSON &&
-          (this.getHeader('Content-type') || '').include('application/json')))
-        return this.transport.responseText.evalJSON(options.sanitizeJSON);
-      return null;
+      return this.transport.responseText.evalJSON(options.sanitizeJSON);
     } catch (e) {
       this.request.dispatchException(e);
     }