tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Better response handling in LeftAndMain.EditForm

Browse Source 
BUGFIX Fixed event cancellation in LeftAndMain.EditForm javascript buttons

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92672 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 02:39:06 +00:00
parent b99ee16d88
commit 41c1c49dfe
1 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
javascript/LeftAndMain.EditForm.js
View File

@ -57,20 +57,21 @@
} }
// get all data from the form // get all data from the form
var data = this.serializeArray(); var formData = this.serializeArray();
// add button action // add button action
data.push({name: $(button).attr('name'), value:'1'}); formData.push({name: $(button).attr('name'), value:'1'});
$.post(
this.attr('action'),
data,
function(response) {
$(button).removeClass('loading');
self._loadResponse(response); $.ajax({
url: this.attr('action'),
data: formData,
type: 'POST',
complete: function(xmlhttp, status) {
$(button).removeClass('loading');
// pass along original form data to enable old/new comparisons
self._loadResponse(xmlhttp.responseText, status, xmlhttp, formData);
}, },
// @todo Currently all responses are assumed to be evaluated dataType: 'html'
'script' });
);
return false; return false;
}, },
@ -96,15 +97,14 @@
*/ */
load: function(url, callback) { load: function(url, callback) {
var self = this; var self = this;
$.get( $.ajax({
url, url: url,
function(response) { complete: function(xmlhttp, status) {
self._loadResponse(response); self._loadResponse(xmlhttp.responseText, status, xmlhttp);
if(callback) callback.apply(self, [response]); if(callback) callback.apply(self, arguments);
}, },
// @todo Currently all responses are assumed to be evaluated dataType: 'html'
'script' });
);
}, },
/** /**
@ -114,7 +114,8 @@
* @param {String} removeText Short note why the form has been removed, displayed in <p> tags. * @param {String} removeText Short note why the form has been removed, displayed in <p> tags.
* Falls back to the default RemoveText() option (Optional) * Falls back to the default RemoveText() option (Optional)
*/ */
remove: function(removeText) { removeForm: function(removeText) {
if(!removeText) removeText = this.RemoveText();
this.html('<p>' + removeText + '</p>'); this.html('<p>' + removeText + '</p>');
}, },
@ -133,14 +134,20 @@
}, },
/** /**
* @param {String} result Either HTML for straight insertion, or eval'ed JavaScript. * @param {String} data Either HTML for straight insertion, or eval'ed JavaScript.
* If passed as HTML, it is assumed that everying inside the <form> tag is replaced, * If passed as HTML, it is assumed that everying inside the <form> tag is replaced,
* but the old <form> tag itself stays intact. * but the old <form> tag itself stays intact.
* @param {String} status
* @param {XMLHTTPRequest} xmlhttp
* @param {Array} origData The original submitted data, useful to do comparisons of changed
* values in new form output, e.g. to detect a URLSegment being changed on the serverside.
* Array in jQuery serializeArray() notation.
*/ */
_loadResponse: function(response) { _loadResponse: function(data, status, xmlhttp, origData) {
if(status == 'success') {
this.cleanup(); this.cleanup();
var html = response; var html = data;
// Rewrite # links // Rewrite # links
html = html.replace(/(<a[^>]+href *= *")#/g, '$1' + window.location.href.replace(/#.*$/,'') + '#'); html = html.replace(/(<a[^>]+href *= *")#/g, '$1' + window.location.href.replace(/#.*$/,'') + '#');
@ -154,7 +161,13 @@
this.remove(); this.remove();
}); });
// update form content
if(html) {
this.html(html); this.html(html);
} else {
this.removeForm();
}
// Optionally get the form attributes from embedded fields, see Form->formHtmlContent() // Optionally get the form attributes from embedded fields, see Form->formHtmlContent()
for(var overrideAttr in {'action':true,'method':true,'enctype':true,'name':true}) { for(var overrideAttr in {'action':true,'method':true,'enctype':true,'name':true}) {
var el = this.find(':input[name='+ '_form_' + overrideAttr + ']'); var el = this.find(':input[name='+ '_form_' + overrideAttr + ']');
@ -164,18 +177,22 @@
} }
} }
if(this.hasClass('validationerror')) {
statusMessage(ss.i18n._t('ModelAdmin.VALIDATIONERROR', 'Validation Error'), 'bad');
} else {
statusMessage(ss.i18n._t('ModelAdmin.SAVED', 'Saved'), 'good');
}
Behaviour.apply(); // refreshes ComplexTableField Behaviour.apply(); // refreshes ComplexTableField
// focus input on first form element // focus input on first form element
this.find(':input:visible:first').focus(); this.find(':input:visible:first').focus();
this.trigger('loadnewpage', {response: response}); this.trigger('loadnewpage', {data: data, origData: origData});
}
// set status message based on response
var _statusMessage = (xmlhttp.getResponseHeader('X-Status')) ? xmlhttp.getResponseHeader('X-Status') : xmlhttp.statusText;
if(this.hasClass('validationerror')) {
// TODO validation shouldnt need a special case
statusMessage(ss.i18n._t('ModelAdmin.VALIDATIONERROR', 'Validation Error'), 'bad');
} else {
statusMessage(_statusMessage, (xmlhttp.status >= 400) ? 'bad' : 'good');
}
} }
}; };
}); });
@ -191,7 +208,7 @@
onmatch: function() { onmatch: function() {
var self = this; var self = this;
// TODO Fix once concrete library is updated // TODO Fix once concrete library is updated
this.bind('click', function(e) {self.clickFake(e);}); this.bind('click', function(e) {return self.clickFake(e);});
}, },
clickFake: function(e) { clickFake: function(e) {
$(this[0].form).concrete('ss').ajaxSubmit(this); $(this[0].form).concrete('ss').ajaxSubmit(this);