diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-07-31 04:03:48 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-07-31 04:03:48 +0200 |
| commit | 5ef407d1c97cecf932e2578da71362c0353b96c9 (patch) | |
| tree | 18cc0a2843f394fe5a3166b1741b61adf76320bc /core | |
| parent | eb3526c9a6f8efab1b0fe3e5588b3ed1f43d2294 (diff) | |
| download | nextcloud-server-5ef407d1c97cecf932e2578da71362c0353b96c9.tar.gz nextcloud-server-5ef407d1c97cecf932e2578da71362c0353b96c9.zip | |
keyboard shortcuts for search results
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 49 | ||||
| -rw-r--r-- | core/templates/part.searchbox.php | 2 |
2 files changed, 40 insertions, 11 deletions
diff --git a/core/js/js.js b/core/js/js.js index 99372c5f241..a83d6abb6a5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -70,14 +70,18 @@ OC={ }, search:function(query){ if(query){ - OC.addScript('search','result',function(){ - OC.addStyle('search','results'); - $.getJSON(OC.filePath('search','ajax','search.php')+'?query='+encodeURIComponent(query), OC.search.showResults); + OC.addStyle('search','results'); + $.getJSON(OC.filePath('search','ajax','search.php')+'?query='+encodeURIComponent(query), function(results){ + OC.search.lastResults=results; + OC.search.showResults(results); }); } } } OC.search.customResults={}; +OC.search.currentResult=-1; +OC.search.lastQuery=''; +OC.search.lastResults={}; OC.addStyle.loaded=[]; OC.addScript.loaded=[]; @@ -133,15 +137,40 @@ $(document).ready(function(){ element.attr('src',src.substr(0,src.length-3)+'png'); }); }; - $('#searchbox').keyup(function(){ - var query=$('#searchbox').val(); - if(query.length>2){ - OC.search(query); + $('form.searchbox').submit(function(event){ + event.preventDefault(); + }) + $('#searchbox').keyup(function(event){ + if(event.keyCode==13){//enter + if(OC.search.currentResult>-1){ + var result=$('#searchresults tr.result a')[OC.search.currentResult]; + $(result).click(); + } + }else if(event.keyCode==38){//up + if(OC.search.currentResult>0){ + OC.search.currentResult--; + OC.search.renderCurrent(); + } + }else if(event.keyCode==40){//down + if(OC.search.lastResults.length>OC.search.currentResult+1){ + OC.search.currentResult++; + OC.search.renderCurrent(); + } + }else if(event.keyCode==27){//esc + OC.search.hide(); }else{ - if(OC.search.hide){ - OC.search.hide(); + var query=$('#searchbox').val(); + if(OC.search.lastQuery!=query){ + OC.search.lastQuery=query; + OC.search.currentResult=-1; + if(query.length>2){ + OC.search(query); + }else{ + if(OC.search.hide){ + OC.search.hide(); + } + } } } }); - $('#searchbox').click(function(){$('#searchbox').trigger('keyup')}); }); diff --git a/core/templates/part.searchbox.php b/core/templates/part.searchbox.php index ddf184ed5b6..49b44c718ec 100644 --- a/core/templates/part.searchbox.php +++ b/core/templates/part.searchbox.php @@ -1,3 +1,3 @@ -<form class="searchbox" action="<?php echo $_['searchurl']?>" method="post"> +<form class="searchbox" action="#" method="post"> <input id='searchbox' type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" /> </form> |