From 54d13c8fc96ac73777098809dddf64c70b2c8ed5 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Sun, 14 Jul 2013 17:46:22 -0400 Subject: [PATCH] Fixed: CPImageView's _DOMImageElement was not created during initWithCoder. Previously, _createDOMImageElement was not called until after [super initWithCoder] was called. But that call would end up in CPImageView -setObjectValue, which would attempt to access _DOMImageElement before it had been created. Now _DOMImageElement is checked before being accessed or created. --- AppKit/CPImageView.j | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AppKit/CPImageView.j b/AppKit/CPImageView.j index f98decdae..1cac97d16 100644 --- a/AppKit/CPImageView.j +++ b/AppKit/CPImageView.j @@ -97,6 +97,9 @@ var CPImageViewEmptyPlaceholderImage = nil; - (void)_createDOMImageElement { #if PLATFORM(DOM) + if (_DOMImageElement) + return; + _DOMImageElement = document.createElement("img"); _DOMImageElement.style.position = "absolute"; _DOMImageElement.style.left = "0px"; @@ -146,6 +149,9 @@ var CPImageViewEmptyPlaceholderImage = nil; var newImage = [self objectValue]; #if PLATFORM(DOM) + if (!_DOMImageElement) + [self _createDOMImageElement]; + _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename]; #endif