Changeset 854

Timestamp:

02/07/14 12:26:51 (10 years ago)

Author:

jts21

Message:

Add right-click HTML5 video extraction to JfxBrowser (creates a JfxMedia with the URL)

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (3 diffs)

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -54 +54 @@
 import org.expeditee.items.Text;
 import org.expeditee.settings.network.NetworkSettings;
+import org.w3c.dom.NodeList;
 
 import com.sun.javafx.scene.control.skin.TextFieldSkin;
@@ -74 +75 @@
         private static final String REFRESH = "refresh";
         private static final String CONVERT = "convert";
+        private static final String VIDEO = "video";
         
         private JFXPanel _panel;
@@ -497 +499 @@
                                                 if (selection.length() == 0) {
                                                         JSObject window = (JSObject) JfxBrowser.this._webEngine.executeScript("window");
-                                                        Object image = JfxBrowser.this._webEngine.executeScript(""
-                                                                        + "function isImage(o) {"
-                                                                        + "  if(o.tagName == \"IMG\" && o.src != null) {"
-                                                                        + "    return true;"
-                                                                        + "  }"
-                                                                        + "  if(window.getComputedStyle(o).getPropertyValue(\"background-image\").indexOf(\"url\") == 0) {"
-                                                                        + "    return true;"
-                                                                        + "  }"
-                                                                        + "  return false;"
-                                                                        + "};"
-                                                                        + "var clicked = document.elementFromPoint(" + e.getX() + "," + e.getY() + ");"
-                                                                        + "if(isImage(clicked)) {"
-                                                                        + "  clicked;"
-                                                                        + "} else {"
-                                                                        // TODO: look in child elements and other elements behind the current one
-                                                                        // For now just return nothing
-                                                                        + "  null;"
-                                                                        + "}"
-                                                                        + "");
-                                                        if(image instanceof org.w3c.dom.Node) {
-                                                                System.out.println(image);
-                                                                try {
-                                                                        JSObject style = (JSObject) window.call("getComputedStyle", image);
-
-                                                                        JSObject bounds = (JSObject) ((JSObject) image).call("getBoundingClientRect", new Object[] {});
-                                                                        float width = Float.valueOf(bounds.getMember("width").toString());
-                                                                        float height = Float.valueOf(bounds.getMember("height").toString());
-                                                                        
-                                                                        Picture pic;
-                                                                        
-                                                                        org.w3c.dom.Node node = ((org.w3c.dom.Node) image);
-                                                                        
-                                                                        if (((String) style.call("getPropertyValue", new Object[] { "background-image" })).startsWith("url(")) {
-                                                                                pic = WebParser.getBackgroundImageFromNode(node, style, DisplayIO.getCurrentFrame(), null,
-                                                                                        (float) FrameMouseActions.getX(), (float) FrameMouseActions.getY(), width, height);
-                                                                        } else {
-                                                                                String imgSrc;
-                                                                                if(node.getNodeName().toLowerCase().equals("img") && 
-                                                                                                (imgSrc = ((JSObject) node).getMember("src").toString()) != null) {
-                                                                                        pic = WebParser.getImageFromUrl(imgSrc, null, DisplayIO.getCurrentFrame(),
-                                                                                                        (float) FrameMouseActions.getX(), (float) FrameMouseActions.getY(), (int) width, null, null, null, null, null, 0, 0);
-                                                                                } else {
+                                                        Object o = JfxBrowser.this._webEngine.executeScript("document.elementFromPoint(" + e.getX() + "," + e.getY() + ");");
+                                                        if(o instanceof org.w3c.dom.Node) {
+                                                                org.w3c.dom.Node node = (org.w3c.dom.Node) o;
+                                                                JSObject style = (JSObject) window.call("getComputedStyle", node);
+                                                                if(node.getNodeName().toLowerCase().equals("img") ||
+                                                                                ((String) style.call("getPropertyValue", "background-image")).startsWith("url")) {
+                                                                try {
+    
+                                                                        JSObject bounds = (JSObject) ((JSObject) node).call("getBoundingClientRect", new Object[] {});
+                                                                        float width = Float.valueOf(bounds.getMember("width").toString());
+                                                                        float height = Float.valueOf(bounds.getMember("height").toString());
+                                                                        
+                                                                        Picture pic;
+                                                                        
+                                                                        if (((String) style.call("getPropertyValue", new Object[] { "background-image" })).startsWith("url(")) {
+                                                                                pic = WebParser.getBackgroundImageFromNode(node, style, DisplayIO.getCurrentFrame(), null,
+                                                                                        (float) FrameMouseActions.getX(), (float) FrameMouseActions.getY(), width, height);
+                                                                        } else {
+                                                                                String imgSrc;
+                                                                                if(node.getNodeName().toLowerCase().equals("img") && 
+                                                                                                (imgSrc = ((JSObject) node).getMember("src").toString()) != null) {
+                                                                                        pic = WebParser.getImageFromUrl(imgSrc, null, DisplayIO.getCurrentFrame(),
+                                                                                                        (float) FrameMouseActions.getX(), (float) FrameMouseActions.getY(), (int) width, null, null, null, null, null, 0, 0);
+                                                                                } else {
+                                                                                        return;
+                                                                                }
+                                                                        }
+                                                                        pic.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                                                FrameMouseActions.pickup(pic);
+                                        } catch (Exception e1) {
+                                        // TODO Auto-generated catch block
+                                        e1.printStackTrace();
+                                    }
+                                                                } else if(node.getNodeName().toLowerCase().equals("video")) {
+                                                                        String src = ((JSObject)node).getMember("src").toString();
+                                                                        if(src == null || src.trim().length() == 0) {
+                                                                                NodeList children = node.getChildNodes();
+                                                                                for(int i = 0; i < children.getLength(); i++) {
+                                                                                        org.w3c.dom.Node child = children.item(i);
+                                                                                        if(child.getNodeName().toLowerCase().equals("source")) {
+                                                                                                src = ((JSObject)child).getMember("src").toString();
+                                                                                                if(src != null && src.trim().length() > 0) {
+                                                                                                        break;
+                                                                                                }
+                                                                                        }
+                                                                                        
+                                                                                }
+                                                                                if(src == null || src.trim().length() == 0) {
                                                                                         return;
                                                                                 }
                                                                         }
-                                                                        pic.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
-                                        FrameMouseActions.pickup(pic);
-                                        } catch (Exception e1) {
-                                        // TODO Auto-generated catch block
-                                        e1.printStackTrace();
-                                }
+                                                                        Text t = new Text("@iw: org.expeditee.items.widgets.jfxmedia "
+                                                                                        + ((JSObject)node).getMember("width")
+                                                                                        + ((JSObject)node).getMember("height")
+                                                                                        + ":" + src);
+                                                                        t.setParent(DisplayIO.getCurrentFrame());
+                                                                        t.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                                                                        JfxMedia media = new JfxMedia(t, new String[] { src });
+                                                                        FrameMouseActions.pickup(media.getItems());
+                                                                }
                                                         }
                                                 } else {