allow for attribute-free Markdown images

rstudio · Jan 6, 2019 · 17b85c8 · 17b85c8
1 parent ce1db6b
commit 17b85c8
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/...gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ImagePreviewer.java b/...gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ImagePreviewer.java
@@ -244,24 +244,27 @@ public void execute(Integer height)
       String srcPath = imgSrcPathFromHref(sentinel, href);
       final Image image = new Image(srcPath);
       image.addStyleName(RES.styles().image());
-
-      // parse and inject attributes
-      Attributes parsedAttributes = HTMLAttributesParser.parseAttributes(attributes);
       final Element imgEl = image.getElement();
-      for (Map.Entry<String, String> entry : parsedAttributes.getAttributes().entrySet())
-      {
-         String key = entry.getKey();
-         String val = entry.getValue();
-         if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(val))
-            continue;
-         imgEl.setAttribute(key, val);
-      }
 
-      if (!parsedAttributes.getIdentifier().isEmpty())
-         imgEl.setId(parsedAttributes.getIdentifier());
+      // parse and inject attributes, if we have any
+      if (attributes != null)
+      {
+         Attributes parsedAttributes = HTMLAttributesParser.parseAttributes(attributes);
+         for (Map.Entry<String, String> entry : parsedAttributes.getAttributes().entrySet())
+         {
+            String key = entry.getKey();
+            String val = entry.getValue();
+            if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(val))
+               continue;
+            imgEl.setAttribute(key, val);
+         }
 
-      for (String className : parsedAttributes.getClasses())
-         imgEl.addClassName(className);
+         if (!parsedAttributes.getIdentifier().isEmpty())
+            imgEl.setId(parsedAttributes.getIdentifier());
+
+         for (String className : parsedAttributes.getClasses())
+            imgEl.addClassName(className);
+      }
 
       // add load handlers to image
       DOM.sinkEvents(imgEl, Event.ONLOAD | Event.ONERROR);