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

BUGFIX Switching all ajax implementations to consistently use jQuery.ajax instead of Prototype's Ajax.Request() (AssetTableField, CommentTableField, MemberTableField, WidgetAreaEditor)

Browse Source
This commit is contained in:
Ingo Schommer 2011-03-02 17:15:20 +13:00
parent fd3ae9100f
commit 0e9bf073c8
4 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
javascript/AssetTableField.js
View File

@ -127,6 +127,7 @@ AssetTableField.prototype = {
var img = Event.element(e);
var link = Event.findElement(e,"a");
var row = Event.findElement(e,"tr");
var self = this;
var linkCount = row.getElementsByClassName('linkCount')[0];
if(linkCount) linkCount = linkCount.innerHTML;
@ -139,30 +140,28 @@ AssetTableField.prototype = {
if(confirmed)
{
img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work
new Ajax.Request(
link.getAttribute("href"),
{
method: 'post',
postBody: 'forceajax=1' + ($('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''),
onComplete: function(){
Effect.Fade(
row,
{
afterFinish: function(obj) {
// remove row from DOM
obj.element.parentNode.removeChild(obj.element);
// recalculate summary if needed (assumes that TableListField.js is present)
// TODO Proper inheritance
if(this._summarise) this._summarise();
// custom callback
if(this.callback_deleteRecord) this.callback_deleteRecord(e);
}.bind(this)
jQuery.ajax({
'url': link.getAttribute("href"),
'method': 'post',
'data': {'forceajax': 1, 'SecurityID': $('SecurityID') ? $('SecurityID').value : null},
'success': function(){
Effect.Fade(
row,
{
afterFinish: function(obj) {
// remove row from DOM
obj.element.parentNode.removeChild(obj.element);
// recalculate summary if needed (assumes that TableListField.js is present)
// TODO Proper inheritance
if(self._summarise) self._summarise();
// custom callback
if(self.callback_deleteRecord) self.callback_deleteRecord(e);
}
);
}.bind(this),
onFailure: this.ajaxErrorHandler
}
);
}
);
},
'error': this.ajaxErrorHandler
});
}
Event.stop(e);

20
javascript/CommentTableField.js
View File

@ -55,17 +55,15 @@ CommentTableField.prototype = {
var row = Event.findElement(e,"tr");
img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work in Firefox1.5+
new Ajax.Request(
link.getAttribute("href"),
{
method: 'post',
postBody: 'forceajax=1',
onComplete: function(){
Effect.Fade(row);
}.bind(this),
onFailure: function(response) {errorMessage('Server Error', response);}
}
);
jQuery.ajax({
'url': link.getAttribute("href")
'method': 'post',
'data': 'forceajax=1',
'success': function(){
Effect.Fade(row);
},
'error': function(response) {errorMessage('Server Error', response);}
});
Event.stop(e);
},

10
javascript/MemberTableField.js
View File

@ -341,13 +341,15 @@ function ajaxSubmitFieldSet(href, fieldSet, extraData) {
data += '&'+extraData;
}
// Send request
new Ajax.Request(href, {
method : 'post', postBody : data,
onSuccess : function(response) {
jQuery.ajax({
'url': href,
'method' : 'post',
'data' : data,
'success' : function(response) {
//alert(response.responseText);
Ajax.Evaluator(response);
},
onFailure : function(response) {
'error' : function(response) {
alert(response.responseText);
//errorMessage('Error: ', response);
}

13
javascript/WidgetAreaEditor.js
View File

@ -122,12 +122,14 @@ WidgetAreaEditorClass.prototype = {
this.name = holder;
new Ajax.Request('Widget_Controller/EditableSegment/' + className, {
onSuccess : $('usedWidgets-'+holder).parentNode.parentNode.insertWidgetEditor.bind(this)
jQuery.ajax({
'url': 'Widget_Controller/EditableSegment/' + className,
'success' : $('usedWidgets-'+holder).parentNode.parentNode.insertWidgetEditor.bind(this)
});
},
updateWidgets: function() {
var self = this;
// Gotta get the name of the current dohickey based off the ID
this.name = this.element.id.split('-').pop();
@ -149,8 +151,11 @@ WidgetAreaEditorClass.prototype = {
var wIdArray = widget.id.split('-');
wIdArray.pop();
new Ajax.Request('Widget_Controller/EditableSegment/' + wIdArray.join('-'), {
onSuccess : $('usedWidgets-'+this.name).parentNode.parentNode.insertWidgetEditor.bind(this)
jQuery.ajax({
'url': 'Widget_Controller/EditableSegment/' + wIdArray.join('-'),
'success' : function() {
$('usedWidgets-'+self.name).parentNode.parentNode.insertWidgetEditor();
}
});
}
}