diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:39:31 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:39:31 +0200 |
commit | b60108dc78af581fe5327fce4037731555203320 (patch) | |
tree | c0e6807e2a3f106e1ecaf5309d94e02e7716d18d /phpBB/styles/prosilver/template/ajax.js | |
parent | 4e529fda036b5aa3611da30277487907b83b55ac (diff) | |
parent | a62b672530f1134af98f27d5318ceeae38b65f05 (diff) | |
download | forums-b60108dc78af581fe5327fce4037731555203320.tar forums-b60108dc78af581fe5327fce4037731555203320.tar.gz forums-b60108dc78af581fe5327fce4037731555203320.tar.bz2 forums-b60108dc78af581fe5327fce4037731555203320.tar.xz forums-b60108dc78af581fe5327fce4037731555203320.zip |
Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add live member search.
* prototech/ticket/10737:
[ticket/10737] Remove loading indicator.
[ticket/10737] Enforce allow_live_searches setting in memberlist.php.
[ticket/10737] Add config setting to disable live searches.
[ticket/10737] Add loading indicator and alert box code to simple_footer.html.
[ticket/10737] Load core.js and ajax.js in simple_footer.html.
[ticket/10737] Set the username as the input value instead of redirecting.
[ticket/10737] Drop subsilver2 changes.
[ticket/10737] Add a more generic live search implementation.
[ticket/10737] Clean up memberlist.php.
[ticket/10737] Use dropdown for search results container.
[ticket/10737] Adding delayed keyup and removing target_blank.
[ticket/10737] Using UTF-8 aware alternatives in PHP code.
[ticket/10737] Removing obsolete code.
[ticket/10737] Avoid hard-coding table row and use case-insensitive search.
[ticket/10737] Removing unnecessary/obsolete code.
[ticket/10737] Using JQuery events and JSON response.
[ticket/10737] Code fixes in AJAX search feature
[ticket/10737] Improvements over last commit
[ticket/10737] Adding username suggestions in "Find a member" using AJAX
Diffstat (limited to 'phpBB/styles/prosilver/template/ajax.js')
-rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index bc68e5ae0c..e9f8064b9e 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -315,13 +315,17 @@ $('.poll_view_results a').click(function(e) { $('[data-ajax]').each(function() { var $this = $(this), ajax = $this.attr('data-ajax'), + filter = $this.attr('data-filter'), fn; if (ajax !== 'false') { fn = (ajax !== 'true') ? ajax : null; + filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null; + phpbb.ajaxify({ selector: this, refresh: $this.attr('data-refresh') !== undefined, + filter: filter, callback: fn }); } |