from code review

jay-hodgson · Apr 23, 2024 · a4b1789 · a4b1789
1 parent a66fc6f
commit a4b1789
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 57 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/ClientProperties.java b/src/main/java/org/sagebionetworks/web/client/ClientProperties.java
@@ -67,9 +67,6 @@ public class ClientProperties {
   /*
    * JavaScript WebResources
    */
-  public static final WebResource MATH_PROCESSOR_JS = new WebResource(
-    "js/katex-0.10.1.min.js"
-  );
   public static final WebResource AWS_SDK_JS = new WebResource(
     "js/aws-sdk-2.494.0.min.js"
   );

diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/MarkdownWidget.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/MarkdownWidget.java
@@ -1,6 +1,5 @@
 package org.sagebionetworks.web.client.widget.entity;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.HTMLPanel;
@@ -12,16 +11,13 @@
 import java.util.Map;
 import java.util.Set;
 import org.sagebionetworks.repo.model.wiki.WikiPage;
-import org.sagebionetworks.web.client.ClientProperties;
 import org.sagebionetworks.web.client.DisplayConstants;
 import org.sagebionetworks.web.client.DisplayUtils;
 import org.sagebionetworks.web.client.GWTWrapper;
 import org.sagebionetworks.web.client.MarkdownIt;
 import org.sagebionetworks.web.client.PortalGinInjector;
 import org.sagebionetworks.web.client.SynapseJSNIUtils;
 import org.sagebionetworks.web.client.SynapseJavascriptClient;
-import org.sagebionetworks.web.client.cookie.CookieProvider;
-import org.sagebionetworks.web.client.resources.ResourceLoader;
 import org.sagebionetworks.web.client.security.AuthenticationController;
 import org.sagebionetworks.web.client.utils.Callback;
 import org.sagebionetworks.web.client.widget.entity.controller.SynapseAlert;
@@ -41,12 +37,10 @@ public class MarkdownWidget implements MarkdownWidgetView.Presenter, IsWidget {
   private MarkdownIt markdownIt;
   private SynapseJSNIUtils synapseJSNIUtils;
   private WidgetRegistrar widgetRegistrar;
-  private CookieProvider cookies;
   AuthenticationController authenticationController;
   GWTWrapper gwt;
 
   PortalGinInjector ginInjector;
-  private ResourceLoader resourceLoader;
   private String md;
   private MarkdownWidgetView view;
   private SynapseAlert synAlert;
@@ -58,8 +52,6 @@ public MarkdownWidget(
     SynapseJavascriptClient jsClient,
     SynapseJSNIUtils synapseJSNIUtils,
     WidgetRegistrar widgetRegistrar,
-    CookieProvider cookies,
-    ResourceLoader resourceLoader,
     GWTWrapper gwt,
     PortalGinInjector ginInjector,
     MarkdownWidgetView view,
@@ -70,8 +62,6 @@ public MarkdownWidget(
     this.jsClient = jsClient;
     this.synapseJSNIUtils = synapseJSNIUtils;
     this.widgetRegistrar = widgetRegistrar;
-    this.cookies = cookies;
-    this.resourceLoader = resourceLoader;
     this.gwt = gwt;
     this.ginInjector = ginInjector;
     this.view = view;
@@ -143,34 +133,14 @@ public void loadTableSorters() {
   }
 
   public void loadMath(String suffix) {
-    ClientProperties.fixResourceToCdnEndpoint(
-      ClientProperties.MATH_PROCESSOR_JS,
-      synapseJSNIUtils.getCdnEndpoint()
-    );
     // look for every element that has the right format
     int i = 0;
     String currentWidgetDiv =
       WidgetConstants.DIV_ID_MATHJAX_PREFIX + i + suffix;
     ElementWrapper el = view.getElementById(currentWidgetDiv);
     while (el != null) {
       final Element loadElement = el.getElement();
-      final AsyncCallback<Void> mathProcessorLoadedCallback = new AsyncCallback<
-        Void
-      >() {
-        @Override
-        public void onSuccess(Void result) {
-          synapseJSNIUtils.processMath(loadElement);
-        }
-
-        @Override
-        public void onFailure(Throwable caught) {}
-      };
-      if (
-        resourceLoader.isLoaded(ClientProperties.MATH_PROCESSOR_JS)
-      ) synapseJSNIUtils.processMath(loadElement); else resourceLoader.requires( // already loaded
-        ClientProperties.MATH_PROCESSOR_JS,
-        mathProcessorLoadedCallback
-      );
+      synapseJSNIUtils.processMath(loadElement);
       i++;
       currentWidgetDiv = WidgetConstants.DIV_ID_MATHJAX_PREFIX + i + suffix;
       el = view.getElementById(currentWidgetDiv);