diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
| commit | 9eab8b39df34b507530b0beceb31eb23fbea54f5 (patch) | |
| tree | 6b53d3f1b9aabd9d62092f1ad7b2568bd55b5c51 /core/js/js.js | |
| parent | ce58c32c901fb874264922dabec1692f9d05123d (diff) | |
| parent | 5ade595911261cf47cdad17deb4d1a013f523245 (diff) | |
| download | nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.tar.gz nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.zip | |
Merge branch 'master' into fixing-4620-master
Diffstat (limited to 'core/js/js.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 |