diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
| commit | 7e0631b3b81a5669620122964d0326ead187de30 (patch) | |
| tree | 9370b9d5ac99f148d2bc724f76c805b772af7d2d /core/js | |
| parent | 98ff8478301676c99ffefd5756ad22466dfb6acf (diff) | |
| parent | bd5cb1d801a16933b7b75af5c514caec2afa5fef (diff) | |
| download | nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.tar.gz nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js index cb7287c02ae..b7f7ff1ac15 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -723,11 +723,17 @@ $(document).ready(function(){ } }else if(event.keyCode===27){//esc OC.search.hide(); + if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system + FileList.unfilter(); + } }else{ var query=$('#searchbox').val(); if(OC.search.lastQuery!==query){ OC.search.lastQuery=query; OC.search.currentResult=-1; + if (FileList && typeof FileList.filter === 'function') { //TODO add hook system + FileList.filter(query); + } if(query.length>2){ OC.search(query); }else{ @@ -840,6 +846,13 @@ function formatDate(date){ return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } +// taken from http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery +function getURLParameter(name) { + return decodeURI( + (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1] + ); +} + /** * takes an absolute timestamp and return a string with a human-friendly relative date * @param int a Unix timestamp |