Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: luci.js: convert LuCI.dom to Class instance

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-01-07 15:40:20 +01:00
parent 344c4c5119
commit 26e54bb01f
1 changed files with 148 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
modules/luci-base/htdocs/luci-static/resources/luci.js
View file

@ -653,14 +653,12 @@
halt: function() { return Request.poll.stop() },
run: function() { return Request.poll.start() },
Class: Class,
Request: Request
});
/* DOM manipulation */
LuCI.prototype.dom = {
dom: Class.singleton({
__name__: 'LuCI.DOM',
elem: function(e) {
return (typeof(e) === 'object' && e !== null && 'nodeType' in e);
return (e != null && typeof(e) == 'object' && 'nodeType' in e);
},
parse: function(s) {
@ -751,7 +749,7 @@
attr = {}, attr[key] = val;
for (key in attr) {
if (!attr.hasOwnProperty(key) || attr[key] === null || attr[key] === undefined)
if (!attr.hasOwnProperty(key) || attr[key] == null)
continue;
switch (typeof(attr[key])) {
@ -771,16 +769,27 @@
create: function() {
var html = arguments[0],
attr = (arguments[1] instanceof Object && !Array.isArray(arguments[1])) ? arguments[1] : null,
data = attr ? arguments[2] : arguments[1],
attr = arguments[1],
data = arguments[2],
elem;
if (this.elem(html))
if (!(attr instanceof Object) || Array.isArray(attr))
data = attr, attr = null;
if (Array.isArray(html)) {
elem = document.createDocumentFragment();
for (var i = 0; i < html.length; i++)
elem.appendChild(this.create(html[i]));
}
else if (this.elem(html)) {
elem = html;
else if (html.charCodeAt(0) === 60)
}
else if (html.charCodeAt(0) === 60) {
elem = this.parse(html);
else
}
else {
elem = document.createElement(html);
}
if (!elem)
return null;
@ -790,7 +799,11 @@
return elem;
}
};
}),
Class: Class,
Request: Request
});
XHR = Class.extend({
__name__: 'LuCI.XHR',