Fixed album.getID for SmartAlbums with non numeric ids
This commit is contained in:
parent
5dc5116818
commit
155ba27841
@ -13,14 +13,19 @@ album.getID = function() {
|
|||||||
|
|
||||||
var id = null;
|
var id = null;
|
||||||
|
|
||||||
|
var isID = function(id) {
|
||||||
|
if (id==='0'||id==='f'||id==='s'||id==='r') return true;
|
||||||
|
return $.isNumeric(id);
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
// Search
|
// Search
|
||||||
if ($.isNumeric(id)===false) id = $('.album:hover, .album.active').attr('data-id');
|
if (isID(id)===false) id = $('.album:hover, .album.active').attr('data-id');
|
||||||
if ($.isNumeric(id)===false) id = $('.photo:hover, .photo.active').attr('data-album-id');
|
if (isID(id)===false) id = $('.photo:hover, .photo.active').attr('data-album-id');
|
||||||
|
|
||||||
if ($.isNumeric(id)===true) return id;
|
if (isID(id)===true) return id;
|
||||||
else return false;
|
else return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user