Skip to content

jQuery 3 update #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joedag32 wants to merge 55 commits into
base: fcote/master
Choose a base branch
from
Open

jQuery 3 update #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
a76b887
Hashtag is now cleared when prettyPhoto is closed
scaron May 16, 2011
fe0de00
Fixed the font color in the default theme
scaron May 16, 2011
a7cf9d7
Fix socia tools alignment
scaron May 17, 2011
2f5e1ff
Fix bug with social tools when it was turned off
scaron May 17, 2011
3a197b6
Moved to jquery 1.6.1 for testing
scaron May 17, 2011
9d85807
Disable the overlay gallery for galleries with more than 30 images, t…
scaron May 17, 2011
153df04
Fix minor bug with the facebook like, the url wasn't corrent on the i…
scaron May 17, 2011
6b69a7a
fix version number
scaron May 17, 2011
05a2ba3
Fix for images wider than browser
jackplug Jun 28, 2011
0d9a64b
Changed where the hashtag is updated, this resolves the facebook like…
scaron Jun 30, 2011
1c209bb
Added support for youtu.be links
scaron Jun 30, 2011
d00e54b
Fix content wrapping when using of as the separator instead of /
scaron Jun 30, 2011
a62ee73
Changed copy
scaron Aug 9, 2011
af7a0b3
Fix scroll when hashtag is clear
scaron Aug 11, 2011
fa2258a
Fix bug with social tools
scaron Aug 11, 2011
1aa271d
Fix for the 'undefined' description when the 'title' image attribute …
toszcze Aug 27, 2011
2bd96a8
Maximum number of pictures in the overlay gallery setting added
danil Sep 2, 2011
d34484c
Fix the hash getting added on close incorrectly
eddiemonge Sep 8, 2011
be0e6cc
Fix the hash getting added on close incorrectly
eddiemonge Sep 8, 2011
1f5df07
Added a new "allow_expand" setting
sbrauer Oct 26, 2011
7588094
Merge pull request #75 from toszcze/patch-1
scaron Jan 25, 2012
b7abdd0
Merge pull request #78 from eddiemonge/fix_hashtag_on_close
scaron Jan 25, 2012
41df349
Merge pull request #81 from sbrauer/master
scaron Jan 25, 2012
ff65b32
Merge pull request #76 from danil/master
scaron Jan 25, 2012
5bbaee0
Merge pull request #70 from jackplug/master
scaron Jan 25, 2012
fadc4cd
allows to start the slideshow in a picture different from the first o…
guilleferrer Jan 30, 2012
dc7a6bc
Removed all instances of bang (!) from shebang (#!). This clears up i…
seyDoggy Feb 7, 2012
34e2cfb
Add "hook" to pp_settings to customize the hook attribute used by pre…
Feb 8, 2012
04a494b
Added ajax callback
chrisabrams Mar 2, 2012
39f7783
Moved Show content
chrisabrams Mar 3, 2012
0e0aee6
Merge pull request #85 from seyDoggy/remove-bang-from-shebang
scaron Mar 7, 2012
635456e
Merge pull request #88 from chrisabrams/master
scaron Mar 7, 2012
b3e7fbe
Merge pull request #86 from nbrew/hook_setting
scaron Mar 7, 2012
8c27bf4
Merge pull request #87 from guilleferrer/fadc4cd2a26519718a7c2c76ec65…
scaron Mar 7, 2012
9d5d340
Fixed and issue with the Facebook like button on IE9
scaron Mar 7, 2012
e5c9d24
Updated v numbers
scaron Mar 7, 2012
987d7db
Fixed endless recursion loop bug that caused browser to freeze when c…
Vigrond Mar 7, 2012
b5475f5
Prevents the "Object doesn't support this property or method" bug on …
Mar 22, 2012
7ce320e
Vimeo-videos can be served over HTTPS.
tijsverkoyen Apr 4, 2012
d87dc67
Changed the license
scaron Apr 12, 2012
7b52fcb
Changed the license
scaron Apr 12, 2012
280e254
Changed the license
scaron Apr 12, 2012
b4627c8
Test
scaron Apr 24, 2012
091ec65
Update js/jquery.prettyPhoto.js
scaron Apr 24, 2012
b0db83a
Merge pull request #89 from Vigrond/patch-1
scaron Aug 28, 2012
7929cc6
Merge pull request #91 from meydjer/master
scaron Aug 28, 2012
c293a7f
Merge pull request #92 from tijsverkoyen/vimeo-fix
scaron Aug 28, 2012
5d0d312
Drop support for IE6
scaron Jan 18, 2013
4d1ab27
Merge branch 'master' of github.com:scaron/prettyphoto
scaron Jan 18, 2013
ed5e70e
Increment v number
scaron Jan 18, 2013
c74a48a
Remoed the Y from gallery
scaron Mar 19, 2013
d0a7a04
Revert the chnages
scaron Mar 19, 2013
36463d4
[#149] Filter out chars to prevent XSS
scaron May 7, 2015
3a105aa
Update v number
scaron May 7, 2015
4cc502e
Fix post test
scaron May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
prettyPhoto v3.1.2
prettyPhoto v3.1.6
© Copyright, Stephane Caron
http://www.no-margin-for-errors.com


============================= Released under =============================

Creative Commons 2.5
http://creativecommons.org/licenses/by/2.5/

OR

GPLV2 license
http://www.gnu.org/licenses/gpl-2.0.html

You are free to use prettyPhoto in commercial projects as long as the
copyright header is left intact.

============================ More information ============================
http://www.no-margin-for-errors.com/projects/prettyPhoto/
Expand All @@ -18,4 +27,4 @@ it also add support for videos, flash, YouTube, iFrame. It's a full blown
media modal box.

Please refer to http://www.no-margin-for-errors.com/projects/prettyPhoto/
for all the details on how to use.
for all the details on how to use.
17 changes: 7 additions & 10 deletions css/prettyPhoto.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
div.pp_default .pp_gallery ul li a { background: url(../images/prettyPhoto/default/default_thumb.png) center center #f8f8f8; border:1px solid #aaa; }
div.pp_default .pp_gallery ul li a:hover,
div.pp_default .pp_gallery ul li.selected a { border-color: #fff; }
div.pp_default .pp_social { margin-top: 7px; }

div.pp_default .pp_gallery a.pp_arrow_previous,
div.pp_default .pp_gallery a.pp_arrow_next { position: static; left: auto; }
Expand All @@ -45,8 +46,8 @@
div.pp_default a.pp_arrow_next { background: url(../images/prettyPhoto/default/sprite.png) -31px -3px no-repeat; height: 20px; margin: 4px 0 0 0; width: 20px; }
div.pp_default a.pp_arrow_next { left: 52px; background-position: -82px -3px; } /* The next arrow in the bottom nav */
div.pp_default .pp_content_container .pp_details { margin-top: 5px; }
div.pp_default .pp_nav { clear: none; height: 30px; width: 105px; position: relative; }
div.pp_default .pp_nav .currentTextHolder{ font-family: Georgia; font-style: italic; font-color:#999; font-size: 11px; left: 75px; line-height: 25px; margin: 0; padding: 0 0 0 10px; position: absolute; top: 2px; }
div.pp_default .pp_nav { clear: none; height: 30px; width: 110px; position: relative; }
div.pp_default .pp_nav .currentTextHolder{ font-family: Georgia; font-style: italic; color:#999; font-size: 11px; left: 75px; line-height: 25px; margin: 0; padding: 0 0 0 10px; position: absolute; top: 2px; }

div.pp_default .pp_close:hover, div.pp_default .pp_nav .pp_play:hover, div.pp_default .pp_nav .pp_pause:hover, div.pp_default .pp_arrow_next:hover, div.pp_default .pp_arrow_previous:hover { opacity:0.7; }

Expand Down Expand Up @@ -326,8 +327,8 @@
margin: 0;
}

.pp_social { float: left; margin: 7px 0 0 0; }
.pp_social .facebook { float: left; position: relative; top: -1px; margin-left: 5px; width: 55px; overflow: hidden; }
.pp_social { float: left; margin: 0; }
.pp_social .facebook { float: left; margin-left: 5px; width: 55px; overflow: hidden; }
.pp_social .twitter { float: left; }

.pp_nav {
Expand All @@ -339,6 +340,7 @@
.pp_nav p {
float: left;
margin: 2px 4px;
white-space: nowrap;
}

.pp_nav .pp_play,
Expand Down Expand Up @@ -520,9 +522,4 @@
font-size: 17px;
margin: 0 0 5px 15px;
z-index: 9999;
}

/* ------------------------------------------------------------------------
Miscellaneous
------------------------------------------------------------------------- */

}
7 changes: 4 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>jQuery lightbox clone - prettyPhoto - by Stephane Caron</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="js/jquery-1.4.4.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<!--script src="js/jquery.lint.js" type="text/javascript" charset="utf-8"></script-->
<link rel="stylesheet" href="css/prettyPhoto.css" type="text/css" media="screen" title="prettyPhoto main stylesheet" charset="utf-8" />
<script src="js/jquery.prettyPhoto.js" type="text/javascript" charset="utf-8"></script>
Expand Down Expand Up @@ -94,7 +94,8 @@ <h2>Flash</h2>
<div class="fleft">
<h2>YouTube</h2>
<ul class="gallery clearfix">
<li><a href="http://www.youtube.com/watch?v=kh29_SERH0Y&rel=0" rel="prettyPhoto" title="YouTube demo"><img src="images/thumbnails/flash-logo.png" width="60" alt="" /></a></li>
<li><a href="http://www.youtube.com/watch?v=kh29_SERH0Y?rel=0" rel="prettyPhoto" title="YouTube demo"><img src="images/thumbnails/flash-logo.png" width="60" alt="" /></a></li>
<li><a href="http://youtu.be/kh29_SERH0Y?rel=0" rel="prettyPhoto" title="YouTube demo"><img src="images/thumbnails/flash-logo.png" width="60" alt="" /></a></li>
</ul>
</div>
<div class="fleft">
Expand Down Expand Up @@ -182,7 +183,7 @@ <h2>Custom content</h2>
$(document).ready(function(){
$("area[rel^='prettyPhoto']").prettyPhoto();

$(".gallery:first a[rel^='prettyPhoto']").prettyPhoto({animation_speed:'normal',theme:'facebook',slideshow:3000, autoplay_slideshow: true});
$(".gallery:first a[rel^='prettyPhoto']").prettyPhoto({animation_speed:'normal',theme:'light_square',slideshow:3000, autoplay_slideshow: true});
$(".gallery:gt(0) a[rel^='prettyPhoto']").prettyPhoto({animation_speed:'fast',slideshow:10000, hideflash: true});

$("#custom_content a[rel^='prettyPhoto']:first").prettyPhoto({
Expand Down
18 changes: 18 additions & 0 deletions js/jquery-1.6.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading