Permalink
Browse files

v2.1.3

  • Loading branch information...
Ste Brennan
Ste Brennan committed Sep 22, 2011
1 parent d5b2c0d commit 8ff7b87c216e6b798210cb272761c67641f4f245
Showing with 79 additions and 55 deletions.
  1. +1 −0 .gitignore
  2. +12 −5 README.md
  3. +3 −0 build.number
  4. +4 −2 build.properties
  5. 0 build.sh
  6. +4 −0 build.xml
  7. +6 −0 src/change.log
  8. +1 −1 src/examples/02-jquery.html
  9. +3 −3 src/examples/04-jquery-mobile.html
  10. +3 −3 src/examples/05-jquery-mobile-ajax.html
  11. +2 −2 src/examples/debug-jquery-mobile.html
  12. +2 −2 src/examples/debug-jquery.html
  13. +1 −1 src/examples/debug.html
  14. +2 −2 src/image.class.js
  15. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/MIT-license.txt
  16. +8 −7 src/lib/{code.util-1.0.3/code.util-1.0.3.js → code.util-1.0.4/code.util-1.0.4.js}
  17. +5 −5 src/lib/{code.util-1.0.3/code.util-1.0.3.min.js → code.util-1.0.4/code.util-1.0.4.min.js}
  18. +8 −8 src/lib/{code.util-1.0.3/code.util.jquery-1.0.3.js → code.util-1.0.4/code.util.jquery-1.0.4.js}
  19. +7 −7 ...b/{code.util-1.0.3/code.util.jquery-1.0.3.min.js → code.util-1.0.4/code.util.jquery-1.0.4.min.js}
  20. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/animation.js
  21. +1 −0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/browser.js
  22. +0 −1 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/dom.jquery.js
  23. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/dom.js
  24. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/events.jquery.js
  25. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/events.js
  26. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/touchelement.class.js
  27. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/touchelement.js
  28. 0 src/lib/{code.util-1.0.3 → code.util-1.0.4}/src/util.js
  29. +0 −4 src/lib/jquery-1.6.3.min.js
  30. +4 −0 src/lib/jquery-1.6.4.min.js
  31. +2 −2 src/photoswipe.class.js
  32. 0 tools/apache-ant-1.8.2/bin/ant
