From e8cd9c15fbd6b44115d8922e2bd235613f5bb0f9 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Mon, 26 Jul 2010 19:58:13 -0400
Subject: [PATCH] Another try at fixing issue #782

---
 AppKit/CPImageView.j       |  12 ++++++++----
 AppKit/Resources/empty.png | Bin 0 -> 110 bytes
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 AppKit/Resources/empty.png

diff --git a/AppKit/CPImageView.j b/AppKit/CPImageView.j
index 048dd5e73..e8997a25e 100644
--- a/AppKit/CPImageView.j
+++ b/AppKit/CPImageView.j
@@ -71,6 +71,8 @@ var LEFT_SHADOW_INSET       = 3.0,
 
     CGRect              _imageRect;
     CPImageAlignment    _imageAlignment;
+    
+    CPImage             _emptyImage;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -95,6 +97,10 @@ var LEFT_SHADOW_INSET       = 3.0,
         
         _DOMImageElement.style.visibility = "hidden";
 #endif
+        
+        var bundle = [CPBundle bundleForClass:[CPView class]];
+        
+        _emptyImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
     }
     
     return self;
@@ -128,12 +134,10 @@ var LEFT_SHADOW_INSET       = 3.0,
     if (oldImage)
         [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];
 
-    var newImage = [self objectValue],
-        filename = [newImage filename];
+    var newImage = [self objectValue];
     
 #if PLATFORM(DOM)
-    if (filename)
-        _DOMImageElement.src = filename;
+    _DOMImageElement.src = newImage ? [newImage filename] : [_emptyImage filename];
 #endif
 
     var size = [newImage size];
diff --git a/AppKit/Resources/empty.png b/AppKit/Resources/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..f38e9f9100c290bd0e9a0419810c2d0149562c8e
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G0-i38Ar-fhe*FJ$&+O2^$iVT3>EG=|zG6T*22WQ%mvv4F
FO#p>79=iYl

literal 0
HcmV?d00001