@@ -11,9 +11,9 @@ public interface ITitaniumDialog { public void setTitle(String title); public void setMessage(String msg); - public void addListener(String eventName, String listener); + public int addEventListener(String eventName, String listener); + public void removeEventListener(String eventName, int listenerId); public void setButtons(String[] buttonText); public void setOptions(String[] optionText); public void show(); - //TODO add removeEventListener } android/titanium/src/org/appcelerator/titanium/api/ITitaniumDialog.java @@ -58,12 +58,20 @@ public class TitaniumDialog implements ITitaniumDialog builder.setTitle(title); } - public void addListener(String eventName, String listener) { + public int addEventListener(String eventName, String listener) { if(eventName == null || !eventName.toLowerCase().equals(CLICK_EVENT)) { throw new IllegalStateException("TitaniumDialog only handles listeners named: " + CLICK_EVENT); } - eventListeners.addListener(eventName, listener); + return eventListeners.addListener(eventName, listener); + } + + public void removeEventListener(String eventName, int listenerId) { + if(eventName == null || !eventName.toLowerCase().equals(CLICK_EVENT)) { + throw new IllegalStateException("TitaniumDialog only handles listeners named: " + CLICK_EVENT); + } + + eventListeners.removeListener(eventName, listenerId); } public void setButtons(String[] buttonText) android/titanium/src/org/appcelerator/titanium/module/ui/TitaniumDialog.java @@ -123,7 +123,7 @@ public class TitaniumJSEventManager public void removeListener(String eventName, int eventId) { - if (eventId < 0 || eventListeners == null) { + if (eventId > -1 && eventListeners != null) { checkSupportsEvent(eventName); // Throws exception of failure HashMap<Integer, TitaniumJSEvent> listeners = eventListeners.get(eventName); android/titanium/src/org/appcelerator/titanium/util/TitaniumJSEventManager.java 8f3b0b667365c8a8aa03fcea5a7452e1cf02279f donthorp don@donthorp.net http://github.com/appcelerator/titanium_mobile/commit/6d1748dc3f240e0bc9512be31c1dff4fb7ec7217 6d1748dc3f240e0bc9512be31c1dff4fb7ec7217 2009-06-30T10:02:07-07:00 2009-06-30T10:02:07-07:00 [43 state:resolved] Fixed added removeEventListener for dialogs and fixed bug where removeListener wasn't removing valid listeners 894b0be86ae2010d08b681e2bf6b4777596c0a01 donthorp don@donthorp.net