[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ff80a9c 04/16: xwidget: Do not use `xwidget-execute
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master ff80a9c 04/16: xwidget: Do not use `xwidget-execute-script-rv' to insert string |
Date: |
Wed, 26 Oct 2016 06:07:20 +0000 (UTC) |
branch: master
commit ff80a9c8376d5c14e37fbbfde08706492327836a
Author: Ricardo Wurmus <address@hidden>
Commit: Paul Eggert <address@hidden>
xwidget: Do not use `xwidget-execute-script-rv' to insert string
* lisp/xwidget.el (xwidget-webkit-insert-string): Obtain JavaScript
return value via callback instead of using
`xwidget-webkit-execute-script-rv'.
---
lisp/xwidget.el | 47 +++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index d2b9a09..a252fd7 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -286,31 +286,30 @@ function findactiveelement(doc){
;;TODO the activeelement type needs to be examined, for iframe, etc.
)
-(defun xwidget-webkit-insert-string (xw str)
- "Insert string STR in the active field in the webkit XW."
+(defun xwidget-webkit-insert-string ()
+ "Prompt for a string and insert it in the active field in the
+current webkit widget."
;; Read out the string in the field first and provide for edit.
- (interactive
- (let* ((xww (xwidget-webkit-current-session))
-
- (field-value
- (progn
- (xwidget-webkit-execute-script xww
xwidget-webkit-activeelement-js)
- (xwidget-webkit-execute-script-rv
- xww
- "findactiveelement(document).value;")))
- (field-type (xwidget-webkit-execute-script-rv
- xww
- "findactiveelement(document).type;")))
- (list xww
- (cond ((equal "text" field-type)
- (read-string "Text: " field-value))
- ((equal "password" field-type)
- (read-passwd "Password: " nil field-value))
- ((equal "textarea" field-type)
- (xwidget-webkit-begin-edit-textarea xww field-value))))))
- (xwidget-webkit-execute-script
- xw
- (format "findactiveelement(document).value='%s'" str)))
+ (interactive)
+ (let ((xww (xwidget-webkit-current-session)))
+ (xwidget-webkit-execute-script
+ xww
+ (concat xwidget-webkit-activeelement-js "
+(function () {
+ var res = findactiveelement(document);
+ return [res.value, res.type];
+})();")
+ (lambda (field)
+ (let ((str (pcase field
+ (`[,val "text"]
+ (read-string "Text: " val))
+ (`[,val "password"]
+ (read-passwd "Password: " nil val))
+ (`[,val "textarea"]
+ (xwidget-webkit-begin-edit-textarea xww val)))))
+ (xwidget-webkit-execute-script
+ xww
+ (format "findactiveelement(document).value='%s'" str)))))))
(defvar xwidget-xwbl)
(defun xwidget-webkit-begin-edit-textarea (xw text)
- [Emacs-diffs] master updated (1ea669d -> 5edf76b), Paul Eggert, 2016/10/26
- [Emacs-diffs] master 8809002 09/16: xwidget: Get URL asynchronously., Paul Eggert, 2016/10/26
- [Emacs-diffs] master 4aa7c4b 08/16: xwidget: Get selection with asynchronous JavaScript, Paul Eggert, 2016/10/26
- [Emacs-diffs] master cc3b868 05/16: xwidget: Get title via asynchronous JavaScript., Paul Eggert, 2016/10/26
- [Emacs-diffs] master ca479f9 15/16: xwidget: Map "previous-line" and "next-line" to scroll, Paul Eggert, 2016/10/26
- [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 <=
- [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, 2016/10/26
- [Emacs-diffs] master 5edf76b 16/16: * src/xwidget.c (webkit_js_to_lisp): Now static., Paul Eggert, 2016/10/26