Skip to content

Commit

Permalink
v1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
codecomputerlove committed May 16, 2011
1 parent 20e44c1 commit 950e76b
Show file tree
Hide file tree
Showing 14 changed files with 376 additions and 138 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
project.description = PhotoSwipe
project.src.dir = src

project.build.version = 1.0.6
project.build.version = 1.0.7
project.build.year = 2011

project.build.workdir = work
Expand Down
5 changes: 4 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@
<antcall target="versionStamp">
<param name="filePath" value="${project.build.workdir}/examples/exclusive-mode.html"/>
</antcall>

<antcall target="versionStamp">
<param name="filePath" value="${project.build.workdir}/examples/jquery-mobile.html"/>
</antcall>

</target>


Expand Down
15 changes: 15 additions & 0 deletions src/change.log
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,18 @@ Major update:
- Added new event "onViewportClick"

- Added new setting "backButtonHideEnabled" (default true). This will hide the gallery when the user hits the back button. Useful for Android and Blackberry. Works in BB6, Android v2.1 and above and iOS 4 and above


1.0.7 16.05.11 - Ste Brennan
----------------------------

- Update util-dom-jQuery.js. Wrong window dimensions returned.

- Added new "isActive" flag. You can check the active status of PhotoSwipe by "Code.PhotoSwipe.Current.isActive"

- Added jQuery Mobile example. There is still an issue with this however. You have to set "backButtonHideEnabled = false" as it interferes with jQuery Mobile's history handling. This needs reviewing.

- Better "Exclusive Mode" example.

- Fixed issue where the toolbar was causing an error on zoom and rotate in iOS.

7 changes: 3 additions & 4 deletions src/examples/debug.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
<link href="../photoswipe.css" type="text/css" rel="stylesheet" />

<script type="text/javascript" src="../lib/simple-inheritance.js"></script>
<script type="text/javascript" src="../lib/bean.min.js"></script>
<script type="text/javascript" src="../util.js"></script>

<script type="text/javascript" src="../util-dom.js"></script>
<script type="text/javascript" src="../util-animation.js"></script>

<!--
<script type="text/javascript" src="../lib/jquery-1.5.2.min.js"></script>
<script type="text/javascript" src="../util-dom-jQuery.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.js"></script>
<script type="text/javascript" src="../lib/jquery.animate-enhanced.min.js"></script>
<script type="text/javascript" src="../util-dom-jQuery.js"></script>
<script type="text/javascript" src="../util-animation-jQuery.js"></script>
-->

Expand Down Expand Up @@ -53,7 +52,6 @@

// Add event listeners


// onBeforeShow
Code.PhotoSwipe.Current.addEventListener(Code.PhotoSwipe.EventTypes.onBeforeShow, function(e){

Expand Down Expand Up @@ -145,6 +143,7 @@

});


var thumbEls = Code.photoSwipe('a', '#Gallery', {

getImageSource: Code.PhotoSwipe.GetImageSource,
Expand Down
150 changes: 62 additions & 88 deletions src/examples/exclusive-mode.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<link href="styles.css" type="text/css" rel="stylesheet" />

<link href="../photoswipe.css" type="text/css" rel="stylesheet" />
<style type="text/css">
#Gallery { display: none; }
</style>

<script type="text/javascript" src="../lib/simple-inheritance.min.js"></script>
<script type="text/javascript" src="../code-photoswipe-%%version%%.min.js"></script>
Expand All @@ -27,10 +30,7 @@
// Set up PhotoSwipe, setting "preventHide: true"
var thumbEls = Code.photoSwipe('a', '#Gallery', { preventHide: true });

// Trigger off a "click" of the first thumbnail
var clickEvt = document.createEvent("MouseEvents");
clickEvt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
thumbEls[0].dispatchEvent(clickEvt);
Code.PhotoSwipe.Current.show(0);

}, false);

Expand All @@ -40,97 +40,71 @@
</head>
<body>

<div id="Header">
<a href="http://www.codecomputerlove.com"><img src="images/codecomputerlovelogo.gif" width="230" height="48" alt="Code Computerlove" /></a>
</div>
<div id="Gallery">

<div id="MainContent">
<div class="gallery-row">

<div class="page-content">
<h1>PhotoSwipe</h1>
</div>


<div id="Gallery">

<div class="gallery-row">

<div class="gallery-item">
<a href="images/full/001.jpg">
<img src="images/thumb/001.jpg" alt="Image 001" />
</a>
</div>

<div class="gallery-item">
<a href="images/full/002.jpg">
<img src="images/thumb/002.jpg" alt="Image 002" />
</a>
</div>

<div class="gallery-item">
<a href="images/full/003.jpg">
<img src="images/thumb/003.jpg" alt="" />
</a>
</div>

<div class="gallery-item">
<a href="images/full/001.jpg">
<img src="images/thumb/001.jpg" alt="Image 001" />
</a>
</div>


<div class="gallery-row">

