Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtul Pratap Singh <atulpratapsingh05@gmail.com>2015-01-22 09:38:37 +0300
committerAtul Pratap Singh <atulpratapsingh05@gmail.com>2015-01-22 09:38:37 +0300
commite8005fddf2e73ab66b64a5d00070bab9b0e73ac8 (patch)
tree2852936042ab6127d65e62c4f2a7547768fab9de /js/navigation.js
parentd4f1781ea89d07aeba3c7f814bec95eed02ecb49 (diff)
Differentiate between search results and normal tree
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Diffstat (limited to 'js/navigation.js')
-rw-r--r--js/navigation.js20
1 files changed, 14 insertions, 6 deletions
diff --git a/js/navigation.js b/js/navigation.js
index 4efc9682cd..6cfac0709d 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -28,10 +28,16 @@ function loadChildNodes($expandElem, callback) {
pos: $expandElem.find('span.pos').text(),
pos2_name: $expandElem.find('span.pos2_name').text(),
pos2_value: $expandElem.find('span.pos2_value').text(),
- searchClause: searchClause,
- searchClause2: searchClause2
+ searchClause: '',
+ searchClause2: ''
};
+ if ($expandElem.closest('ul').hasClass('search_results')
+ ) {debugger;
+ params.searchClause = searchClause;
+ params.searchClause2 = searchClause2;
+ }
+
var url = $('#pma_navigation').find('a.navigation_url').attr('href');
$.get(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
@@ -1347,10 +1353,12 @@ PMA_fastFilter.filter.prototype.swap = function (list) {
* @return void
*/
PMA_fastFilter.filter.prototype.restore = function (focus) {
- this.$this.html(this.$clone.html()).children().show();
- this.$this.data('fastFilter', this);
- if (focus) {
- this.$this.find('li.fast_filter input.searchClause').focus();
+ if(this.$this.children('ul').first().hasClass('search_results')) {
+ this.$this.html(this.$clone.html()).children().show();
+ this.$this.data('fastFilter', this);
+ if (focus) {
+ this.$this.find('li.fast_filter input.searchClause').focus();
+ }
}
this.searchClause = '';
this.$this.find('div.pageselector').show();