Changeset 4790

Timestamp:

06/09/08 07:13:12 (4 months ago)

Author:

magi@…

Message:

Merged [4751] from trunk to 5.2 branch: fixes #1767 (Less than character (<) is not rendered in Select)

Location:

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client

Files:

• Util.java (modified) (2 diffs)
• ui/IFilterSelect.java (modified) (1 diff)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/Util.java

@@ -7 +7 @@
 import java.util.Iterator;
 
+import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.HasWidgets;
@@ -123 +124 @@
     return false;
     }-*/;
+
+    private static final Element escapeHtmlHelper = DOM.createDiv();
+
+    /**
+     * Converts html entities to text.
+     * 
+     * @param html
+     * @return escaped string presentation of given html
+     */
+    public static String escapeHTML(String html) {
+        DOM.setInnerText(escapeHtmlHelper, html);
+        return DOM.getInnerHTML(escapeHtmlHelper);
+    }
 }

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java

@@ -63 +63 @@
                 sb.append("\" alt=\"icon\" class=\"i-icon\" />");
             }
-            sb.append(caption);
+            sb.append(Util.escapeHTML(caption));
             return sb.toString();
         }