From f920adfa66a6e02d701e4c14077a60794c935165 Mon Sep 17 00:00:00 2001
From: Ben Smith <thebenjaminman@hotmail.com>
Date: Wed, 30 Sep 2009 11:38:47 +1300
Subject: [PATCH] Fixed a couple of small issues with the previews

---
 .../gloopics/g3viewer/client/ImageDialogBox.java | 16 ++++++++++++++--
 .../src/com/gloopics/g3viewer/client/Item.java   |  2 +-
 modules/gwtorganise/war/G3viewer.css             |  4 +++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java b/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java
index f0fd52da..49dda06a 100644
--- a/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java
+++ b/modules/gwtorganise/src/com/gloopics/g3viewer/client/ImageDialogBox.java
@@ -2,6 +2,8 @@ package com.gloopics.g3viewer.client;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.ErrorEvent;
+import com.google.gwt.event.dom.client.ErrorHandler;
 import com.google.gwt.event.dom.client.LoadEvent;
 import com.google.gwt.event.dom.client.LoadHandler;
 import com.google.gwt.user.client.Window;
@@ -66,12 +68,22 @@ public class ImageDialogBox extends PopupPanel{
 
 				
 				
+			}
+		});
+		m_Image.addErrorHandler(new ErrorHandler() {
+			
+			@Override
+			public void onError(ErrorEvent event) {
+				sp.removeFromParent();
+				G3Viewer.displayError("Error Loading Image", "It could be that the resized version of the image has not been built correctly.");
+				Loading.getInstance().endLoading();
 			}
 		});
 		
-		sp.setSize("0", "0");
+		sp.setSize("0px", "0px");
+		sp.setStylePrimaryName("hideme");
 		sp.setWidget(m_Image);
-		RootPanel.get().add(m_Image);
+		RootPanel.get().add(sp);
 		
 		m_Image.setUrl(a_Image);
 		
diff --git a/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java b/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java
index 5463feb9..c2c5744c 100644
--- a/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java
+++ b/modules/gwtorganise/src/com/gloopics/g3viewer/client/Item.java
@@ -106,7 +106,7 @@ public class Item extends Composite implements HasAllMouseHandlers{
 				if (isAlbum()){
 					m_Parent.selectSubAlbum(m_ID);
 				}
-				else {
+				else if (isPhoto()){
 					m_Container.showImage(m_Resized);
 				}
 				
diff --git a/modules/gwtorganise/war/G3viewer.css b/modules/gwtorganise/war/G3viewer.css
index 92f04e5d..622f3c48 100644
--- a/modules/gwtorganise/war/G3viewer.css
+++ b/modules/gwtorganise/war/G3viewer.css
@@ -35,4 +35,6 @@
 .progessInner {background: #34628c;width: 0px;height: 10px;}
 
 .dContents {padding: 2px 5px 2px 5px;}
-.dButtons {text-align: right}
\ No newline at end of file
+.dButtons {text-align: right}
+
+.hideme {overflow:hidden; width:0; height:0; margin:0; padding:0;}
\ No newline at end of file