diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /lib | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gallery.common.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 0bd14915..eb57c86c 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -88,8 +88,8 @@ * @return object */ $.fn.gallery_get_photo = function() { - var photo = $(this).find("img").filter(function() { - return this.id.match(/g-photo-id-\d+/); + var photo = $(this).find("img,object").filter(function() { + return this.id.match(/g-(photo|movie)-id-\d+/); }); return photo; }; |