rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify webelem.js

Browse Source 
serialize_elem() now takes care of assigning IDs.
This commit is contained in:
Florian Bruhin 2016-08-18 10:23:03 +02:00
parent 0d35502e87
commit 274fe58d6d
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qutebrowser/javascript/webelem.js
View File

@ -23,7 +23,14 @@ window._qutebrowser.webelem = (function() {
var funcs = {}; var funcs = {};
var elements = []; var elements = [];
function serialize_elem(elem, id) { function serialize_elem(elem) {
if (!elem) {
return null;
}
var id = elements.length;
elements[id] = elem;
var out = { var out = {
"id": id, "id": id,
"text": elem.text, "text": elem.text,
@ -60,13 +67,9 @@ window._qutebrowser.webelem = (function() {
funcs.find_all = function(selector) { funcs.find_all = function(selector) {
var elems = document.querySelectorAll(selector); var elems = document.querySelectorAll(selector);
var out = []; var out = [];
var id = elements.length;
for (var i = 0; i < elems.length; ++i) { for (var i = 0; i < elems.length; ++i) {
var elem = elems[i]; out.push(serialize_elem(elems[i]));
out.push(serialize_elem(elem, id));
elements[id] = elem;
id++;
} }
return out; return out;
@ -81,9 +84,7 @@ window._qutebrowser.webelem = (function() {
return null; return null;
} }
var id = elements.length; return serialize_elem(elem);
elements[id] = elem;
return serialize_elem(elem, id);
}; };
funcs.set_text = function(id, text) { funcs.set_text = function(id, text) {
@ -97,13 +98,7 @@ window._qutebrowser.webelem = (function() {
// element is returned (the iframe itself). // element is returned (the iframe itself).
var elem = document.elementFromPoint(x, y); var elem = document.elementFromPoint(x, y);
if (!elem) { return serialize_elem(elem);
return null;
}
var id = elements.length;
elements[id] = elem;
return serialize_elem(elem, id);
}; };
return funcs; return funcs;