efront 4.5.0 → 4.5.4

package/coms/pivot/acme2.js

@@ -1,5 +1,4 @@
 var acmebase = `https://acme-v02.api.letsencrypt.org/`;
-// <!-- acmebase=`https://acme-staging-v02.api.letsencrypt.org/` -->
 var data1 = data.enrich(parseYML(`
 ${acmebase}:
   directory: get directory
@@ -21,20 +20,13 @@ var base64url = function (params) {
 };
 var accountApi = await data1.getApi('get-account');
 var orderApi = await data1.getApi('get-order');
-
-var request = async function (id, params) {
-    var api = await data1.getApi(id);
-    if (/^(get|head)$/i.test(api.method)) return data1.from(id, params);
+var wrapParams = async function (url, params, usejwk = false) {
     var protected = {
-        url: api.base + api.path,
+        url
     };
-    var rest;
-    [protected.url, rest] = data.prepareURL(protected.url, params);
-    var restparams = {};
-    rest.forEach(k => { restparams[k] = params[k]; delete params[k]; });
     var jwk = await subtle.exportKey("jwk", publicKey);
     protected.alg = jwk.alg;
-    if (/new-account|revert-cert/i.test(id)) {
+    if (usejwk) {
         protected.jwk = {
             e: jwk.e,
             kty: jwk.kty,
@@ -45,17 +37,124 @@ var request = async function (id, params) {
         protected.kid = acme2.kid;
     }
     protected.nonce = await data1.from("new-nonce");
-    var payload = isEmpty(params) ? '' : base64url(params);
     protected = base64url(protected);
+    var payload = isHandled(params) ? base64url(params) : '';
     var params = {
         protected,
         payload,
         signature: toBase64(new Uint8Array(await subtle.sign({ name: RSASSA_PKCS1_v1_5, saltLength: 32 }, privateKey, new Uint8Array(encodeUTF8([protected, '.', payload].join(''))))), true)
     };
+    return params;
+}
+var request = async function (id, params) {
+    var api = await data1.getApi(id);
+    if (/^(get|head)$/i.test(api.method)) return data1.from(id, params);
+    var [url, rest] = data.prepareURL(api.base + api.path, params);
+    var restparams = {};
+    rest.forEach(k => { restparams[k] = params[k]; delete params[k]; });
+    var params = await wrapParams(url, params, /new-account|revert-cert/i.test(id));
     extend(params, restparams);
     var account = await data1.from(id, params);
     return account;
 };
+var ASN1 = function (type) {
+    var length = 0;
+    var bytesarr = [];
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var bytes = arguments[cx];
+        if (bytes.constructor !== Array) {
+            bytes = Array.apply(null, bytes);
+        }
+        bytesarr.push(bytes);
+        length += bytes.length;
+    }
+    var asn1 = [type];
+    if (length === (2 << 8 | 36)) console.log(arguments)
+    if (length > 127) {
+        var nums = [];
+        while (length > 0) {
+            nums.unshift(length & 0xff);
+            length = length >>> 8;
+        }
+        asn1.push(0x80 | nums.length, ...nums);
+    }
+    else {
+        asn1.push(length);
+    }
+    asn1 = asn1.concat(...bytesarr);
+    return asn1;
+};
+var packUint = function (bytes) {
+    if (bytes[0] & 0x80) {
+        return ASN1(0x02, [0], bytes);
+    }
+    return ASN1(0x02, bytes);
+};
+var packBits = function (bytes) {
+    return ASN1(0x03, [0x00], bytes);
+};
+var packPublicKey = function (jwk) {
+    var n = packUint(fromBase64(jwk.n));
+    var e = packUint(fromBase64(jwk.e));
+    var p = ASN1(0x30, n, e);
+    return ASN1(0x30, ASN1(0x30,
+        ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01]),
+        ASN1(0x05),
+    ), packBits(p));
+};
+var packCSR = function (asn1pubkey, domains) {
+    return ASN1(0x30,
+        packUint([0x00]),
+        ASN1(0x30, ASN1(0x31, ASN1(0x30,
+            ASN1(0x06, [0x55, 0x04, 0x03]),
+            ASN1(0x0c, encodeUTF8(domains[0]))
+        ))),
+        asn1pubkey,
+        ASN1(0xa0, ASN1(0x30,
+            ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x0e]),
+            ASN1(0x31, ASN1(0x30, ASN1(0x30,
+                ASN1(0x06, [0x55, 0x1d, 0x11]),
+                ASN1(0x04, ASN1(0x30,
+                    ...domains.map(d => ASN1(0x82, encodeUTF8(d)))
+                ))
+            )))
+        ))
+    )
+}
+
+var createCSR = async function (domains, private_key) {
+    var privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
+        name: RSASSA_PKCS1_v1_5,
+        hash: "SHA-256",
+    }, true, ["sign"]);
+    var jwk = await subtle.exportKey("jwk", privateKey);
+    var pubkey = packPublicKey(jwk);
+    var request = packCSR(pubkey, domains);
+    var sign = new Uint8Array(await subtle.sign({ name: RSASSA_PKCS1_v1_5, saltLength: 32 }, privateKey, new Uint8Array(request)));
+    var sty = ASN1(0x30,
+        ASN1(0x06, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b]),
+        ASN1(0x05)
+    );
+    return ASN1(0x30, request,
+        sty,
+        packBits(sign)
+    );
+};
+var makeKeyPair = async function (modulusLength = 2048) {
+    //https://www.w3.org/TR/WebCryptoAPI/ 第20章 只有RSASSA-PKCS1-v1_5的jwk的alg才是rs256
+    var k = await subtle.generateKey({
+        name: RSASSA_PKCS1_v1_5,
+        modulusLength,
+        publicExponent: new Uint8Array([1, 0, 1]),
+        hash: "SHA-256",
+    }, true, ["sign", "verify"]);
+    var { publicKey, privateKey } = k;
+    var private_key = await subtle.exportKey("pkcs8", privateKey);
+    var public_key = await subtle.exportKey("spki", publicKey);
+    private_key = toBase64(new Uint8Array(private_key));
+    public_key = toBase64(new Uint8Array(public_key));
+    return [private_key, public_key];
+};
 var subtle = this.crypto?.subtle;
 var acme2 = new class {
     email = '';
@@ -69,19 +168,14 @@ var acme2 = new class {
     get enabled() {
         return !!subtle;
     }
+    async requestURL(url, params) {
+        params = await wrapParams(url, params);
+        var res = data.postURL(url, params);
+        if (res.loading) res.loading.setRequestHeader("Content-Type", "application/jose+json");
+        return res;
+    }
     async initUnique() {
-        //https://www.w3.org/TR/WebCryptoAPI/ 第20章 只有RSASSA-PKCS1-v1_5的jwk的alg才是rs256
-        var k = await subtle.generateKey({
-            name: RSASSA_PKCS1_v1_5,
-            modulusLength: 4096,
-            publicExponent: new Uint8Array([1, 0, 1]),
-            hash: "SHA-256",
-        }, true, ["sign", "verify"]);
-        var { publicKey, privateKey } = k;
-        private_key = await subtle.exportKey("pkcs8", privateKey);
-        public_key = await subtle.exportKey("spki", publicKey);
-        private_key = toBase64(new Uint8Array(private_key));
-        public_key = toBase64(new Uint8Array(public_key));
+        [private_key, public_key] = await makeKeyPair(4096);
         var unique = [private_key, public_key].join(',');
         await acme2.makeUnique(unique);
     }
@@ -145,40 +239,51 @@ var acme2 = new class {
         this.kid = account;
         var a = data.getUrlParamsForApi(accountApi, account);
         this.aid = a.aid;
+        alert('创建成功！', 'success');
         return account;
     }
     async newOrder(params) {
+        if (!this.orders) this.orders = [];
+        if (this.orders.length > 20) return alert("请删除一些订单后再试！", "error");
         var params = {
             "identifiers": params.domain.trim().split(/[,;+，；\r\n\u2029\u2028\s]+/).map(n => {
-                if (/^\d+(\.\d+){3}$|^\[[\da-f\:]+\]$|^[\da-f\:]+$/i.test(n)) return { type: "ipv4", value: n };
+                if (/^\d+(\.\d+){3}$/.test(n)) return { type: "ipv4", value: n };
                 return { type: "dns", value: n };
             })
         };
         var order = await request("new-order", params);
         this.domain = params.domain;
-        if (!this.orders) this.orders = [];
-        if (this.orders.indexOf(order) < 0) this.orders.unshift(order);
+        var i = this.orders.indexOf(order);
+        if (i >= 0) this.orders.splice(i, 1);
+        this.orders = [order].concat(this.orders);
         return order;
     }
     parseOrder(o) {
         if (typeof o !== 'string') return o;
         var order = data.getUrlParamsForApi(orderApi, o);
+        order.url = o;
         order.name = order.oid;
         return order;
     }
     async getOrder(o) {
-        var r = await data.from(orderApi, o);
+        var r = await data.fromURL(o.url);
         if (r.expires) r.expires = new Date(r.expires);
         return r;
     }
     async thumbprint() {
         var jwk = await subtle.exportKey('jwk', publicKey);
         jwk = `{"e":"${jwk.e}","kty":"${jwk.kty}","n":"${jwk.n}"}`;
-        console.log(JSON.parse(jwk))
         var thumb = await subtle.digest("SHA-256", new Uint8Array(encodeUTF8(jwk)));
         thumb = toBase64(new Uint8Array(thumb), true);
         return thumb;
     }
+    async createKeyPair() {
+        return makeKeyPair(2048);
+    }
+    async createCSR(domains, private_key) {
+        var csr = await createCSR(domains, private_key);
+        return toBase64(csr, true);
+    }
     async audit(url) {
         return data.fromURL(url);
     }

package/coms/pivot/pedit.js

@@ -2,21 +2,29 @@ function send(type, key, value, origin) {
     return data.from(origin ? "edit" : "add", {
         type,
         key: encode62.timeencode(key),
-        value: encode62.timeencode(JSON.stringify(value)),
-    }).loading_promise;
+        value: isHandled(value) ? encode62.timeencode(JSON.stringify(value)) : '',
+    }, e => e ? JSAM.parse(encode62.timedecode(e)) : '').loading_promise;
 }
 function pedit(title, type, params, idkey = params.fields[0].key) {
+    var pdata = params.data;
     return frame$edit(title, {
         submit(a, fields) {
             a = submit(fields, a);
-            return send(type, a[idkey], a, params.data);
+            return send(type, a[idkey], a, pdata);
         },
-
     }, params);
 }
 pedit.create = function (type, key, value) {
     return send(type, key, value, false);
 }
-pedit.update = function (type, key, value) {
+var query = pedit.query = function (type, key) {
+    return send(type, key, null, true);
+}
+var update = pedit.update = function (type, key, value) {
     return send(type, key, value, true);
+}
+pedit.merge = async function (type, key, params) {
+    var data = await query(type, key);
+    extendIfNeeded(params, data);
+    return update(type, key, params);
 }

package/coms/pivot/plist.js

@@ -1,5 +1,10 @@
-
-function main() {
+function load(type) {
+    return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
+}
+function remove(type, key) {
+    return data.from("edit", { type, key: encode62.timeencode(key), value: encode62.timeencode("") }).loading_promise;
+}
+function plist() {
     var title, type, fields, edit_ref, options, idkey, buttons;
     var parse = function (a) {
         switch (typeof a) {
@@ -33,10 +38,10 @@ function main() {
     if (!idkey) idkey = fields[0].key;
     return frame$list(title, {
         load() {
-            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
+            return load(type);
         },
         remove(o) {
-            return data.from("edit", { type, key: encode62.timeencode(o[idkey]), value: encode62.timeencode("") }).loading_promise;
+            return remove(type, o[idkey]);
         },
         fields,
         buttons,
@@ -48,4 +53,6 @@ function main() {
         move.setPosition(p, [.5, .5]);
         return p;
     });
-}
+}
+plist.load = load;
+plist.remove = remove;

package/coms/zimoli/button.less

@@ -240,6 +240,7 @@ a&,
             opacity: 0;
             box-shadow: none;
             background: none;
+            display: none;
         }
     }
 

package/coms/zimoli/container.js

@@ -15,14 +15,21 @@ var change = lazy(async function (src) {
         }
         zimoli.global(src, this);
     }
-    else if (isString(src) || +src < 0) zimoli.go(src, this.params, this);
+    else if (isString(src) || +src < 0) {
+        watch(this, 'params', onparams);
+        onparams.call(this, this.params);
+    }
 });
 var gosrc = function (src) {
+    if (!isHandled(this.$src) && !isHandled(src)) return;
     if (src !== this.$src) {
         this.$src = src;
         change.call(this, src);
     }
 };
+var onparams = lazy(function (params) {
+    zimoli.go(this.$src, params, this);
+});
 function container(element) {
     var comment = document.createComment('container');
     comment.$struct = element.$struct;

package/coms/zimoli/data.js

@@ -176,15 +176,15 @@ function getParamsFromUrl(url, s = "?") {
 function getUrlParamsForApi(api, url) {
     var r = /([\s\S]*?)/.source;
     var cap = [];
-    var base = api.url.replace(/[\?\#][\s\S]*$/, '')
+    var reg = api.url.replace(/[\?\#][\s\S]*$/, '')
         .replace(/[\.\*\+\-\[\]\{\}\(\)\\\/\!<\>\^]/g, '\\$&')
         .replace(/\:\w+/g, function (a) {
             cap.push(a.slice(1));
             return r;
         });
-    if (/\/$/.test(base)) base += "?";
+    if (/\/$/.test(reg)) reg += "?";
     var params = {};
-    url = url.replace(/[\?#]*$/g, function (match) {
+    url = url.replace(/[\?#][\s\S]*$/g, function (match) {
         match.split(/[&#\?]+/).forEach(function (s) {
             if (!s) return;
             var [k, v] = s.split("=");
@@ -192,8 +192,9 @@ function getUrlParamsForApi(api, url) {
         });
         return '';
     });
-    if (api.base) url = url.slice(api.base.length);
-    url.replace(new RegExp(`^${base}$`, 'ig'), function () {
+    if (api.base === url.slice(0, api.base.length)) url = url.slice(api.base.length), reg = new RegExp(`^${reg}$`);
+    else reg = new RegExp(reg + '$');
+    url.replace(reg, function () {
         var args = arguments;
         cap.forEach(function (a, cx) {
             params[a] = args[cx + 1];
@@ -302,7 +303,7 @@ function parseConfig(api) {
     });
     url.replace(/[\#][\s\S]*$/, '').replace(/([\:\\]\:|\:\w+)/g, function (p) {
         p = p.slice(1);
-        if (!required[p] && p !== ':') {
+        if (p !== ':' && required.indexOf(p) < 0) {
             required.push(p);
         }
     });
@@ -534,7 +535,7 @@ var privates = {
             params = this.repare(api, params);
             return this.loadIgnoreConfig(api.method, url, params, api);
         }
-        return Promise.resolve();
+        return Promise.reject(ABORTED);
     },
     repare(api, params) {
         var { required, autotrim, prepared } = api;
@@ -601,7 +602,7 @@ var privates = {
         var temp = JSON.stringify(params);
         var currentTime = +new Date;
         var loading = promise && promise.loading;
-        if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
+        if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search || promise.uri !== uri) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
                     headers = seekFromSource(headers, api.base);
@@ -617,6 +618,7 @@ var privates = {
                     }
                 });
             });
+            promise.uri = uri;
             promise.loading = loading;
             promise.search = search;
             promise.params = temp;
@@ -625,7 +627,11 @@ var privates = {
         }
         var p = promise.then(function (response) {
             if (/\*$/.test(coinmethod)) return response;
-            var data = parseData(response);
+            var type = loading.getResponseHeader?.("content-type");
+            var data = response;
+            if (/text\/plain|json|[xyt]ml/i.test(type)) {
+                data = parseData(data);
+            }
             var checked = error_check(data);
             var apiMap = api && api.root;
             var trans = api ? api.transpile : getTranspile(url);
@@ -678,6 +684,7 @@ var loadInstance = function (storage, id) {
 };
 
 function responseCrash(e, data) {
+    if (e === ABORTED || e === OUTDATE) return;
     data.is_errored = true;
     data.is_loading = false;
     data.error_message = getErrorMessage(e);
@@ -734,8 +741,9 @@ var unbindInstance = function (instanceId, callback) {
 };
 var OUTDATE = new Error(i18n`请求被覆盖`);
 var ABORTED = new Error(i18n`请求已取消`);
-var wrapRequest = function (p, req) {
-
+var oncatch = function (e) {
+    if (e === OUTDATE || e === ABORTED) return;
+    throw e;
 };
 var data = {
     prepareURL,
@@ -853,86 +861,57 @@ var data = {
         });
     },
     fromApi(api, params, parse) {
-        var id = parse instanceof Function ? getInstanceId() : 0;
         var p = privates.fromApi(api, params);
-        if (id) this.removeInstance(id);
-        var url = api.url;
-        var response = this.getInstance(id || url);
-        if (!isObject(response)) response = new LoadingArray;
-        this.responseLoading(response);
-        response.loading = p.loading;
-        p = response.loading_promise = p.then((data) => {
-            response.loading = null;
-            if (id) {
-                data = parse(data);
-                this.setInstance(id, data, false);
-                this.removeInstance(id);
-            } else {
-                this.setInstance(url, data);
-            }
-            this.responseLoaded(response);
-            return data;
-        });
-        p.catch((e) => {
-            this.responseCrash(e, response);
-        });
-        return response;
-
+        p.id = api.id;
+        return this.createResponse(p, parse);
+    },
+    postURL(url, data, parse) {
+        var p = privates.loadIgnoreConfig("post", url, data);
+        p.id = "post " + url;
+        return this.createResponse(p, parse);
     },
     fromURL(url, parse) {
-        var id = parse instanceof Function ? getInstanceId() : 0;
         var p = privates.loadIgnoreConfig('get', url);
+        p.id = "get " + url;
+        return this.createResponse(p, parse);
+    },
+    createResponse(p, parse) {
+        var id = parse instanceof Function ? getInstanceId() : 0;
         if (id) this.removeInstance(id);
-        var response = this.getInstance(id || url);
+        var pid = p.id;
+        var response = this.getInstance(id || pid);
         if (!isObject(response)) response = new LoadingArray;
         this.responseLoading(response);
         response.loading = p.loading;
-        p = response.loading_promise = p.then((data) => {
+        response.loading_promise = p;
+        p = p.then((data) => {
             response.loading = null;
             if (id) {
                 data = parse(data);
                 this.setInstance(id, data, false);
                 this.removeInstance(id);
             } else {
-                this.setInstance(url, data);
+                this.setInstance(pid, data);
             }
             this.responseLoaded(response);
             return data;
-        });
-        p.catch((e) => {
+        }, (e) => {
             this.responseCrash(e, response);
-        });
-
+        })
+        if (parse) response.loading_promise = p;
         return response;
     },
     asyncInstance(sid, params, parse) {
         // 不同参数的请求互不影响
         if (typeof sid !== "string") throw new Error(i18n`serviceId 只能是字符串`);
-        var id = parse instanceof Function || params ? getInstanceId() : 0;
-        if (id) this.removeInstance(id);
-        var response = this.getInstance(id || sid);
-        if (!isObject(response)) response = new LoadingArray;
-        this.responseLoading(response);
-        var p = response.loading_promise = privates.getApi(sid).then((api) => {
+        var p = privates.getApi(sid).then((api) => {
             params = privates.pack(sid, params);
             var p = privates.fromApi(api, params);
-            response.loading = p.loading;
+            p.loading = response.loading = p.loading;
             return p;
-        }).then((data) => {
-            response.loading = null;
-            if (id) {
-                data = parse instanceof Function ? parse(data) : data;
-                this.setInstance(id, data, false);
-                this.removeInstance(id);
-            } else {
-                this.setInstance(sid, data);
-            }
-            this.responseLoaded(response);
-            return data;
-        });
-        p.catch((e) => {
-            this.responseCrash(e, response);
-        });
+        }, oncatch);
+        p.id = sid;
+        var response = this.createResponse(p, parse);
         return response;
     },
 
@@ -957,77 +936,35 @@ var data = {
         });
         var id = "." + sid;
         var instance = this.getInstance(id);
-        if (!isObject(instance)) instance = new LoadingArray;
-
-        var promise1 = instance.loading_promise;
-        if (promise1) {
-            var params = promise1.params;
-            if (shallowEqual(params1, params)) {
-                return instance;
-            }
-        }
-        this.responseLoading(instance);
-        promise1 = instance.loading_promise = new Promise(function (ok) {
-            if (!instance.loading) {
-                instance.loading = false;
-            }
-            setTimeout(ok, timeout);
+        var loading_promise = instance && instance.loading_promise;
+        var p = Promise.resolve().then(function () {
+            if (loading_promise) return wait(timeout);
+            return wait(60);
         }).then(function () {
-            if (promise1 !== instance.loading_promise) throw OUTDATE;
+            if (p !== instance.loading_promise) throw OUTDATE;
             return privates.getApi(sid);
         }).then((api) => {
-            if (promise1 !== instance.loading_promise) throw OUTDATE;
+            if (p !== instance.loading_promise) throw OUTDATE;
+            if ("params" in instance && shallowEqual(instance.params, params1)) throw ABORTED;
+            instance.params = params1;
             if (instance.loading) {
                 instance.loading.abort();
             }
-            var params2 = privates.pack(sid, params1);
-            if (!privates.validApi(api, params2)) throw ABORTED;
-            let url = api.url;
-            var base = api.base;
-            if (base) url = base + api.path;
-            var { method, uri, params, selector } = privates.prepare(api.method, url, params2);
-            var promise = new Promise(function (ok, oh) {
-                var headers = api.headers;
-                if (headers) {
-                    headers = seekFromSource(headers, api.base);
-                }
-                instance.loading = cross(method, uri, headers).send(params).done(xhr => {
-                    if (instance.loading !== xhr) return oh(ABORTED);
-                    instance.loading = null;
-                    ok(xhr.responseText || xhr.response);
-                }).error(xhr => {
-                    if (instance.loading !== xhr) return oh(ABORTED);
-                    instance.loading = null;
-                    try {
-                        var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, error: e, api, params: params2, toString: getErrorMessage })
-                    } catch (error) {
-                        oh(error);
-                    }
-                });
-            }).then(function (response) {
-                return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
-            });
-            return promise;
+            var r = privates.fromApi(api, params1);
+            instance.loading = r.loading;
+            return r;
         }).then((data) => {
-            if (instance.loading_promise !== promise1) throw ABORTED;
-            if (id) {
-                data = parse instanceof Function ? parse(data) : data;
-                this.setInstance(id, data, false);
-            } else {
-                this.setInstance(sid, data);
-            }
-            this.responseLoaded(instance);
+            if (instance.loading_promise !== p) throw ABORTED;
+            if (isFunction(parse)) data = parse(data);
             return data;
-        }).catch(function (e) {
-            if (e === OUTDATE || e === ABORTED) return;
-            throw e;
+        }, oncatch);
+        p.id = id;
+        var instance = this.createResponse(p);
+        p.catch(function () { }).then(() => {
+            return wait(timeout);
+        }).then(() => {
+            if (instance.loading_promise === p) delete instance.loading_promise;
         });
-        promise1.params = params;
-        promise1.catch((e) => {
-            this.responseCrash(e, instance);
-        });
-
         return instance;
     },
     /**

package/coms/zimoli/list.js

@@ -463,9 +463,9 @@ function ylist(container, generator, $Y) {
      * @param {Element|null} focused 
      * @param {boolean} animate
      */
-    list.setFocus = function (focused, animate) {
+    list.setFocus = function (focused, animate = true) {
         if (isElement(focused) && (focused.hasAttribute("disabled") || focused.hasAttribute("line"))) return;
-        if (isFinite(focused)) {
+        if (focused === (focused | 0)) {
             var index = focused;
             focused = list.getIndexedElement(index);
             if (!focused) {