From 03b454ecade093dd6e489be7909968b24b1654b5 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 5 May 2016 09:17:23 +0000 Subject: [PATCH] Added check to set a z-index greater than (1040) static value used by bootstrap modal git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@128469 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/WorkspaceExplorerConstants.java | 6 +++-- .../save/WorkspaceExplorerSaveDialog.java | 25 ++++++++++--------- .../select/WorkspaceExplorerSelectDialog.java | 24 +++++++++--------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java index 3a1d92e..6ac1be5 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java @@ -19,7 +19,7 @@ public class WorkspaceExplorerConstants { public static final String WORKSPACE_EXPLORER_CAPTION = "Workspace Explorer"; public static final String WORKSPACE_EXPLORER_SAVE_AS_CAPTION = "Workspace Explorer Save As..."; - + public static final String HOME_LABEL = "Home"; public static final String WORKSPACE_MY_SPECIAL_FOLDERS_PATH = "/Workspace/MySpecialFolders"; @@ -31,7 +31,9 @@ public class WorkspaceExplorerConstants { public static final String AUTO = "auto"; public static final int WIDHT_DIALOG = 730; + public static final int STATIC_BOOTSTRAP_ZINDEX_MODAL_VALUE = 1040; + public static final String SELECT = "Select"; - + public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java index 0532d00..fc17df3 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/save/WorkspaceExplorerSaveDialog.java @@ -463,20 +463,21 @@ public class WorkspaceExplorerSaveDialog extends Modal implements HasWorskpaceEx */ private void configureZindex() { - if(zIndex>0){ - Element el = null; - try{ - el = getElement(); - }catch (Exception e) { - //silent - return; - } - el.getStyle().setZIndex(zIndex+20); + zIndex = zIndex > WorkspaceExplorerConstants.STATIC_BOOTSTRAP_ZINDEX_MODAL_VALUE?zIndex:WorkspaceExplorerConstants.STATIC_BOOTSTRAP_ZINDEX_MODAL_VALUE+50; - //IS MODAL-BACKDROP - if(el.getNextSiblingElement()!=null) - el.getNextSiblingElement().getStyle().setZIndex(zIndex+10); + Element el = null; + try{ + el = getElement(); + }catch (Exception e) { + //silent + return; } + el.getStyle().setZIndex(zIndex+20); + + //IS MODAL-BACKDROP + if(el.getNextSiblingElement()!=null) + el.getNextSiblingElement().getStyle().setZIndex(zIndex+10); + } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java index 53cdbab..80560a4 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java @@ -388,20 +388,20 @@ public class WorkspaceExplorerSelectDialog extends Modal implements HasWorskpace */ private void configureZindex() { - if(zIndex>0){ - Element el = null; - try{ - el = getElement(); - }catch (Exception e) { - //silent - return; - } - el.getStyle().setZIndex(zIndex+20); + zIndex = zIndex > WorkspaceExplorerConstants.STATIC_BOOTSTRAP_ZINDEX_MODAL_VALUE?zIndex:WorkspaceExplorerConstants.STATIC_BOOTSTRAP_ZINDEX_MODAL_VALUE+20; - //IS MODAL-BACKDROP - if(el.getNextSiblingElement()!=null) - el.getNextSiblingElement().getStyle().setZIndex(zIndex+10); + Element el = null; + try{ + el = getElement(); + }catch (Exception e) { + //silent + return; } + el.getStyle().setZIndex(zIndex+20); + + //IS MODAL-BACKDROP + if(el.getNextSiblingElement()!=null) + el.getNextSiblingElement().getStyle().setZIndex(zIndex+10); }