harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bring back nav-search spinner

Browse Source
This commit is contained in:
marijus 2015-01-21 11:38:55 +01:00
parent 19dfbfc063
commit 2757da433e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
view/js/autocomplete.js
View File

@ -3,15 +3,18 @@
* *
* require jQuery, jquery.textcomplete * require jQuery, jquery.textcomplete
*/ */
function contact_search(term, callback, backend_url, type, extra_channels) { function contact_search(term, callback, backend_url, type, extra_channels, spinelement) {
if(spinelement){
$(spinelement).spin('tiny');
}
// Check if there is a cached result that contains the same information we would get with a full server-side search // Check if there is a cached result that contains the same information we would get with a full server-side search
var bt = backend_url+type; var bt = backend_url+type;
if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
var lterm = term.toLowerCase(); // Ignore case var lterm = term.toLowerCase(); // Ignore case
for(t in contact_search.cache[bt]) { for(t in contact_search.cache[bt]) {
if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
$(spinelement).spin(false);
// Filter old results locally // Filter old results locally
var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
matching.unshift({taggable:false, text: term, replace: term}); matching.unshift({taggable:false, text: term, replace: term});
@ -44,6 +47,7 @@ function contact_search(term, callback, backend_url, type, extra_channels) {
var items = data.items.slice(0); var items = data.items.slice(0);
items.unshift({taggable:false, text: term, replace: term}); items.unshift({taggable:false, text: term, replace: term});
callback(items); callback(items);
$(spinelement).spin(false);
}, },
}).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong. }).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong.
} }
@ -98,7 +102,7 @@ function submit_form(e) {
contacts = { contacts = {
match: /(^|\s)(@\!*)([^ \n]+)$/, match: /(^|\s)(@\!*)([^ \n]+)$/,
index: 3, index: 3,
search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels); }, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); },
replace: editor_replace, replace: editor_replace,
template: contact_format, template: contact_format,
} }
@ -125,7 +129,7 @@ function submit_form(e) {
contacts = { contacts = {
match: /(^@)([^\n]{2,})$/, match: /(^@)([^\n]{2,})$/,
index: 2, index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, 'x',[]); }, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); },
replace: basic_replace, replace: basic_replace,
template: contact_format, template: contact_format,
} }
@ -147,7 +151,7 @@ function submit_form(e) {
contacts = { contacts = {
match: /(^)([^\n]+)$/, match: /(^)([^\n]+)$/,
index: 2, index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, typ,[]); }, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); },
replace: basic_replace, replace: basic_replace,
template: contact_format, template: contact_format,
} }

4
view/theme/redbasic/css/style.css
View File

@ -876,8 +876,8 @@ footer {
nav .acpopup { nav .acpopup {
top: 49px !important; top: 49px !important;
right: 30px !important; margin-left: -35px;
margin-left: -45px; width: 290px;
} }
.profile-clear { .profile-clear {