arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fixed a bug where it was possible to right-click on SmartAlbums after searching

Browse Source 
- Fixed a bug where it wasn't possible to rename albums while searching
This commit is contained in:
Tobias Reich 2014-07-12 18:41:58 +02:00
parent e6f9909ea3
commit 8b39f6fffa
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/album.js
View File

@ -18,6 +18,7 @@ album = {
else id = $(".album:hover, .album.active").attr("data-id"); else id = $(".album:hover, .album.active").attr("data-id");
// Search // Search
if (!id) id = $(".album:hover, .album.active").attr("data-id");
if (!id) id = $(".photo:hover, .photo.active").attr("data-album-id"); if (!id) id = $(".photo:hover, .photo.active").attr("data-album-id");
if (id) return id; if (id) return id;
@ -201,6 +202,7 @@ album = {
// Get old title if only one album is selected // Get old title if only one album is selected
if (album.json) oldTitle = album.json.title; if (album.json) oldTitle = album.json.title;
else if (albums.json) oldTitle = albums.json.content[albumIDs].title; else if (albums.json) oldTitle = albums.json.content[albumIDs].title;
if (!oldTitle) oldTitle = "";
oldTitle = oldTitle.replace("'", "'"); oldTitle = oldTitle.replace("'", "'");
} }

5
assets/js/search.js
View File

@ -82,7 +82,12 @@ search = {
if (search.code!=="") { if (search.code!=="") {
// Trash data
albums.json = null;
album.json = null;
photo.json = null;
search.code = ""; search.code = "";
lychee.animate(".divider", "fadeOut"); lychee.animate(".divider", "fadeOut");
albums.load(); albums.load();

4
assets/min/main.js
View File

File diff suppressed because one or more lines are too long