<div class="gallery-item"><a href="images/full/004.jpg"><img src="images/thumb/004.jpg" alt="Image 004" /></a></div>

<div class="gallery-item"><a href="images/full/005.jpg"><img src="images/thumb/005.jpg" alt="Image 005" /></a></div>

<div class="gallery-item"><a href="images/full/006.jpg"><img src="images/thumb/006.jpg" alt="Image 006" /></a></div>

</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/007.jpg"><img src="images/thumb/007.jpg" alt="Image 007" /></a></div>

<div class="gallery-item"><a href="images/full/008.jpg"><img src="images/thumb/008.jpg" alt="Image 008" /></a></div>

<div class="gallery-item"><a href="images/full/009.jpg"><img src="images/thumb/009.jpg" alt="Image 009" /></a></div>

</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/010.jpg"><img src="images/thumb/010.jpg" alt="Image 010" /></a></div>

<div class="gallery-item"><a href="images/full/011.jpg"><img src="images/thumb/011.jpg" alt="Image 011" /></a></div>

<div class="gallery-item"><a href="images/full/012.jpg"><img src="images/thumb/012.jpg" alt="Image 012" /></a></div>


<div class="gallery-item">
<a href="images/full/002.jpg">
<img src="images/thumb/002.jpg" alt="Image 002" />
</a>
</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/013.jpg"><img src="images/thumb/013.jpg" alt="Image 013" /></a></div>

<div class="gallery-item"><a href="images/full/014.jpg"><img src="images/thumb/014.jpg" alt="Image 014" /></a></div>

<div class="gallery-item"><a href="images/full/015.jpg"><img src="images/thumb/015.jpg" alt="Image 015" /></a></div>


<div class="gallery-item">
<a href="images/full/003.jpg">
<img src="images/thumb/003.jpg" alt="" />
</a>
</div>


</div>


<div class="gallery-row">

<div class="gallery-item"><a href="images/full/004.jpg"><img src="images/thumb/004.jpg" alt="Image 004" /></a></div>

<div class="gallery-item"><a href="images/full/005.jpg"><img src="images/thumb/005.jpg" alt="Image 005" /></a></div>

<div class="gallery-item"><a href="images/full/006.jpg"><img src="images/thumb/006.jpg" alt="Image 006" /></a></div>

</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/007.jpg"><img src="images/thumb/007.jpg" alt="Image 007" /></a></div>

<div class="gallery-item"><a href="images/full/008.jpg"><img src="images/thumb/008.jpg" alt="Image 008" /></a></div>

<div class="gallery-item"><a href="images/full/009.jpg"><img src="images/thumb/009.jpg" alt="Image 009" /></a></div>

</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/010.jpg"><img src="images/thumb/010.jpg" alt="Image 010" /></a></div>

<div class="gallery-item"><a href="images/full/011.jpg"><img src="images/thumb/011.jpg" alt="Image 011" /></a></div>

<div class="gallery-item"><a href="images/full/012.jpg"><img src="images/thumb/012.jpg" alt="Image 012" /></a></div>

</div>

<div class="gallery-row">

<div class="gallery-item"><a href="images/full/013.jpg"><img src="images/thumb/013.jpg" alt="Image 013" /></a></div>

<div class="gallery-item"><a href="images/full/014.jpg"><img src="images/thumb/014.jpg" alt="Image 014" /></a></div>

<div class="gallery-item"><a href="images/full/015.jpg"><img src="images/thumb/015.jpg" alt="Image 015" /></a></div>

</div>


</div>


<div id="Footer">
<p><small>&copy; 2011 Code Computerlove Ltd - new media agency / digital marketing agency</small></p>

<div id="SocialLinks">
<a href="http://blog.codecomputerlove.com/"><img src="images/blogicon.png" width="32" height="32" alt="Blog" /></a>
<a href="http://www.twitter.com/computerlovers"><img src="images/twittericon.png" width="32" height="32" alt="Twitter" /></a>
<a href="http://www.facebook.com/CodeComputerlove"><img src="images/facebookicon.png" width="32" height="32" alt="Facebook" /></a>
<a href="http://www.flickr.com/photos/codecomputerlove"><img src="images/flickricon.png" width="32" height="32" alt="Flickr" /></a>
</div>
</div>

</body>
Expand Down
2 changes: 1 addition & 1 deletion src/examples/jquery-engine-animate-enhanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<link href="../photoswipe.css" type="text/css" rel="stylesheet" />

<script type="text/javascript" src="../lib/jquery-1.5.2.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
<script type="text/javascript" src="../lib/simple-inheritance.min.js"></script>
<script type="text/javascript" src="../lib/jquery.animate-enhanced.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion src/examples/jquery-engine.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<link href="../photoswipe.css" type="text/css" rel="stylesheet" />

<script type="text/javascript" src="../lib/jquery-1.5.2.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
<script type="text/javascript" src="../lib/simple-inheritance.min.js"></script>

<!-- NOTE: including the jQuery engine version -->
Expand Down
Loading

0 comments on commit 950e76b

Please sign in to comment.