From 233e6e970fd93fffc48bf19b5ea663c2bae00fb8 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 03:20:05 +0000 Subject: [PATCH] MINOR Using global ajaxComplete handlers for LeftAndMain instead of limiting to error handlers to allow usage of X-Status messages throughout the CMS git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92827 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/LeftAndMain.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js index ffac1f29..7324d86d 100644 --- a/javascript/LeftAndMain.js +++ b/javascript/LeftAndMain.js @@ -5,18 +5,20 @@ var ss_MainLayout; (function($) { + $(function() { + // global ajax error handlers + $('.LeftAndMain').bind('ajaxComplete', function(e, xmlhttp, settings) { + var status = (xmlhttp.status >= 400) ? 'bad' : 'good'; + var msg = (xmlhttp.getResponseHeader('X-Status')) ? xmlhttp.getResponseHeader('X-Status') : xmlhttp.statusText; + // Don't display standard '200 OK' messages + if(msg && msg != 'OK') statusMessage(msg, status); + }); + }); + $.concrete('ss', function($){ // setup jquery.concrete $.concrete.warningLevel = $.concrete.WARN_LEVEL_BESTPRACTISE; - - // global ajax error handlers - $.ajaxSetup({ - error: function(xmlhttp, status, error) { - var msg = (xmlhttp.getResponseHeader('X-Status')) ? xmlhttp.getResponseHeader('X-Status') : xmlhttp.statusText; - statusMessage(msg, 'bad'); - } - }); /** * Available Custom Events: