v2.1.4

README.md

@@ -18,15 +18,20 @@ It'd be fantastic to see how you have implemented PhotoSwipe on your site! We're
 
 
 
-Latest Release v2.1.3
+Latest Release v2.1.4
 ---------------------
-[Download](http://github.com/downloads/codecomputerlove/PhotoSwipe/code.photoswipe-2.1.3.zip)
+[Download](http://github.com/downloads/codecomputerlove/PhotoSwipe/code.photoswipe-2.1.4.zip)
 
-**Changes for 2.1.3**
+**Changes for 2.1.4**
 
-- Fixed issue with Android not being picked up correctly (thanks bgz)
+- Fixed issue when closing PhotoSwipe immediately after opening but before an image has loaded
+
+
+
+**Important notes about the examples and Internet Explorer**
+
+The majority of the bundled examples supplied with PhotoSwipe are running the optimised non-jQuery version. These examples will error on Internet Explorer. This is by design. They will work if you use the jQuery version of PhotoSwipe. Please read the "Getting Started" section below for more information regarding the different implementations of PhotoSwipe.
 
-- Fixed issues with IE 8
 
 
 **Important notes about v2**

build.cmd

@@ -1,2 +1,3 @@
+cls
 call tools\apache-ant-1.8.2\bin\ant
 IF NOT %ERRORLEVEL% == 0 pause

build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Sep 22 10:35:00 BST 2011
-build.number=6
+#Tue Sep 27 15:05:52 BST 2011
+build.number=9

build.properties

@@ -5,7 +5,7 @@
 project.description = PhotoSwipe
 project.src.dir = src
 
-project.build.version = 2.1.3
+project.build.version = 2.1.4
 project.build.year = 2011
 
 project.build.workdir = work

build.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
+clear
 tools/apache-ant-1.8.2/bin/ant

src/cache.class.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT license
 // version: %%version%%
 
-(function(window, klass, Util, Image){
+(function(window, klass, Util){
 
 
 	Util.registerNamespace('Code.PhotoSwipe.Cache');
@@ -61,7 +61,7 @@
 				caption = this.settings.getImageCaption(image);
 				metaData = this.settings.getImageMetaData(image);
 
-				this.images.push(new Image.ImageClass(image, src, caption, metaData));
+				this.images.push(new PhotoSwipe.Image.ImageClass(image, src, caption, metaData));
 
 			}
 

src/carousel.class.js

@@ -35,7 +35,12 @@
 		 */
 		dispose: function(){
 
-			var prop;
+			var prop, i, j;
+
+			for (i=0, j=this.cache.images.length; i<j; i++){
+				Util.Events.remove(this.cache.images[i], PhotoSwipe.Image.EventTypes.onLoad, this.imageLoadHandler);
+				Util.Events.remove(this.cache.images[i], PhotoSwipe.Image.EventTypes.onError, this.imageErrorHandler);
+			}
 
 			this.stopSlideshow();
 			Util.Animation.stop(this.el);

src/change.log

@@ -79,4 +79,11 @@ Initial release
 - Fixed issues with IE 8
 
 
+2.1.4 27.09.11 - Ste Brennan
+----------------------------
+
+- Fixed issue when closing PhotoSwipe immediately after opening but before an image has loaded
+
+
+
 

src/photoswipe.class.js

@@ -477,6 +477,10 @@
 				throw "Code.PhotoSwipe.PhotoSwipeClass.hide: PhotoSwipe instance is already hidden";
 			}
 
+			if (!Util.isNothing(this.hiding)){
+				return;
+			}
+
 			this.destroyZoomPanRotate();
 
 			this.removeEventHandlers();