diff options
| author | Joakim Verona | 2012-02-27 00:31:01 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-02-27 00:31:01 +0100 |
| commit | e8e42079e76ca6255bbd53312994ba8e1b3b0ee8 (patch) | |
| tree | 5a442dcda68978873a824fdb292e71bf48d736e8 /lisp | |
| parent | 4c6365623410b93cd6d0c0ff58581503974e0ea8 (diff) | |
| download | emacs-e8e42079e76ca6255bbd53312994ba8e1b3b0ee8.tar.gz emacs-e8e42079e76ca6255bbd53312994ba8e1b3b0ee8.zip | |
bug when passing xwidget in event
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/xwidget.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/xwidget.el b/lisp/xwidget.el index 50e74add6a0..4329382081c 100644 --- a/lisp/xwidget.el +++ b/lisp/xwidget.el | |||
| @@ -160,6 +160,7 @@ defaults to the string looking like a url around the cursor position." | |||
| 160 | ;(xwidget-callback (xwidget-get xwidget 'callback));;TODO stopped working for some reason | 160 | ;(xwidget-callback (xwidget-get xwidget 'callback));;TODO stopped working for some reason |
| 161 | ) | 161 | ) |
| 162 | ;(funcall xwidget-callback xwidget xwidget-event-type) | 162 | ;(funcall xwidget-callback xwidget xwidget-event-type) |
| 163 | (message "xw callback %s" xwidget) | ||
| 163 | (funcall 'xwidget-webkit-callback xwidget xwidget-event-type) | 164 | (funcall 'xwidget-webkit-callback xwidget xwidget-event-type) |
| 164 | )) | 165 | )) |
| 165 | 166 | ||
| @@ -299,9 +300,9 @@ Argument STR string." | |||
| 299 | "make id-element show. for instance an anchor." | 300 | "make id-element show. for instance an anchor." |
| 300 | (interactive (list (xwidget-webkit-current-session) (read-string "element id:"))) | 301 | (interactive (list (xwidget-webkit-current-session) (read-string "element id:"))) |
| 301 | (let* ((y1 | 302 | (let* ((y1 |
| 302 | (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-id) 0))) | 303 | (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-id) "0"))) |
| 303 | (y2 | 304 | (y2 |
| 304 | (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementById('%s').getBoundingClientRect().top" element-id) 0))) | 305 | (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementById('%s').getBoundingClientRect().top" element-id) "0"))) |
| 305 | (y3 (max y1 y2))) | 306 | (y3 (max y1 y2))) |
| 306 | ;;now we need to tell emacs to scroll the element into view. | 307 | ;;now we need to tell emacs to scroll the element into view. |
| 307 | (xwidget-log "scroll: %d" y3) | 308 | (xwidget-log "scroll: %d" y3) |
| @@ -378,6 +379,7 @@ Argument H height." | |||
| 378 | (xwidget-webkit-execute-script xw (format "document.title=%s;" script)) | 379 | (xwidget-webkit-execute-script xw (format "document.title=%s;" script)) |
| 379 | (setq title (xwidget-webkit-get-title xw)) | 380 | (setq title (xwidget-webkit-get-title xw)) |
| 380 | (if (equal emptytag title) (setq title "")) | 381 | (if (equal emptytag title) (setq title "")) |
| 382 | (unless title (setq title default)) | ||
| 381 | title)) | 383 | title)) |
| 382 | 384 | ||
| 383 | 385 | ||