Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Timob 11439 3 0 x: Android: Invalid events triggered #3192

Merged
merged 3 commits into from
Oct 12, 2012
Merged

Timob 11439 3 0 x: Android: Invalid events triggered #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a53a9f2
timob-10463-2: fixed "bubbleParent" property and fixed the return value.
pingwang2011 Oct 12, 2012
b545041
timob-10463-2: removed unneccessary check
pingwang2011 Oct 12, 2012
df1a744
timob-11439: address comments
pingwang2011 Oct 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 35 additions & 5 deletions android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* <a href="http://developer.appcelerator.com/apidoc/mobile/latest/Titanium.UI.createView-method.html">Titanium.UI.createView </a>,
* the view object is a proxy itself.
*/
@Kroll.proxy(name = "KrollProxy", propertyAccessors = { KrollProxy.PROPERTY_HAS_JAVA_LISTENER, TiC.PROPERTY_BUBBLE_PARENT })
@Kroll.proxy(name = "KrollProxy", propertyAccessors = { KrollProxy.PROPERTY_HAS_JAVA_LISTENER })
public class KrollProxy implements Handler.Callback, KrollProxySupport
{
private static final String TAG = "KrollProxy";
Expand Down Expand Up @@ -79,6 +79,7 @@ public class KrollProxy implements Handler.Callback, KrollProxySupport
protected Handler runtimeHandler = null;

private KrollDict langConversionTable = null;
private boolean bubbleParent = true;

public static final String PROXY_ID_PREFIX = "proxy$";

Expand Down Expand Up @@ -108,7 +109,6 @@ public KrollProxy(String baseCreationUrl)
this.listenerIdGenerator = new AtomicInteger(0);
this.eventListeners = Collections.synchronizedMap(new HashMap<String, HashMap<Integer, KrollEventCallback>>());
this.langConversionTable = getLangConversionTable();
defaultValues.put(TiC.PROPERTY_BUBBLE_PARENT, true);
}

private void setupProxy(KrollObject object, Object[] creationArguments, TiUrl creationUrl)
Expand Down Expand Up @@ -604,6 +604,18 @@ protected void doSetProperty(String name, Object value)
getKrollObject().setProperty(name, value);
}

@Kroll.getProperty @Kroll.method
public boolean getBubbleParent()
{
return bubbleParent;
}

@Kroll.setProperty @Kroll.method
public void setBubbleParent(Object value)
{
bubbleParent = TiConvert.toBoolean(value);
}

/**
* Fires an event asynchronously via KrollRuntime thread, which can be intercepted on JS side.
* @param event the event to be fired.
Expand All @@ -617,7 +629,7 @@ public boolean fireEvent(String event, Object data)
message.getData().putString(PROPERTY_NAME, event);
message.sendToTarget();

return hasListeners(event);
return hierarchyHasListener(event);
}

/**
Expand All @@ -630,8 +642,7 @@ public boolean fireEvent(String event, Object data)
@Kroll.method(name = "_fireEventToParent")
public boolean fireEventToParent(String eventName, Object data)
{
Object bubbleParent = getProperty(TiC.PROPERTY_BUBBLE_PARENT);
if (bubbleParent != null && TiConvert.toBoolean(bubbleParent)) {
if (bubbleParent) {
KrollProxy parentProxy = getParentForBubbling();
if (parentProxy != null) {
return parentProxy.fireEvent(eventName, data);
Expand Down Expand Up @@ -713,6 +724,25 @@ public boolean hasListeners(String event)
return getKrollObject().hasListeners(event);
}

/**
* Returns true if any view in the hierarchy has the event listener.
*/
public boolean hierarchyHasListener(String event)
{
boolean hasListener = hasListeners(event);

// Checks whether the parent has the listener or not
if (!hasListener) {
KrollProxy parentProxy = getParentForBubbling();
if (parentProxy != null) {
boolean parentHasListener = parentProxy.hierarchyHasListener(event);
hasListener = hasListener || parentHasListener;
}
}

return hasListener;
}

public boolean shouldFireChange(Object oldValue, Object newValue)
{
if (!(oldValue == null && newValue == null)) {
Expand Down
5 changes: 0 additions & 5 deletions android/titanium/src/java/org/appcelerator/titanium/TiC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,11 +711,6 @@ public class TiC
*/
public static final String PROPERTY_BUBBLES = "bubbles";

/**
* @module.api
*/
public static final String PROPERTY_BUBBLE_PARENT = "bubbleParent";

/**
* @module.api
*/
Expand Down
22 changes: 0 additions & 22 deletions android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,28 +867,6 @@ public void eventListenerRemoved(String eventName, int count, KrollProxy proxy)
}
}

/**
* Return true if any view in the hierarchy has the event listener.
*/
public boolean hierarchyHasListener(String eventName)
{
boolean hasListener = hasListeners(eventName);

// Check whether the parent has the listener or not
if (!hasListener) {
TiViewProxy parent = getParent();
if (parent != null) {
boolean parentHasListener = parent.hierarchyHasListener(eventName);
hasListener = hasListener || parentHasListener;
if (hasListener) {
return hasListener;
}
}
}

return hasListener;
}

public void setClickable(boolean clickable)
{
TiUIView v = peekView();
Expand Down