[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7457644 06/16: xwidget: Simplify functions to scrol
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 7457644 06/16: xwidget: Simplify functions to scroll to elements |
Date: |
Wed, 26 Oct 2016 06:07:20 +0000 (UTC) |
branch: master
commit 74576447b969adc430144d9a3ce57b590f2a2dcc
Author: Ricardo Wurmus <address@hidden>
Commit: Paul Eggert <address@hidden>
xwidget: Simplify functions to scroll to elements
* lisp/xwidget.el (xwidget-webkit-show-named-element,
xwidget-webkit-show-id-element,
xwidget-webkit-show-id-or-named-element): Simplify functions by
scrolling exclusively with JavaScript.
---
lisp/xwidget.el | 79 ++++++++++++++++++++++++-------------------------------
1 file changed, 35 insertions(+), 44 deletions(-)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 1333365..e54d1f8 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -339,62 +339,53 @@ XW is the xwidget identifier, TEXT is retrieved from the
webkit."
For example, use this to display an anchor."
(interactive (list (xwidget-webkit-current-session)
(read-string "Element name: ")))
- ;;TODO since an xwidget is an Emacs object, it is not trivial to do
- ;; some things that are taken for granted in a normal browser.
- ;; scrolling an anchor/named-element into view is one such thing.
- ;; This function implements a proof-of-concept for this. Problems
- ;; remaining: - The selected window is scrolled but this is not
- ;; always correct - This needs to be interfaced into browse-url
- ;; somehow. The tricky part is that we need to do this in two steps:
- ;; A: load the base url, wait for load signal to arrive B: navigate
- ;; to the anchor when the base url is finished rendering
-
- ;; This part figures out the Y coordinate of the element
- (let ((y (string-to-number
- (xwidget-webkit-execute-script-rv
- xw
- (format
- "document.getElementsByName('%s')[0].getBoundingClientRect().top"
- element-name)
- 0))))
- ;; Now we need to tell Emacs to scroll the element into view.
- (xwidget-log "scroll: %d" y)
- (set-window-vscroll (selected-window) y t)))
+ ;; TODO: This needs to be interfaced into browse-url somehow. The
+ ;; tricky part is that we need to do this in two steps: A: load the
+ ;; base url, wait for load signal to arrive B: navigate to the
+ ;; anchor when the base url is finished rendering
+ (xwidget-webkit-execute-script
+ xw
+ (format "
+(function (query) {
+ var el = document.getElementsByName(query)[0];
+ if (el !== undefined) {
+ window.scrollTo(0, el.offsetTop);
+ }
+})('%s');"
+ element-name)))
(defun xwidget-webkit-show-id-element (xw element-id)
"Make webkit xwidget XW show an id-element ELEMENT-ID.
For example, use this to display an anchor."
(interactive (list (xwidget-webkit-current-session)
(read-string "Element id: ")))
- (let ((y (string-to-number
- (xwidget-webkit-execute-script-rv
- xw
- (format
"document.getElementById('%s').getBoundingClientRect().top"
- element-id)
- 0))))
- ;; Now we need to tell Emacs to scroll the element into view.
- (xwidget-log "scroll: %d" y)
- (set-window-vscroll (selected-window) y t)))
+ (xwidget-webkit-execute-script
+ xw
+ (format "
+(function (query) {
+ var el = document.getElementById(query);
+ if (el !== null) {
+ window.scrollTo(0, el.offsetTop);
+ }
+})('%s');"
+ element-id)))
(defun xwidget-webkit-show-id-or-named-element (xw element-id)
"Make webkit xwidget XW show a name or element id ELEMENT-ID.
For example, use this to display an anchor."
(interactive (list (xwidget-webkit-current-session)
(read-string "Name or 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.
- (xwidget-log "scroll: %d" y3)
- (set-window-vscroll (selected-window) y3 t)))
+ (xwidget-webkit-execute-script
+ xw
+ (format "
+(function (query) {
+ var el = document.getElementById(query) ||
+ document.getElementsByName(query)[0];
+ if (el !== undefined) {
+ window.scrollTo(0, el.offsetTop);
+ }
+})('%s');"
+ element-id)))
(defun xwidget-webkit-adjust-size-to-content ()
"Adjust webkit to content size."
- [Emacs-diffs] master 01c2fba 14/16: xwidget: Bind "beginning-of-buffer" and "end-of-buffer", (continued)
- [Emacs-diffs] master 01c2fba 14/16: xwidget: Bind "beginning-of-buffer" and "end-of-buffer", Paul Eggert, 2016/10/26
- [Emacs-diffs] master 623deaf 02/16: xwidget: Pass JavaScript return value to optional callback procedure, Paul Eggert, 2016/10/26
- [Emacs-diffs] master ff80a9c 04/16: xwidget: Do not use `xwidget-execute-script-rv' to insert string, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 7ee870e 03/16: Remove scrolled window container around WebKit widget, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 67e0331 10/16: xwidget: Remove title hack., Paul Eggert, 2016/10/26
- [Emacs-diffs] master e443eab 13/16: Implement zoom for WebKit widget., Paul Eggert, 2016/10/26
- [Emacs-diffs] master d781662 01/16: xwidget: Use WebKit2 API, Paul Eggert, 2016/10/26
- [Emacs-diffs] master c483fa6 11/16: Let initial WebKit view fill window, Paul Eggert, 2016/10/26
- [Emacs-diffs] master a9785bd 12/16: Dynamically resize WebKit widget., Paul Eggert, 2016/10/26
- [Emacs-diffs] master efa269d 07/16: xwidget: Add function to find element by CSS selector, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 7457644 06/16: xwidget: Simplify functions to scroll to elements,
Paul Eggert <=
- [Emacs-diffs] master 5edf76b 16/16: * src/xwidget.c (webkit_js_to_lisp): Now static., Paul Eggert, 2016/10/26