MINOR Skip processing in CMS on empty ajax responses, as they're usua…

…lly a pseudo redirect (via X-ControllerURL)
silverstripe · Apr 5, 2012 · aebbb10 · aebbb10
1 parent e01b0aa
commit aebbb10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js
@@ -83,11 +83,11 @@
 			 *  (XMLHTTPRequest) xmlhttp
 			 */
 			loadForm_responseHandler: function(oldForm, html, status, xmlhttp) {
+				if(!html) return;
 
 				if(oldForm.length > 0) {
 					oldForm.replaceWith(html); // triggers onmatch() on form
-				}
-				else {
+				} else {
 					 $('.cms-content').append(html);
 				}
 
@@ -199,6 +199,8 @@
 			 */
 			submitForm_responseHandler: function(oldForm, data, status, xmlhttp, origData) {
 				if(status == 'success') {
+					if(!data) return;
+
 					var form, newContent = $(data);
 
 					// HACK If response contains toplevel panel rather than a form, replace it instead.

diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
@@ -227,6 +227,10 @@ jQuery.noConflict();
 					headers: headers,
 					url: state.url,
 					success: function(data, status, xhr) {
+						// Pseudo-redirects via X-ControllerURL might return empty data, in which
+						// case we'll ignore the response
+						if(!data) return;
+
 						// Update title
 						var title = xhr.getResponseHeader('X-Title');
 						if(title) document.title = title;