Changeset 8933 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-10-23T14:50:40+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11262 - Images not displayed correctly in Help Browser

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Utils.java (modified) (1 diff)
• WikiReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1411 +1411 @@
      */
     public static boolean hasExtension(String filename, String... extensions) {
-        String name = filename.toLowerCase(Locale.ENGLISH);
+        String name = filename.toLowerCase(Locale.ENGLISH).replace("?format=raw", "");
         for (String ext : extensions) {
             if (name.endsWith('.' + ext.toLowerCase(Locale.ENGLISH)))

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -142 +142 @@
                 // add a border="0" attribute to images, otherwise the internal help browser
                 // will render a thick  border around images inside an <a> element
+                // remove width information to avoid distorded images (fix #11262)
                 b.append(line.replaceAll("<img ", "<img border=\"0\" ")
+                         .replaceAll("width=\"(\\d+)\"", "")
                          .replaceAll("<span class=\"icon\">.</span>", "")
                          .replaceAll("href=\"/", "href=\"" + baseurl + '/')