summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-02-05 02:21:40 (EST)
committer Sven Rottstock2013-03-11 06:31:07 (EDT)
commit1d25b0382af1a5e05b98aa34a8bd131914d4629c (patch)
treead24f5288b24bee57eb379e0c2248a1090c7a3cf
parent9527d61798f032983098956816b57a5b4dc48b57 (diff)
downloadorg.eclipse.stardust.ui.web-1d25b0382af1a5e05b98aa34a8bd131914d4629c.zip
org.eclipse.stardust.ui.web-1d25b0382af1a5e05b98aa34a8bd131914d4629c.tar.gz
org.eclipse.stardust.ui.web-1d25b0382af1a5e05b98aa34a8bd131914d4629c.tar.bz2
Jira-ID: CRNT-27734
Added code to skip browser version specific fileNames in fileList. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@62763 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalPluginSkinResourceResolver.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalPluginSkinResourceResolver.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalPluginSkinResourceResolver.java
index 84c6337..6615bba 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalPluginSkinResourceResolver.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PortalPluginSkinResourceResolver.java
@@ -37,6 +37,8 @@ import org.springframework.core.io.support.ResourcePatternResolver;
public class PortalPluginSkinResourceResolver
{
public static final Logger trace = LogManager.getLogger(PortalPluginSkinResourceResolver.class);
+ public static final String IE_USER_AGENT = "_ie";
+ public static final String SAFARI_USER_AGENT = "_safari";
private static ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
/**
@@ -90,6 +92,11 @@ public class PortalPluginSkinResourceResolver
{
// File URI
String extensionResUri = extensionResource.getURI().toString();
+ // Skip adding browser version specific .css fileNames.
+ if (extensionResUri.contains(IE_USER_AGENT) || extensionResUri.contains(SAFARI_USER_AGENT))
+ {
+ continue;
+ }
// Create webURi something like <plugin-id> + public/skins + folder
// containing file ex: <views-common/public/skins/skin1/images>
String extensionWebUri = webUriPrefix + extensionResUri.substring(webContentBaseUri.length());