Changeset 887

Timestamp:

02/13/14 22:59:29 (10 years ago)

Author:

ngw8

Message:

JFXBrowser - right clicking on a link attaches a text item to the cursor with an action to create a new frame containing a browser pointing to the linked page. Also works for linked images.

Location:

trunk/src/org/expeditee

Files:

• actions/JfxBrowserActions.java (modified) (1 diff)
• items/widgets/JfxBrowser.java (modified) (7 diffs)

trunk/src/org/expeditee/actions/JfxBrowserActions.java

@@ -153 +153 @@
          * @throws Exception
          */
-        public static void createFrameWithBrowser(Text link, String url) throws Exception {
+        public static void createFrameWithBrowser(Item link, String url) throws Exception {
                 Frame frame = FrameIO.CreateNewFrame(link);
                 frame.removeAllItems(frame.getItems());
+
                 link.setLink("" + frame.getNumber());
                 link.setAction(null);
 
                 // Create widget via text annotation
-                Text wt = frame.addText(10, 10, "@iw: org.expeditee.items.widgets.JfxBrowser " + (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.9) + " "
+                frame.addText(10, 10, "@iw: org.expeditee.items.widgets.JfxBrowser " + (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.9) + " "
                                 + (int) (FrameGraphics.getMaxFrameSize().getHeight() * 0.9) + " : " + url, null);
 

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

@@ -543 +543 @@
                                                         JSObject window = (JSObject) JfxBrowser.this._webEngine.executeScript("window");
                                                         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 {
-    
+                                                                
+                                                                        try {
                                                                         JSObject bounds = (JSObject) ((JSObject) node).call("getBoundingClientRect", new Object[] {});
                                                                         float width = Float.valueOf(bounds.getMember("width").toString());
@@ -559 +561 @@
                                                                                 pic = WebParser.getBackgroundImageFromNode(node, style, DisplayIO.getCurrentFrame(), null,
                                                                                         (float) FrameMouseActions.getX(), (float) FrameMouseActions.getY(), width, height);
+                                                                                
                                                                         } else {
                                                                                 String imgSrc;
@@ -569 +572 @@
                                                                                 }
                                                                         }
+                                                                        
+                                                                        String linkUrl;
+                                                                        
+                                                                        // Check the image and its immediate parent for links
+                                                                        if ((node.getNodeName().toLowerCase().equals("a") && (linkUrl = (String) ((JSObject)node).getMember("href")) != null)
+                                                                                        || (node.getParentNode().getNodeName().toLowerCase().equals("a") && (linkUrl = (String)((JSObject)node.getParentNode()).getMember("href")) != null)) {
+                                                                                
+                                                                                if(hasValidProtocol(linkUrl)) {
+                                                                                        pic.getSource().setAction("createFrameWithBrowser "  + linkUrl);
+                                                                                }
+                                                                        }
+                                                                        
                                                                         pic.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
                                                 FrameMouseActions.pickup(pic);
@@ -575 +590 @@
                                         e1.printStackTrace();
                                     }
+                                                                        
                                                                 } else if(node.getNodeName().toLowerCase().equals("video")) {
                                                                         String src = ((JSObject)node).getMember("src").toString();
@@ -601 +617 @@
                                                                         JfxMedia media = new JfxMedia(t, new String[] { src });
                                                                         FrameMouseActions.pickup(media.getItems());
+                                                                        
+                                                                } else if(node.getNodeName().toLowerCase().equals("a") && ((JSObject)node).getMember("href") != null) {
+                                                                        // If a link is right clicked, copy the text content and give it an action to create 
+                                                                        // a new frame containing a browser pointing to the linked page
+                                                                        Text t = DisplayIO.getCurrentFrame().createNewText(((String) ((JSObject)node).getMember("textContent")).trim());
+                                                                        t.addAction("createFrameWithBrowser " + (String) ((JSObject)node).getMember("href"));
+                                                                        t.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                                                                        FrameMouseActions.pickup(t);
                                                                 }
                                                         }
                                                 } else {
                                                         // Copy text and attach to cursor
-                                                        Text t = new Text(selection);
-                                                        t.setParent(DisplayIO.getCurrentFrame());
+                                                        Text t = DisplayIO.getCurrentFrame().createNewText();                                                   
                                                         t.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
                                                         FrameMouseActions.pickup(t);
@@ -622 +645 @@
         public void navigate(String url) {
                 final String actualURL;
-                String urlLower = url.toLowerCase();
+
                 // check if protocol is missing
-                if (!(urlLower.startsWith("http://") || url.startsWith("https://") || urlLower.startsWith("ftp://") || urlLower.startsWith("file://"))) {
+                if (!hasValidProtocol(url)) {
                         // check if it's a search
                         int firstSpace = url.indexOf(" ");
@@ -973 +996 @@
                 return stringBuilder.toString();
         }
+        
+        /**
+         * Checks if a URL string starts with a protocol that can be loaded by the webview
+         * @param url URL string to check
+         * @return
+         */
+        private static boolean hasValidProtocol(String url) {
+                String urlLower = url.toLowerCase();
+                
+                // check if protocol is present
+                return (urlLower.startsWith("http://") || url.startsWith("https://") || urlLower.startsWith("ftp://") || urlLower.startsWith("file://"));
+        }
 }