SAK-25979 - MathJax can not be rendered in Home synoptic tools (sakai…

…project#4417)
s50600822 · May 16, 2017 · e472a54 · e472a54
1 parent 7cc6c23
commit e472a54
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/portal/portal-tool/tool/pom.xml b/portal/portal-tool/tool/pom.xml
@@ -40,6 +40,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/portal/portal-tool/tool/src/java/org/sakaiproject/portal/tool/ToolPortal.java b/portal/portal-tool/tool/src/java/org/sakaiproject/portal/tool/ToolPortal.java
@@ -33,6 +33,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.apache.commons.lang3.StringUtils;
+
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.exception.PermissionException;
@@ -308,21 +311,15 @@ protected void setupForward(HttpServletRequest req, HttpServletResponse res,
 
                 if (site != null)
                 {                           
-                    String strMathJaxEnabled = site.getProperties().getProperty(MATHJAX_ENABLED);
-                    if (strMathJaxEnabled != null)
-                    {                              
-                        String [] strMathJaxTools = strMathJaxEnabled.split(",");
-                        List<String> mathJaxTools = Arrays.asList(strMathJaxTools);
-                        if (mathJaxTools != null)
+                    String strMathJaxEnabledForSite = site.getProperties().getProperty(MATHJAX_ENABLED);
+                    if (!StringUtils.isBlank(strMathJaxEnabledForSite))
+                    {
+                        if (Boolean.valueOf(strMathJaxEnabledForSite))
                         {
-                            String toolId = toolConfig.getTool().getId();
-                            if (toolId != null && mathJaxTools.contains(toolId))
-                            {
-                                // this call to MathJax.Hub.Config seems to be needed for MathJax to work in IE
-                                headJs += "<script type=\"text/x-mathjax-config\">\nMathJax.Hub.Config({\ntex2jax: { inlineMath: [['\\\\(','\\\\)']] }\n});\n</script>\n";
-                                headJs += "<script src=\"" + MATHJAX_SRC_PATH + "\"  language=\"JavaScript\" type=\"text/javascript\"></script>\n";
-                            }
-                        }                          
+                            // this call to MathJax.Hub.Config seems to be needed for MathJax to work in IE
+                            headJs += "<script type=\"text/x-mathjax-config\">\nMathJax.Hub.Config({\ntex2jax: { inlineMath: [['\\\\(','\\\\)']] }\n});\n</script>\n";
+                            headJs += "<script src=\"" + MATHJAX_SRC_PATH + "\"  language=\"JavaScript\" type=\"text/javascript\"></script>\n";
+                        }
                     }
                 }
             }