Merge pull request #3193 from hieupham007/timob-11339-3_0_X

Timob 11339 3 0 x: Fix the source of tabGroup focus events
tidev · Oct 12, 2012 · d4f4a32 · d4f4a32
2 parents cd88dd0 + 8539218
commit d4f4a32
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TabProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TabProxy.java
@@ -204,10 +204,15 @@ void onFocusChanged(boolean focused, KrollDict eventData)
 
 		// The focus and blur events for tab changes propagate like so:
 		//    window -> tab -> tab group
-		//
-		// The window is optional and will be skipped if it does not exist.
-		TiViewProxy eventEmitter = (window != null) ? window : this;
-		eventEmitter.fireEvent((focused) ? TiC.EVENT_FOCUS : TiC.EVENT_BLUR, eventData, true);
+		//    
+		// The window is optional and will be skipped if it does not exist.		
+		String event = focused ? TiC.EVENT_FOCUS : TiC.EVENT_BLUR;
+
+		if (window != null) {
+			window.fireEvent(event, null, false);
+		}
+		fireEvent(event, eventData, true);
+
 	}
 
 	void close() {