View
@@ -0,0 +1 @@
+release/*
View
@@ -11,15 +11,22 @@ PhotoSwipe also runs on the desktop and has been tested on Chrome, Firefox, Safa
-Latest Release v2.1.2
+Have you used PhotoSwipe? It'd be great to hear from you!
+---------------------------------------------------------
+
+It'd be fantastic to see how you have implemented PhotoSwipe on your site! We're looking at showcasing some of the best on [photoswipe.com](http://www.photoswipe.com). Feel free to drop us an email at support@photoswipe.com.
+
+
+
+Latest Release v2.1.3
---------------------
-[Download](http://github.com/downloads/codecomputerlove/PhotoSwipe/code.photoswipe-2.1.2.zip)
+[Download](http://github.com/downloads/codecomputerlove/PhotoSwipe/code.photoswipe-2.1.3.zip)
-**Changes for 2.1.2**
+**Changes for 2.1.3**
-- Modified how PhotoSwipe is initiated within jQuery Mobile projects. Fixes issue reported especially with "05-jquery-mobile-ajax.html" examples. Check it out.
+- Fixed issue with Android not being picked up correctly (thanks bgz)
-- Stopped core functions like "play()", "next()", "previous()" etc. running when the zoom layer is displayed. This could happen especially if using keyboard controls.
+- Fixed issues with IE 8
**Important notes about v2**
View
@@ -0,0 +1,3 @@
+#Build Number for ANT. Do not edit!
+#Thu Sep 22 10:35:00 BST 2011
+build.number=6
View
@@ -5,10 +5,12 @@
project.description = PhotoSwipe
project.src.dir = src
-project.build.version = 2.1.2
+project.build.version = 2.1.3
project.build.year = 2011
project.build.workdir = work
project.build.artifactdir = release
-lib.code.util.version = 1.0.3
+lib.code.util.version = 1.0.4
+lib.jquery.version = 1.6.4
+lib.jqm.version = 1.0b3
View
0 build.sh 100644 → 100755
No changes.
View
@@ -259,6 +259,8 @@
<delete dir="${project.build.workdir}" />
+ <fixcrlf srcdir="${project.build.artifactdir}" includes="**/*.log,**/*.js,**/*.txt,**/*.css,**/*.html" eol="crlf" />
+
</target>
@@ -298,6 +300,8 @@
<target name="versionStamp">
<replace file="${filePath}" token="%%version%%" value="${project.build.version}"/>
+ <replace file="${filePath}" token="%%jqueryversion%%" value="${lib.jquery.version}"/>
+ <replace file="${filePath}" token="%%jqmversion%%" value="${lib.jqm.version}"/>
<replace file="${filePath}" token="%%year%%" value="${project.build.year}"/>
</target>
View
@@ -71,6 +71,12 @@ Initial release
- Stopped core functions like "play()", "next()", "previous()" etc. running when the zoom layer is displayed. This could happen especially if using keyboard controls.
+2.1.3 19.09.11 - Ste Brennan
+----------------------------
+
+- Fixed issue with Android not being picked up correctly (thanks bgz)
+
+- Fixed issues with IE 8
@@ -9,7 +9,7 @@
<link href="../photoswipe.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-1.6.3.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-%%jqueryversion%%.min.js"></script>
<script type="text/javascript" src="../code.photoswipe.jquery-%%version%%.min.js"></script>
@@ -5,13 +5,13 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta name="apple-mobile-web-app-capable" content="yes" />
- <link href="../lib/jquery.mobile-1.0b3/jquery.mobile-1.0b3.min.css" rel="stylesheet" />
+ <link href="../lib/jquery.mobile-%%jqmversion%%/jquery.mobile-%%jqmversion%%.min.css" rel="stylesheet" />
<link href="jquery-mobile.css" type="text/css" rel="stylesheet" />
<link href="../photoswipe.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-1.6.3.min.js"></script>
- <script type="text/javascript" src="../lib/jquery.mobile-1.0b3/jquery.mobile-1.0b3.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-%%jqueryversion%%.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.mobile-%%jqmversion%%/jquery.mobile-%%jqmversion%%.min.js"></script>
<script type="text/javascript" src="../code.photoswipe.jquery-%%version%%.min.js"></script>
@@ -5,13 +5,13 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta name="apple-mobile-web-app-capable" content="yes" />
- <link href="../lib/jquery.mobile-1.0b3/jquery.mobile-1.0b3.min.css" rel="stylesheet" />
+ <link href="../lib/jquery.mobile-%%jqmversion%%/jquery.mobile-%%jqmversion%%.min.css" rel="stylesheet" />
<link href="jquery-mobile.css" type="text/css" rel="stylesheet" />
<link href="../photoswipe.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-1.6.3.min.js"></script>
- <script type="text/javascript" src="../lib/jquery.mobile-1.0b3/jquery.mobile-1.0b3.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-%%jqueryversion%%.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery.mobile-%%jqmversion%%/jquery.mobile-%%jqmversion%%.min.js"></script>
<script type="text/javascript" src="../code.photoswipe.jquery-%%version%%.min.js"></script>
@@ -14,9 +14,9 @@
-->
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-1.6.3.min.js"></script>
+ <script type="text/javascript" src="../lib/jquery-1.6.4.min.js"></script>
<script type="text/javascript" src="../lib/jquery.mobile-1.0b3/jquery.mobile-1.0b3.min.js"></script>
- <script type="text/javascript" src="../lib/code.util-1.0.3/code.util.jquery-1.0.3.js"></script>
+ <script type="text/javascript" src="../lib/code.util-1.0.4/code.util.jquery-1.0.4.js"></script>
<script type="text/javascript" src="../image.js"></script>
<script type="text/javascript" src="../image.class.js"></script>
@@ -14,8 +14,8 @@
-->
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/jquery-1.6.3.min.js"></script>
- <script type="text/javascript" src="../lib/code.util-1.0.3/code.util.jquery-1.0.3.js"></script>
+ <script type="text/javascript" src="../lib/jquery-1.6.4.min.js"></script>
+ <script type="text/javascript" src="../lib/code.util-1.0.4/code.util.jquery-1.0.4.js"></script>
<script type="text/javascript" src="../image.js"></script>
<script type="text/javascript" src="../image.class.js"></script>
View
@@ -14,7 +14,7 @@
-->
<script type="text/javascript" src="../lib/klass.min.js"></script>
- <script type="text/javascript" src="../lib/code.util-1.0.3/code.util-1.0.3.js"></script>
+ <script type="text/javascript" src="../lib/code.util-1.0.4/code.util-1.0.4.js"></script>
<script type="text/javascript" src="../image.js"></script>
<script type="text/javascript" src="../image.class.js"></script>
View
@@ -91,8 +91,8 @@
this.imageEl.isError = false;
this.imageEl.isLoading = true;
- this.imageEl.naturalWidth = 0;
- this.imageEl.naturalHeight = 0;
+ this.imageEl.naturalWidth = null;
+ this.imageEl.naturalHeight = null;
this.imageEl.isLandscape = false;
this.imageEl.onload = this.imageLoadHandler;
this.imageEl.onerror = this.imageErrorHandler;
@@ -1,6 +1,6 @@
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window) {
@@ -275,7 +275,7 @@
}(window));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, Util) {
@@ -312,6 +312,7 @@
this.opera = /opera/i.test(this.ua);
this.msie = /msie/i.test(this.ua) && !this.opera;
this.chrome = /Chrome/i.test(this.ua);
+ this.firefox = /Firefo/i.test(this.ua);
this.mozilla = /mozilla/i.test(this.ua) && !/(compatible|webkit)/.test(this.ua);
this.android = /android/i.test(this.ua);
this.blackberry = /blackberry/i.test(this.ua);
@@ -369,7 +370,7 @@
;
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, Util) {
@@ -664,7 +665,7 @@
window.Code.Util
));// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, Util) {
@@ -1272,7 +1273,7 @@
));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, Util) {
@@ -1588,7 +1589,7 @@
));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, klass, Util){
@@ -1629,7 +1630,7 @@
window.Code.Util
));// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, klass, Util){

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,6 +1,6 @@
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window) {
@@ -275,7 +275,7 @@
}(window));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, Util) {
@@ -312,6 +312,7 @@
this.opera = /opera/i.test(this.ua);
this.msie = /msie/i.test(this.ua) && !this.opera;
this.chrome = /Chrome/i.test(this.ua);
+ this.firefox = /Firefo/i.test(this.ua);
this.mozilla = /mozilla/i.test(this.ua) && !/(compatible|webkit)/.test(this.ua);
this.android = /android/i.test(this.ua);
this.blackberry = /blackberry/i.test(this.ua);
@@ -369,7 +370,7 @@
;
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, $, Util) {
@@ -491,7 +492,7 @@
window.Code.Util
));// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, $, Util) {
@@ -751,7 +752,6 @@
}
else{
$(el).css(prop, style[prop]);
- el.style[prop] = style[prop];
}
}
}
@@ -1007,7 +1007,7 @@
));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function (window, Util) {
@@ -1323,7 +1323,7 @@
));
// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, klass, Util){
@@ -1364,7 +1364,7 @@
window.Code.Util
));// Copyright (c) 2011 by Code Computerlove (http://www.codecomputerlove.com)
// Licensed under the MIT license
-// version: 1.0.3
+// version: 1.0.4
(function(window, klass, Util){
Oops, something went wrong.

0 comments on commit 8ff7b87

Please sign in to comment.