Removed the appendInlineAnchor call from ajaxSuccess event as it was also fired at a successful inline edit query. Instead, created a custom event appendAnchor on #sqlqueryresults which is triggered when necessary. Also got transformations working for application/octetstream mime type.
This commit is contained in:
15
js/sql.js
15
js/sql.js
@@ -86,12 +86,12 @@ $(document).ready(function() {
|
|||||||
disp_mode = $(this).val();
|
disp_mode = $(this).val();
|
||||||
})
|
})
|
||||||
|
|
||||||
appendInlineAnchor(disp_mode);
|
$("#sqlqueryresults").live('appendAnchor',function() {
|
||||||
|
|
||||||
$("#sqlqueryresults").ajaxSuccess(function() {
|
|
||||||
appendInlineAnchor(disp_mode);
|
appendInlineAnchor(disp_mode);
|
||||||
})
|
})
|
||||||
|
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
|
|
||||||
$('<span id="togglequerybox"></span>')
|
$('<span id="togglequerybox"></span>')
|
||||||
.html(PMA_messages['strToggleQueryBox'])
|
.html(PMA_messages['strToggleQueryBox'])
|
||||||
.appendTo("#sqlqueryform");
|
.appendTo("#sqlqueryform");
|
||||||
@@ -117,8 +117,9 @@ $(document).ready(function() {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#sqlqueryresults").html(data);
|
$("#sqlqueryresults").html(data);
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
if($("#togglequerybox").siblings(":visible").length > 0) {
|
if($("#togglequerybox").siblings(":visible").length > 0) {
|
||||||
$("#togglequerybox").trigger('click');
|
$("#togglequerybox").trigger('click');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -134,6 +135,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
$.post($(the_form).attr('action'), $(the_form).serialize(), function(data) {
|
$.post($(the_form).attr('action'), $(the_form).serialize(), function(data) {
|
||||||
$("#sqlqueryresults").html(data);
|
$("#sqlqueryresults").html(data);
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
})
|
})
|
||||||
})// end Paginate results table
|
})// end Paginate results table
|
||||||
|
|
||||||
@@ -145,6 +147,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
$.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
|
$.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
|
||||||
$("#sqlqueryresults").html(data);
|
$("#sqlqueryresults").html(data);
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
})
|
})
|
||||||
})// end Paginate results with Page Selector
|
})// end Paginate results with Page Selector
|
||||||
|
|
||||||
@@ -156,6 +159,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
$.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
|
$.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
|
||||||
$("#sqlqueryresults").html(data);
|
$("#sqlqueryresults").html(data);
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
})
|
})
|
||||||
})//end Sort results table
|
})//end Sort results table
|
||||||
|
|
||||||
@@ -165,6 +169,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
$.post($(this).attr('action'), $(this).serialize() + '&ajax_request=true' , function(data) {
|
$.post($(this).attr('action'), $(this).serialize() + '&ajax_request=true' , function(data) {
|
||||||
$("#sqlqueryresults").html(data);
|
$("#sqlqueryresults").html(data);
|
||||||
|
$("#sqlqueryresults").trigger('appendAnchor');
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
//end displayOptionsForm handler
|
//end displayOptionsForm handler
|
||||||
@@ -374,7 +379,7 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
$.each(data.transformations, function(key, value) {
|
$.each(data.transformations, function(key, value) {
|
||||||
if(key == field_name) {
|
if(key == field_name) {
|
||||||
if($(this_field).hasClass('text_plain')) {
|
if($(this_field).is('.text_plain, .application_octetstream')) {
|
||||||
new_html = value;
|
new_html = value;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user