Changeset 8933 in josm


Ignore:
Timestamp:
2015-10-23T14:50:40+02:00 (4 years ago)
Author:
Don-vip
Message:

fix #11262 - Images not displayed correctly in Help Browser

Location:
trunk/src/org/openstreetmap/josm
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/widgets/JosmHTMLEditorKit.java

    r8415 r8933  
    22package org.openstreetmap.josm.gui.widgets;
    33
     4import javax.swing.text.ViewFactory;
    45import javax.swing.text.html.HTMLEditorKit;
    56import javax.swing.text.html.StyleSheet;
     
    89 * A subclass of {@link HTMLEditorKit} that fixes an uncommon design choice that shares the set stylesheet between all instances.
    910 * This class stores a single stylesheet per instance, as it should have be done by Sun in the first place.
     11 * Moreover it allows to display SVG images.
    1012 * @since 6040
    1113 */
    1214public class JosmHTMLEditorKit extends HTMLEditorKit {
    1315
    14     protected StyleSheet ss = super.getStyleSheet();
     16    /** Shared factory for creating HTML Views. */
     17    private static final ViewFactory FACTORY = new JosmHTMLFactory();
     18
     19    private StyleSheet ss = super.getStyleSheet();
    1520
    1621    /**
     
    4247        return ss;
    4348    }
     49
     50    @Override
     51    public ViewFactory getViewFactory() {
     52        return FACTORY;
     53    }
    4454}
  • trunk/src/org/openstreetmap/josm/tools/Utils.java

    r8928 r8933  
    14111411     */
    14121412    public static boolean hasExtension(String filename, String... extensions) {
    1413         String name = filename.toLowerCase(Locale.ENGLISH);
     1413        String name = filename.toLowerCase(Locale.ENGLISH).replace("?format=raw", "");
    14141414        for (String ext : extensions) {
    14151415            if (name.endsWith('.' + ext.toLowerCase(Locale.ENGLISH)))
  • trunk/src/org/openstreetmap/josm/tools/WikiReader.java

    r8870 r8933  
    142142                // add a border="0" attribute to images, otherwise the internal help browser
    143143                // will render a thick  border around images inside an <a> element
     144                // remove width information to avoid distorded images (fix #11262)
    144145                b.append(line.replaceAll("<img ", "<img border=\"0\" ")
     146                         .replaceAll("width=\"(\\d+)\"", "")
    145147                         .replaceAll("<span class=\"icon\">.</span>", "")
    146148                         .replaceAll("href=\"/", "href=\"" + baseurl + '/')
Note: See TracChangeset for help on using the changeset viewer.