From bb3adae0bc3b0dccfcf2f18101f5d32f3a078d0c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 29 Sep 2008 19:02:44 +0000 Subject: [PATCH] BUGFIX Fixed loading indicator in for add form in ModelAdmin.js git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63297 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/ModelAdmin.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js index 5515154e..1aacf1dc 100644 --- a/javascript/ModelAdmin.js +++ b/javascript/ModelAdmin.js @@ -195,7 +195,15 @@ $(document).ready(function() { $('#Form_ManagedModelsSelect').submit(function(){ className = $('select option:selected', this).val(); requestPath = $(this).attr('action').replace('ManagedModelsSelect', className + '/add'); - $('#ModelAdminPanel').fn('loadForm', requestPath); + var $button = $(':submit', this); + $('#ModelAdminPanel').fn( + 'loadForm', + requestPath, + function() { + $button.removeClass('loading'); + $button = null; + } + ); $('#form_actions_right').remove(); return false; }); @@ -218,8 +226,9 @@ $(document).ready(function() { * Load a detail editing form into the main edit panel * @todo Convert everything to jQuery so that the built-in load method can be used with this instead */ - loadForm: function(url) { + loadForm: function(url, successCallback) { $('#right #ModelAdminPanel').load(url, standardStatusHandler(function(result) { + if(typeof(successCallback) == 'function') successCallback.apply(); Behaviour.apply(); // refreshes ComplexTableField })); }