diff --git a/src/scripts/album.js b/src/scripts/album.js index f616fbb..a1e8226 100644 --- a/src/scripts/album.js +++ b/src/scripts/album.js @@ -11,18 +11,17 @@ album = { album.getID = function() { - var id; + var id = null; if (photo.json) id = photo.json.album; else if (album.json) id = album.json.id; - else id = $('.album:hover, .album.active').attr('data-id'); // Search - if (!id) id = $('.album:hover, .album.active').attr('data-id'); - if (!id) id = $('.photo:hover, .photo.active').attr('data-album-id'); + if ($.isNumeric(id)===false) id = $('.album:hover, .album.active').attr('data-id'); + if ($.isNumeric(id)===false) id = $('.photo:hover, .photo.active').attr('data-album-id'); - if (id) return id; - else return false; + if ($.isNumeric(id)===true) return id; + else return false; } diff --git a/src/scripts/photo.js b/src/scripts/photo.js index 6c019af..7a83f01 100644 --- a/src/scripts/photo.js +++ b/src/scripts/photo.js @@ -12,13 +12,13 @@ photo = { photo.getID = function() { - var id; + var id = null; - if (photo.json) id = photo.json.id; - else id = $('.photo:hover, .photo.active').attr('data-id'); + if (photo.json) id = photo.json.id; + else id = $('.photo:hover, .photo.active').attr('data-id'); - if (id) return id; - else return false; + if ($.isNumeric(id)===false) return id; + else return false; }