The branch, master has been updated
via 45ba32fa18caa705275fc03900a45f22c635daa8 (commit)
from 6f5e0c9407c9857cde3e7cf578711007983a74c6 (commit)
- Log -----------------------------------------------------------------
commit 45ba32fa18caa705275fc03900a45f22c635daa8
Author: Marc Delisle <[email protected]>
Date: Thu Dec 30 07:27:19 2010 -0500
AJAX navi buttons do not work in search results, so use the same div as in
normal browse results
-----------------------------------------------------------------------
Summary of changes:
js/tbl_select.js | 27 ++++-----------------------
tbl_select.php | 2 +-
2 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 208daac..3c6cae3 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -22,25 +22,6 @@ $(document).ready(function() {
cache: 'false'
});
- /**
- * Attach the {...@link appendInlineAnchor} function to a custom event,
which
- * will be triggered manually everytime the table of results is reloaded;
- *
- * Needs appendInlineAnchor() which is defined in sql.js
- * @memberOf jQuery
- */
- $("#searchresults").live('appendAnchor',function() {
- appendInlineAnchor();
- })
-
- /**
- * Trigger the appendAnchor event to prepare the first table for inline
edit
- *
- * @memberOf jQuery
- */
- $("#searchresults").trigger('appendAnchor');
-
-
$('<a id="togglesearchform"></a>')
.html(PMA_messages['strShowSearchCriteria'])
.insertAfter('#tbl_search_form')
@@ -70,7 +51,7 @@ $(document).ready(function() {
event.preventDefault();
// empty previous search results while we are waiting for new results
- $("#searchresults").empty();
+ $("#sqlqueryresults").empty();
PMA_ajaxShowMessage(PMA_messages['strSearching']);
// add this hidden field just once
@@ -81,8 +62,8 @@ $(document).ready(function() {
$.post($search_form.attr('action'), $search_form.serialize(),
function(response) {
if (typeof response == 'string') {
// found results
- $("#searchresults").html(response);
- $("#searchresults").trigger('appendAnchor');
+ $("#sqlqueryresults").html(response);
+ $("#sqlqueryresults").trigger('appendAnchor');
$('#tbl_search_form').hide();
$('#togglesearchform')
// always start with the Show message
@@ -91,7 +72,7 @@ $(document).ready(function() {
.show();
} else {
// error message (zero rows)
- $("#searchresults").html(response['message']);
+ $("#sqlqueryresults").html(response['message']);
}
})
})
diff --git a/tbl_select.php b/tbl_select.php
index 6913a9a..67bf5d2 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -303,7 +303,7 @@ $(function() {
<input type="submit" name="submit" value="<?php echo __('Go'); ?>" />
</fieldset>
</form>
-<div id="searchresults"></div>
+<div id="sqlqueryresults"></div>
<?php
require './libraries/footer.inc.php';
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
