Merge pull request #3756 from pingwang2011/timob-12379

Timob 12379: Backport to 3_0_X: TIMOB-12362
tidev · Jan 23, 2013 · bcf4254 · bcf4254
2 parents ff65bf7 + 6a5776c
commit bcf4254
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
@@ -655,12 +655,8 @@ public void handleStop()
 		fireStop();
 	}
 
-	private void setImageSource(Object object, boolean sameSource)
+	private void setImageSource(Object object)
 	{
-		if (imageViewProxy.inTableView() && sameSource && imageSources != null) {
-			return;
-		}
-
 		imageSources = new ArrayList<TiDrawableReference>();
 		if (object instanceof Object[]) {
 			for (Object o : (Object[]) object) {
@@ -839,7 +835,7 @@ public void processProperties(KrollDict d)
 		}
 
 		if (d.containsKey(TiC.PROPERTY_IMAGES)) {
-			setImageSource(d.get(TiC.PROPERTY_IMAGES), false);
+			setImageSource(d.get(TiC.PROPERTY_IMAGES));
 			setImages();
 		} 
 		if (d.containsKey(TiC.PROPERTY_CAN_SCALE)) {
@@ -918,21 +914,17 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 		} else if (key.equals(TiC.PROPERTY_ENABLE_ZOOM_CONTROLS)) {
 			view.setEnableZoomControls(TiConvert.toBoolean(newValue));
 		} else if (key.equals(TiC.PROPERTY_IMAGE)) {
-			if (oldValue.equals(newValue)) {
-				setImageSource(newValue, true);
-			} else {
-				setImageSource(newValue, false);
+			if ((oldValue == null && newValue != null) || (oldValue != null && !oldValue.equals(newValue))) {
+				setImageSource(newValue);
+				firedLoad = false;
+				setImage(true);
 			}
-			firedLoad = false;
-			setImage(true);
 		} else if (key.equals(TiC.PROPERTY_IMAGES)) {
 			if (newValue instanceof Object[]) {
-				if (oldValue.equals(newValue)) {
-					setImageSource(newValue, true);
-				} else {
-					setImageSource(newValue, false);
+				if (oldValue == null || !oldValue.equals(newValue)) {
+					setImageSource(newValue);
+					setImages();
 				}
-				setImages();
 			}
 		} else {
 			// Update requestedWidth / requestedHeight when width / height is changed.