Merging master branch

- fix title sort function
- fix focus on search
This commit is contained in:
OzzieIsaacs 2020-05-21 22:31:29 +02:00
commit b7535b9526
2 changed files with 4 additions and 2 deletions

View File

@ -449,7 +449,7 @@ class CalibreDB(threading.Thread):
match = title_pat.search(title) match = title_pat.search(title)
if match: if match:
prep = match.group(1) prep = match.group(1)
title = title.replace(prep, '') + ', ' + prep title = title[len(prep):] + ', ' + prep
return title.strip() return title.strip()
conn = conn or self.session.connection().connection.connection conn = conn or self.session.connection().connection.connection

View File

@ -228,7 +228,9 @@
$(document).ready(function() { $(document).ready(function() {
var inp = $('#query').first() var inp = $('#query').first()
var val = inp.val() var val = inp.val()
inp.val('').blur().focus().val(val) if (val.length) {
inp.val('').blur().focus().val(val)
}
}); });
}); });
</script> </script>