Permalink
Browse files

Merge branch 'fancybox-options'

  • Loading branch information...
2 parents bae98e5 + 5b76fdb commit 44b212e240caac0510d9d57762dad246d0a03a51 @phlipper committed Mar 24, 2010
Showing with 15 additions and 8 deletions.
  1. +5 −0 CHANGELOG.md
  2. +2 −1 README.md
  3. +2 −2 demo/jquery.fancy-photoset.min.js
  4. +4 −3 jquery.fancy-photoset.js
  5. +2 −2 jquery.fancy-photoset.min.js
View
@@ -1,5 +1,10 @@
# Fancy Photoset CHANGELOG
+
+## 0.4.0
+
+* Add ability to pass options directly to fancybox
+
## 0.3.0
* Use URLs returned from the API rather than building them from scratch
View
@@ -65,14 +65,15 @@ The plugin supports multiple photoset galleries per page:
* large - The larger version of the image link to and display in the Fancybox. This corresponds to one of the following Flickr sizes: square, thumbnail, small, medium and original.
* captions - true or false: This will create a <span class="caption"> with the photo title if set to true.
* firstOnly - true or false: Setting true will only display the first image in the photoset on the webpage. All images will still be available to the Fancybox gallery.
+* fancybox - These are standard [Fancybox options](http://fancybox.net/api) that get passed through to the `fancybox` method.
## Demo
See the demo.html file in the demo folder for an example of how to use the script. All you will need to run the demo is your API Key and a Photoset ID.
## Version
-The current version is 0.3.0
+The current version is 0.4.0
## License
Oops, something went wrong.
View
@@ -2,7 +2,7 @@
* Dual licensed under the MIT (MIT_LICENSE.txt)
* and GPL Version 2 (GPL_LICENSE.txt) licenses.
*
- * Version: 0.3.0
+ * Version: 0.4.0
* Requires jQuery 1.4.2+, Fancybox 1.3.1+
* Docs: http://phlippers.net/code/fancy-photoset
*/
@@ -29,7 +29,7 @@
$('<img/>').attr({'src': $.fn.fancyPhotoset.urlFor(photo, {size: opts.small}), 'title': photo.title, 'alt': photo.title}).after(
(opts.captions ? $('<span/>').addClass('caption').text(photo.title) : '')
)
- ).fancybox()
+ ).fancybox(opts.fancybox)
)
);
});
@@ -63,6 +63,7 @@
small : 'square',
large : 'medium',
captions : true,
- firstOnly : false
+ firstOnly : false,
+ fancybox : {}
};
})(jQuery);
Oops, something went wrong.

0 comments on commit 44b212e

Please sign in to comment.