v2.1.0

four2theizz0 · Sep 5, 2011 · 3be5623 · 3be5623
1 parent 3c3ad01
commit 3be5623
Show file tree

Hide file tree

Showing 22 changed files with 6,987 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -17,28 +17,11 @@ Latest Release v2.1.0
 
 **Changes for 2.1.0**
 
-- "Under the hood" changes. Functionally equivalent to 2.0.3
+- Under the hood changes. Functionally equivalent to 2.0.3 - however substantial enough refactoring warranting 2.1.0
 
 - Underlying "Util" scripts now belong in their own project making reuse of that code easier
 
-**Changes for 2.0.3**
-
-- Fixed orientation issue when adding to a homescreen on iOS devices
-
-- Setting fadeSpeed values to zero will stop any fading in / out and will show / hide instantly
-
-- Zoom now works again on IE9
-
-- Modified css to set the contents of the caption to be inline by default
-
-**Changes for 2.0.2**
-
-- You can now give your PhotoSwipe instances your own string identifiers (IDs)
-
-- **IMPORTANT** Re-written the jQuery Mobile demos so that they are now based on PhotoSwipe instance IDs. If you are implementing PhotoSwipe v2 into jQuery Mobile, please check the supplied examples
-
-- Fixed back button issue with jQuery Mobile demo
-
+- Fixed issue with erratic zooming especially if you have "imageScaleMethod" set to "zoom"
 
 
 **Important notes about v2**

diff --git a/build.properties b/build.properties
@@ -10,3 +10,5 @@ project.build.year = 2011
 
 project.build.workdir = work
 project.build.artifactdir = release
+
+lib.code.util.version = 1.0.2
diff --git a/build.xml b/build.xml
@@ -110,13 +110,13 @@
 
 		<concat destfile="${project.build.workdir}/code.photoswipe${engine}-${project.build.version}.js">	
 
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/util.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/browser.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/events${engine}.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/dom${engine}.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/animation.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/touchelement.js" />
-			<fileset dir="." includes="${project.src.dir}/lib/code.util/touchelement.class.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/util.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/browser.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/events${engine}.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/dom${engine}.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/animation.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/touchelement.js" />
+			<fileset dir="." includes="${project.src.dir}/lib/code.util-${lib.code.util.version}/src/touchelement.class.js" />
 
 			<fileset dir="." includes="${project.src.dir}/image.js" />
 			<fileset dir="." includes="${project.src.dir}/image.class.js" />
@@ -207,7 +207,7 @@
 		<!-- Copy the library folder to the working folder -->
 		<copy todir="${project.build.workdir}/lib">
 			<fileset dir="${project.src.dir}/lib">
-				<exclude name="**/code.util/**" />
+				<exclude name="**/code.util-${lib.code.util.version}/**" />
 			</fileset>
 		</copy>
 

diff --git a/src/change.log b/src/change.log
@@ -35,10 +35,12 @@ Initial release
 - Modified css to set the contents of the caption to be inline by default
 
 
-2.1.0 24.08.11 - Ste Brennan
+2.1.0 05.09.11 - Ste Brennan
 ----------------------------
 
-- Under the hood changes. Functionally equivalent to 2.0.3
+- Under the hood changes. Functionally equivalent to 2.0.3 - however substantial enough refactoring warranting 2.1.0
 
 - Underlying "Util" scripts now belong in their own project making reuse of that code easier
 
+- Fixed issue with erratic zooming especially if you have "imageScaleMethod" set to "zoom"
+
diff --git a/src/examples/debug-jquery-mobile.html b/src/examples/debug-jquery-mobile.html
@@ -12,7 +12,7 @@
 	<script type="text/javascript" src="../lib/klass.min.js"></script>
 	<script type="text/javascript" src="../lib/jquery-1.6.2.min.js"></script>
 	<script type="text/javascript" src="../lib/jquery.mobile-1.0b2/jquery.mobile-1.0b2.min.js"></script>
-	<script type="text/javascript" src="../lib/code.util-1.0.1/code.util.jquery-1.0.1.js"></script>
+	<script type="text/javascript" src="../lib/code.util-1.0.2/code.util.jquery-1.0.2.js"></script>
 
 	<script type="text/javascript" src="../image.js"></script>
 	<script type="text/javascript" src="../image.class.js"></script>

diff --git a/src/examples/debug-jquery.html b/src/examples/debug-jquery.html
@@ -11,7 +11,7 @@
 
 	<script type="text/javascript" src="../lib/klass.min.js"></script>
 	<script type="text/javascript" src="../lib/jquery-1.6.2.min.js"></script>
-	<script type="text/javascript" src="../lib/code.util-1.0.1/code.util.jquery-1.0.1.js"></script>
+	<script type="text/javascript" src="../lib/code.util-1.0.2/code.util.jquery-1.0.2.js"></script>
 
 	<script type="text/javascript" src="../image.js"></script>
 	<script type="text/javascript" src="../image.class.js"></script>

diff --git a/src/examples/debug.html b/src/examples/debug.html
@@ -10,7 +10,7 @@
 	<link href="../assets/photoswipe.css" type="text/css" rel="stylesheet" />
 
 	<script type="text/javascript" src="../lib/klass.min.js"></script>
-	<script type="text/javascript" src="../lib/code.util-1.0.1/code.util-1.0.1.js"></script>
+	<script type="text/javascript" src="../lib/code.util-1.0.2/code.util-1.0.2.js"></script>
 
 	<script type="text/javascript" src="../image.js"></script>
 	<script type="text/javascript" src="../image.class.js"></script>
@@ -85,7 +85,7 @@
 					slideshowDelay: 3000,
 					doubleTapSpeed: 250,
 					margin: 20,
-					imageScaleMethod: 'zoom', // Either "fit", "fitNoUpscale" or "zoom",
+					imageScaleMethod: 'fit', // Either "fit", "fitNoUpscale" or "zoom",
 
 					// Toolbar
 					captionAndToolbarHide: false,

diff --git a/src/lib/code.util-1.0.2/MIT-license.txt b/src/lib/code.util-1.0.2/MIT-license.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (C) 2011 by Code Computerlove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@ project.build.year = 2011

		project.build.workdir = work
		project.build.artifactdir = release

		lib.code.util.version = 1.0.2