even better relative links

2 files changed, 26 insertions, 6 deletions

diff --git a/README.xwidget b/README.xwidget
index 5b0bfcd91f3..ff7acb7b365 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -1185,9 +1185,20 @@ open a new window or something, which wont work.
 have a look at how docview solves it
 webkit_web_view_search_text ()
 *** TODO webkit relative references doesn't work
-probably because we handle scrolling in a non-standard way. It does
+because we handle scrolling in a non-standard way. It does
 work sort of when theres a html frameset and webkit scrolls by itself.
 
+internal links (page.html#section) do not work
+see xwidget-webkit-show-named-element
+
+also did some  webkit signal work for this.
+
+now it actually works! except for I need to know the Y coordinate of
+the element to navigate to, and that can either be by "name" or "id"
+attribute, currently "id"  works.
+
+
+
 *** TODO webkit width adjustment handling issue
 since there are so many levels of clipping and whatnot in xwidgets
 sizing issues are difficult.
@@ -1240,10 +1251,6 @@ that image-mode has special code to handle scrolling. the browser mode
 and image mode has some similarities.
 
 I made some delegation code frrom webkit mode to image mode.
-*** TODO internal links (page.html#section) do not work
-see xwidget-webkit-show-named-element
-
-also did some preliminary webkit signal work for this
 *** TODO url-browse improvement
 sindikat: site.com and http://site.com should be equivalent (simple site.com
   throws error)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 0225889811d..71b3de5ff38 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -169,7 +169,7 @@ defaults to the string looking like a url around the cursor position."
              (let ((elmid (progn                   (string-match ".*#\\(.*\\)" strarg)(match-string 1 strarg))))
                    (message "navigation-policy-decision-requested: '%s' %s"  strarg  elmid       )
 
-                   (if elmid (xwidget-webkit-show-id-element xwidget elmid))
+                   (if elmid (xwidget-webkit-show-id-or-named-element xwidget elmid))
                    )
 
              )
@@ -285,6 +285,19 @@ Argument STR string."
     (set-window-vscroll (selected-window) y t))
   )
 
+(defun xwidget-webkit-show-id-or-named-element (xw element-id)
+  "make id-element show. for instance an anchor."
+  (interactive (list (xwidget-webkit-current-session) (read-string "element id:")))
+  (let* ((y1 
+         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-id) 0)))
+        (y2 
+         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementById('%s').getBoundingClientRect().top" element-id) 0)))
+        (y3 (max y1 y2)))
+    ;;now we need to tell emacs to scroll the element into view. 
+    (message "scroll: %d" y3)
+    (set-window-vscroll (selected-window) y3 t))
+  )
+
 (defun xwidget-webkit-adjust-size-to-content ()
   "Adjust webkit to content size."
   (interactive)