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

Improved getID

Browse Source
This commit is contained in:
Tobias Reich 2015-03-15 00:43:28 +01:00
parent 7410cf773e
commit 7314245e60
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripts/album.js
View File

@ -11,17 +11,16 @@ album = {
album.getID = function() { album.getID = function() {
var id; var id = null;
if (photo.json) id = photo.json.album; if (photo.json) id = photo.json.album;
else if (album.json) id = album.json.id; else if (album.json) id = album.json.id;
else id = $('.album:hover, .album.active').attr('data-id');
// Search // Search
if (!id) id = $('.album:hover, .album.active').attr('data-id'); if ($.isNumeric(id)===false) id = $('.album:hover, .album.active').attr('data-id');
if (!id) id = $('.photo:hover, .photo.active').attr('data-album-id'); if ($.isNumeric(id)===false) id = $('.photo:hover, .photo.active').attr('data-album-id');
if (id) return id; if ($.isNumeric(id)===true) return id;
else return false; else return false;
} }

4
src/scripts/photo.js
View File

@ -12,12 +12,12 @@ photo = {
photo.getID = function() { photo.getID = function() {
var id; var id = null;
if (photo.json) id = photo.json.id; if (photo.json) id = photo.json.id;
else id = $('.photo:hover, .photo.active').attr('data-id'); else id = $('.photo:hover, .photo.active').attr('data-id');
if (id) return id; if ($.isNumeric(id)===false) return id;
else return false; else return false;
} }