From 80f1cafe494df196f496cce3b5deeb546adf3d7d Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Mon, 28 Apr 2014 15:44:23 +0800 Subject: [PATCH] IDEMPIERE-1915 Tool Tip panel collapses when clicking into it or out of a field on window --- .../adempiere/webui/adwindow/ADTabpanel.java | 1 - .../webui/adwindow/GridTabRowRenderer.java | 1 - .../webui/apps/ProcessParameterPanel.java | 21 ------------------- .../webui/desktop/DefaultDesktop.java | 1 + .../org/adempiere/webui/info/InfoWindow.java | 11 ---------- 5 files changed, 1 insertion(+), 34 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 0120c021f3..c568b693b8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -527,7 +527,6 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer editor.getComponent().setWidgetOverride("fieldDescription", HelpController.escapeJavascriptContent(field.getDescription())); editor.getComponent().setWidgetOverride("fieldHelp", HelpController.escapeJavascriptContent(field.getHelp())); editor.getComponent().setWidgetListener("onFocus", "zWatch.fire('onFieldTooltip', this, null, this.fieldHeader(), this.fieldDescription(), this.fieldHelp());"); - editor.getComponent().setWidgetListener("onBlur", "zWatch.fire('onFieldTooltip', this);"); editor.setGridTab(this.getGridTab()); field.addPropertyChangeListener(editor); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java index fabd3671d6..d7210202a7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java @@ -411,7 +411,6 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt editor.getComponent().setWidgetOverride("fieldDescription", HelpController.escapeJavascriptContent(gridPanelFields[i].getDescription())); editor.getComponent().setWidgetOverride("fieldHelp", HelpController.escapeJavascriptContent(gridPanelFields[i].getHelp())); editor.getComponent().setWidgetListener("onFocus", "zWatch.fire('onFieldTooltip', this, null, this.fieldHeader(), this.fieldDescription(), this.fieldHelp());"); - editor.getComponent().setWidgetListener("onBlur", "zWatch.fire('onFieldTooltip', this);"); // Default Focus if (defaultFocusField == null && gridPanelFields[i].isDefaultFocus()) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java index a8bf80c11e..f35e59bffd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java @@ -285,7 +285,6 @@ public class ProcessParameterPanel extends Panel implements WEditor editor = WebEditorFactory.getEditor(mField, false); editor.setProcessParameter(true); editor.getComponent().addEventListener(Events.ON_FOCUS, this); - editor.getComponent().addEventListener(Events.ON_BLUR, this); editor.addValueChangeListener(this); editor.dynamicDisplay(); // MField => VEditor - New Field value to be updated to editor @@ -342,7 +341,6 @@ public class ProcessParameterPanel extends Panel implements //override attribute editor2.getComponent().setWidgetAttribute("columnName", mField2.getColumnName()+"_To"); editor2.getComponent().addEventListener(Events.ON_FOCUS, this); - editor2.getComponent().addEventListener(Events.ON_BLUR, this); // New Field value to be updated to editor mField2.addPropertyChangeListener(editor2); editor2.dynamicDisplay(); @@ -640,25 +638,6 @@ public class ProcessParameterPanel extends Panel implements } } } - else if (event.getName().equals(Events.ON_BLUR)) { - for (WEditor editor : m_wEditors) - { - if (editor.isComponentOfEditor(event.getTarget())) - { - SessionManager.getAppDesktop().updateHelpTooltip(null); - return; - } - } - - for (WEditor editor : m_wEditors2) - { - if (editor != null && editor.getComponent() != null && editor.isComponentOfEditor(event.getTarget())) - { - SessionManager.getAppDesktop().updateHelpTooltip(null); - return; - } - } - } else if (event.getName().equals("onDynamicDisplay")) { dynamicDisplay(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java index 55d3e3b5c8..c782b1f02b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java @@ -588,6 +588,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria @Override public void updateHelpContext(String ctxType, int recordId) { + Clients.response(new AuScript("zWatch.fire('onFieldTooltip', this);")); helpController.renderCtxHelp(ctxType, recordId); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index eac6e378ee..ec44478071 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -876,16 +876,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } } } - else if (event.getName().equals(Events.ON_BLUR)) { - for (WEditor editor : editors) - { - if (editor.isComponentOfEditor(event.getTarget())) - { - SessionManager.getAppDesktop().updateHelpTooltip(null); - return; - } - } - } else { super.onEvent(event); @@ -899,7 +889,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL for (WEditor editor : editors) { editor.getComponent().addEventListener(Events.ON_FOCUS, this); - editor.getComponent().addEventListener(Events.ON_BLUR, this); } } }