Changeset 692

Timestamp:

01/14/14 16:27:17 (10 years ago)

Author:

ngw8

Message:

Partially fixed web parsers inability to convert unicode characters

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (4 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -99 +99 @@
                                                                 // MessageBay.displayMessage("Finished loading page");
                                                                 System.out.println("Parsing page!");
-                                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, "window.resizeTo(800, 800)");
+                                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, "window.resizeTo(800, 800);");
                                                                 parsePage(webEngine, frame);
                                                                 System.out.println("Parsed page!");
@@ -137 +137 @@
 
                                                 Object window = JavaFX.WebEngineExecuteScript.invoke(webEngine, "window");
-                                                
-                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
- + "var css = 'a * { outline: 0.1px outset rgba(9,9,9,0.001); }';" // TODO
-                                                                + "var head = document.head;"
-                                                                + "var style = document.createElement('style');"
-                                                                + "style.id = 'expediteeparser';"
-
-                                                                + "style.appendChild(document.createTextNode(css));"
-
-                                                                + "head.appendChild(style);"
-                                                                );
 
                                                 frame.setBackgroundColor(rgbStringToColor((String) JavaFX.JSObjectCall.invoke(JavaFX.JSObjectCall.invoke(window, "getComputedStyle", new Object[] { doc }), "getPropertyValue",
@@ -344 +333 @@
                                                                                 for (int j = 0; j < typefaces.length && !fontFound; j++) {
                                                                                         if (typefaces[j].toLowerCase().equals("sans-serif")) {
-                                                                                                typefaces[j] = "Arial";
+                                                                                                typefaces[j] = "Arial Unicode MS";
                                                                                         } else if (typefaces[j].toLowerCase().equals("serif")) {
                                                                                                 typefaces[j] = "Times New Roman";
+                                                                                        } else if ((typefaces[j].toLowerCase().equals("arial"))) {
+                                                                                                // Have to use Arial Unicode, otherwise unicode characters display incorrectly
+                                                                                                typefaces[j] = "Arial Unicode MS";
                                                                                         }
                                                                                         
@@ -599 +591 @@
          * @param imgSrc
          *            URL of the image to add
+         * @param linkUrl
+         *            Absolute URL that the image should link to when clicked
          * @param frame
          *            Frame to add the image to