summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-07-11 07:10:59 (EDT)
committerStephan Born2013-09-23 04:52:44 (EDT)
commit24d6a4caac70e5783b6d27d9f6dcb14d1d2add42 (patch)
tree5e2ecb6ba0a6b7368fc0cb112e34a807c5b4f327
parent82d81a00fdd347e4ac6937a140bad85c05ddd109 (diff)
downloadorg.eclipse.stardust.ui.web-24d6a4caac70e5783b6d27d9f6dcb14d1d2add42.zip
org.eclipse.stardust.ui.web-24d6a4caac70e5783b6d27d9f6dcb14d1d2add42.tar.gz
org.eclipse.stardust.ui.web-24d6a4caac70e5783b6d27d9f6dcb14d1d2add42.tar.bz2
Jira-ID: CRNT-28362
-Removed JavascriptContext.addJavascriptCall(script) call from PopupUIComponentBean.java and PopupDialog.java. git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@65963 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/PopupUIComponentBean.java1
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java2
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/util/PopupDialog.java1
3 files changed, 0 insertions, 4 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/PopupUIComponentBean.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/PopupUIComponentBean.java
index f254b87..5e12a93 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/PopupUIComponentBean.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/PopupUIComponentBean.java
@@ -86,7 +86,6 @@ public abstract class PopupUIComponentBean extends UIComponentBean
// FOR PANAMA
String popupScript = "parent.BridgeUtils.Dialog.close();";
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), popupScript);
PortalApplication.getInstance().addEventScript(popupScript);
if ((null != focusView) && !PortalUiController.getInstance().broadcastVetoableViewEvent(focusView, ViewEventType.ACTIVATED))
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
index fe1fae5..b4bac7d 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
@@ -1193,7 +1193,6 @@ public class PortalApplication
String iconClass = deriveIconClass(view.getIcon());
// FOR PANAMA
String popupScript = "parent.BridgeUtils.View.setIcon('" + iconClass + "');";
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), popupScript);
addEventScript(popupScript);
}
@@ -1206,7 +1205,6 @@ public class PortalApplication
String title = view.getLabel();
// FOR PANAMA
String popupScript = "parent.BridgeUtils.View.setTitle('" + title + "');";
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), popupScript);
addEventScript(popupScript);
}
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/util/PopupDialog.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/util/PopupDialog.java
index 6036365..405a9d2 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/util/PopupDialog.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/util/PopupDialog.java
@@ -97,7 +97,6 @@ public abstract class PopupDialog implements Serializable
if (modal)
{
String popupScript = "parent.BridgeUtils.Dialog.close();";
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), popupScript);
PortalApplication.getInstance().addEventScript(popupScript);
}