diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-31 18:32:24 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-31 18:32:24 -0800 |
| commit | ee1a032e4dec8dcb85702ac2c30807345feaa7e6 (patch) | |
| tree | d487969c510ebf301bd994ef86dc23ae569d04e8 /lib/gallery.common.js | |
| parent | 40d496edeef614f7f3bc55d2fb178ea581dcd9f6 (diff) | |
| parent | 25f936e1edc8c47a789b423b9cadbe071a65256d (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'lib/gallery.common.js')
| -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; }; |