efront 4.23.4 → 4.23.6

package/apps/pivot/link/index.html

@@ -1,2 +1,7 @@
+<style>
+    menu{
+        margin: 10px 0;
+    }
+</style>
 <menu @active="saveIndex(i)" -src="(m,i) in menus" #navbar></menu>
 <container -src="navbar.selected?.path"></container>

package/apps/pivot/link/list.html

@@ -1,9 +1,30 @@
+<style>
+    [head] {
+        margin-bottom: 10px;
+        >span,
+        >btn,
+        >swap {
+            vertical-align: top;
+            margin: 0 10px;
+        }
+
+        btn {
+            float: right;
+        }
+    }
+
+</style>
+<div head>
+    <span>
+        自动刷新
+    </span>
+    <swap -model="autoreload"></swap>
+    <btn @click="chat()">新建连接</btn>
+</div>
 <div class="clusters">
     <a -repeat="(c,i) in clusters" ng-class="{current:i===index.index}" @click="active(i,c)">
         <span -text="c"></span>
     </a>
-    自动刷新<swap -model="autoreload"></swap>
-    <btn @click="chat()">新建连接</btn>
 </div>
 <lattice -src="c in clients">
     <padding>

package/coms/basic/spaces.js

@@ -20,7 +20,13 @@ var unicode = [
     "\\ud834[\\udd73-\\udd7a]"//    "\\u{1d173}-\\u{1d17a}"
 ];
 
-spaceDefined.avoid = function (extra_tokens) {
+var toHex = a => {
+    a = a.charCodeAt(0).toString(16);
+    a = Array(5 - a.length).join('0') + a;
+    return "\\u" + a;
+};
+spaceDefined.avoid = function (extra_tokens, encodeAvoid) {
+    if (extra_tokens && encodeAvoid !== false) extra_tokens = extra_tokens.replace(/[^\w]/ig, toHex);
     var u0 = "[^\\ud80c][\\udc00-\\udfff]|\\ud80c[^\\udffc]";
     var u1 = "[^\\ud834][\\udc00-\\udfff]|\\ud834[^\\udd73-\\udd7a]";
     return `[^${extra_tokens || ''}${spaceDefined.join('')}]|${u0}|${u1}`;

package/coms/compile/Program.js

@@ -241,7 +241,10 @@ class Program {
             else if (!last || last.type === STAMP && (!(last.text in powermap)) && !last.istype) {
                 if (powermap[o.text] > powermap["="]) o.unary = true;
             }
-            else if (last.type === STRAP && !last.isend || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
+            else if (last.type === STRAP && !last.isend
+                || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text)
+                || last.type === SCOPED && !last.isExpress
+            ) {
                 o.unary = /^[^=;,\:]$/.test(o.text);
                 if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
             }
@@ -548,7 +551,6 @@ class Program {
             m = match?.[0];
         }
         loop: while (index < text.length) {
-
             if (queue.type & (QUOTED | ELEMENT)) {
                 var quote = quote_map[queue.entry];
                 var reg = quote.reg;
@@ -1050,7 +1052,7 @@ class Program {
         scopes = this.compile(scopes);
         tokens = Object.keys(tokens).join("");
         tokens = this.compile(tokens);
-        var express = `(?:\\\\u\\{[^\\}]+\\}|${spaceDefined.avoid(tokens)})+`;
+        var express = `(?:\\\\u\\{[^\\}]+\\}|${spaceDefined.avoid(tokens, false)})+`;
         this.express_reg = new RegExp(`^${express}$`);
         this.space_reg = spaceDefined.is_reg;
         this.space_exp = spaceDefined.reg;
@@ -1066,7 +1068,9 @@ class Program {
         this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
         this.entry_reg = new RegExp([`${spaceDefined.reg.source}|${quotes_entries}|[${scopes}]|${numbers}(?:${spaceDefined.avoid(tokens)})*|${express}|${powers_entries}|[${stamps}]`], "gi");
         var stamps = this.stamps.slice();
-        for (var k in this.powermap) if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
+        for (var k in this.powermap) {
+            if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
+        }
         stamps.push.apply(stamps, powers);
         this.stamp_reg = new RegExp(`^(${stamps.map(this.compile).join('|')})$`);
         quoteslike.forEach(q => {

package/coms/compile/common.js

@@ -1835,6 +1835,19 @@ var patchArrawScope = function (arraw, origin) {
     };
 };
 
+var isDeclareOnly = function (o) {
+    if (!o.kind) return false;
+    while (o) {
+        var q = o.queue;
+        if (!q.kind) break;
+        o = q;
+    }
+    var n = o.next;
+    if (!n) return true;
+    if (n.type !== STAMP || /^[,;]$/.test(n.text)) return true;
+    return false;
+}
+
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -1854,6 +1867,7 @@ module.exports = {
     needfoot_reg,
     unshort,
     skipAssignment,
+    isDeclareOnly,
     getDeclared,
     getBodyWith,
     getFuncBody,

package/coms/compile/formatcode.js

@@ -6,9 +6,11 @@ var {
     relink,
 } = require("./common");
 var { createExpressList } = require("./washcode")
-function format(code, step) {
+function format(code, step, br) {
+    if (br === undefined) br = "\r\n";
+    else if (isEmpty(br)) br = '';
     if (!code.length) return;
-    var rest = ["\r\n", code];
+    var rest = [br, code];
     while (rest.length > 0) {
         var code = rest.pop();
         var lowspace = rest.pop();
@@ -54,8 +56,8 @@ function format(code, step) {
         relink(code);
     }
 }
-module.exports = function (code, tabSize) {
-    format(code, new Array(tabSize + 1).join(" "));
+module.exports = function (code, tabSize, breakLine) {
+    format(code, new Array(tabSize + 1).join(" "), breakLine);
     code.keepspace = true;
     code.helpcode = true;
     return code;

package/coms/compile/rescan.js

@@ -11,7 +11,7 @@ var patchObject = function (code, objs) {
                 continue;
             }
             if (c.type === EXPRESS) {
-                if (m = /^#\\(\d+)$/.exec(c.text)) {
+                if (m = /^&(\d+)$/.exec(c.text)) {
                     var o = cloneNode(objs[+m[1]], keep);
                     if (o instanceof Array) replace(c, ...o);
                     else replace(c, o);
@@ -25,7 +25,7 @@ function rescan(strs, ...args) {
     var i = 0;
     for (var s of strs) {
         if (s) dist.push(s, ' ');
-        dist.push('#\\' + i++, " ");
+        dist.push('&' + i++, " ");
     }
     dist.pop();
     if (i > args.length) dist.pop();

package/coms/compile//347/264/240/351/246/250.js

@@ -298,7 +298,7 @@ macros.each = function () {
 };
 
 
-var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values|scope|starting-style)(\s|\(|$)/i;
+var presets = /^@(media|keyframes|layer|import|namespace|page|property|supports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values|scope|starting-style)(\s|\(|$)/i;
 class 素心 extends Program {
     straps = ["and", ...presets.source.replace(/^[\s\S]*?\(([\s\S]*?)\)[\s\S]*$/, '$1').split('|').map(a => "@" + a)];
     stamps = `;:,>+~&!/`.split("");

package/coms/zimoli/list.js

@@ -664,7 +664,6 @@ function list() {
     }
     var savedSrc = [];
     if (bindSrc === true) care(container, function (src, old) {
-        if (container.src !== src) return;
         var index = container.index();
         if (src !== old) container.clean(), index = 0;
         else container.clean(src, savedSrc);

package/coms/zimoli/menu.js

@@ -181,10 +181,8 @@ function main() {
                     active(elem, item, null, elem.$src ? createItemTarget.call(elem, item, target) : target);
                 };
                 if ("$src" in elem) {
-                    var src0 = [];
                     care(elem, function (src) {
                         bindGlobalkey(elem, src.keymap);
-                        src0.splice(0, src0.length);
                         var s = getTreeFromData(src, selectedId);
                         if (s.actived) {
                             elem.selected = s.actived;
@@ -193,13 +191,8 @@ function main() {
                             elem.selected = s[0];
                             if (elem.selected) elem.selected.setActive(true);
                         }
-                        var i = 0;
-                        while (i < s.length) {
-                            src0.push.apply(src0, s.slice(i, i += 1000));
-                        }
-                        elem.src = src0;
                     });
-                    menuList(elem, src0, emit, direction);
+                    menuList(elem, null, emit, direction);
                 }
                 else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/menuList.js

@@ -133,7 +133,7 @@ function main() {
         if (!item.length) return;
         var menu = item.menu;
         if (!menu) {
-            var clone =render.clone(template);
+            var clone = render.clone(template);
             clone.$src = src;
             clone.innerHTML = template.innerHTML;
             menu = item.menu = main(clone, item.children, active);
@@ -246,8 +246,8 @@ function main() {
         switchMenu.done = true;
     }, 300);
     var hasIcon = function () {
-        var menus = items;
-        for (var menu of menus) {
+        var menus = page.src;
+        if (menus) for (var menu of menus) {
             if (menu.icon) {
                 return true;
             }

package/coms/zimoli/render.js

@@ -71,7 +71,7 @@ presets.template = function (t) {
 window.elementRenders = elementRenders;
 // -->
 var isLe = function (a, b) {
-    return a.id <= b.id;
+    return a.d <= b.d;
 };
 var renderidOffset = 10;
 var renderidClosed = 0;
@@ -79,7 +79,7 @@ var addRenderElement = function () {
     var element = this;
     var renders = $renders.get(element);
     buildFirst(renders);
-    if (renders.id > 10) {
+    if (renders.d > 10) {
         saveToOrderedArray(elementRenders, renders, isLe);
     }
 };
@@ -93,7 +93,7 @@ var removeRenderElement = function () {
     if (elementRenders[i] === renders) elementRenders.splice(i, 1);
 };
 var buildI = function (renders) {
-    if (getTargetIn(this, renders.el)) rebuild(renders);
+    if (getTargetIn(this, renders.e)) rebuild(renders);
 };
 var buildO = function (renders) {
     rebuild(renders);
@@ -145,7 +145,7 @@ var buildThisA = function (f) {
 };
 function rebuild(renders, isFirstRender) {
     if (isFirstRender) delete renders.$ready;
-    var el = renders.el;
+    var el = renders.e;
     var w = $watches.get(el);
     if (el.$digest) digests.push(el);
     if (!w) {
@@ -229,7 +229,7 @@ var createComment = function (type, expression) {
 };
 
 var initialComment = function (el, renders, struct) {
-    renders.el = el;
+    renders.e = el;
     if (struct.once) renders.r1 = true;
     $renders.set(el, renders);
     renderlock.push(renders);
@@ -977,6 +977,9 @@ function renderEmits(replacer, emits, on) {
 
 function renderRest(renders, element, struct, replacer = element) {
     var { attrs, binds, emits, waits } = struct;
+    if (binds.src) {
+        if (!element.$src) element.$src = parseRepeat(binds.src);
+    }
     renderDynamics(element, replacer, binds, attrs, renders);
     if (!isElement(replacer)) replacer = element;
     renderEmits.call(element, replacer, emits, emiters.on);
@@ -1386,11 +1389,11 @@ function createStructure(element, useExists) {
 function unlock(renders) {
     if (!renders) return;
     if (!isOnce(renders)) {
-        var node = renders.el;
+        var node = renders.e;
         var rid = renderIds.get(node) || 0;
         if (rid < 10) {
             rid = ++renderidOffset;
-            renders.id = rid;
+            renders.d = rid;
             renderIds.set(node, rid);
         }
         on("append")(node, addRenderElement);
@@ -1402,7 +1405,7 @@ function unlock(renders) {
 }
 var notNull = a => a;
 var isOnce = a => a.r1;
-var notComment = a => !isOnce(a) && a.el.nodeType !== 8;
+var notComment = a => !isOnce(a) && a.e.nodeType !== 8;
 function renderUnlock(element) {
     var locked = renderlock.filter(notNull);
     renderlock = null;
@@ -1468,8 +1471,11 @@ $weaks = {
     $parentScopes: $weaks('$parentScopes', $parented, "$parented"),
 };
 // -->
-var digest = lazy(refresh, -{});
-render.digest = render.apply = render.refresh = digest;
+var digest = lazy(refresh);
+render.digest = render.apply = render.refresh = function (a) {
+    if (isNode(a)) refresh(a);
+    else digest();
+};
 render.parseRepeat = parseRepeat;
 "fullscreenchange,resize,load,hashchange".split(",").forEach(e => on(e)(window, digest));
 var eventsBinders = "change,click,paste,cut,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
@@ -1527,7 +1533,7 @@ var initRenders = function (target) {
     var renders = $renders.get(target);
     if (!renders) {
         renders = [];
-        renders.el = target;
+        renders.e = target;
         $renders.set(target, renders);
     }
     return renders;

package/coms/zimoli/scrollbar.js

@@ -164,7 +164,8 @@ var scrollbary = function () {
         var l = target.getLastVisibleElement(0);
         var height = 1;
         if (f && l) {
-            height = 1 + l.index - f.index
+            height = l.index - f.index;
+            if (height === 0) height = 1;
         }
         return [target.src.length, height];
     }

package/coms/zimoli/touchList.js

@@ -101,10 +101,10 @@ var touchend = function () {
     if (!currentTarget) return;
     var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
     moving = false;
-    if (direction < 0 && marginLeft < -7) {
+    if (direction <= 1 && marginLeft < -7) {
         scrollToLeft.call(currentTarget);
     }
-    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + 7) {
+    else if (direction >= 1 && marginLeft > -currentTarget.clientWidth + 7) {
         scrollToRight.call(currentTarget);
     }
     else if (marginLeft < currentTarget.clientWidth - currentTarget.scrollWidth >> 1) {

package/coms/zimoli/user.js

@@ -1,4 +1,5 @@
 var USERINFO = 'userinfo';
+var encode62 = basic$encode62;
 var userInstance = data.getInstance(USERINFO);
 var emptyProto = {
     name: "",

package/coms/zimoli/zimoli.js

@@ -127,7 +127,7 @@ function go(pagepath, args, history_name, oldpagepath) {
     if (!page_generators[pgpath]) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
-    var page = create(pagepath, args, oldpagepath, roles, params);
+    var page = create(pagepath, args, oldpagepath, roles, params, history_name);
     zimoliad = zimoliid;
     var isRecover = pushstate(pagepath, history_name, oldpagepath);
     if (isNode(history_name)) {
@@ -140,7 +140,7 @@ function go(pagepath, args, history_name, oldpagepath) {
         page.disptch();
     }
     if (isRecover) setWithStyle(page, false);
-    addGlobal(page, history_name, isRecover);
+    page.mount(history_name, isRecover);
     return page;
 }
 var page_generators = {};
@@ -416,9 +416,16 @@ function create(pagepath, args, from, needroles, zimolidata) {
             dispatch(document, event);
             fullfill_is_dispatched = 0;
         }
+        var history_name = current_history;
+        var isRecover = false;
+        _page.mount = function (hname, isR) {
+            history_name = hname;
+            isRecover = isR;
+            addGlobal(this, history_name, isRecover);
+        }
         _page.$reload = function () {
             var _page = create(pagepath, undefined, from, undefined, zimolidata);
-            appendChild.replace(this, _page);
+            _page.mount(history_name, isRecover);
             return _page;
         };
     }

package/coms//350/214/250/350/217/260/list.js

@@ -0,0 +1,59 @@
+// 一个简化版的list，不支持回弹，且每行高度一致
+function list(elem) {
+    var g = getGenerator(elem);
+    var src = [];
+    var childrenMap = [];
+    care(elem, function (src1, old) {
+        src = src1;
+        remove(elem.children);
+        if (isMounted(elem)) mount();
+    });
+    var at = function (i) {
+        var s = elem.start;
+        if (i < s) return;
+        var e = elem.end;
+        if (i >= e) return;
+        return elem.children[i - s];
+    }
+    var mount = function () {
+        var fsize = parseFloat(getComputedStyle(elem).lineHeight);
+        var { top, height } = getScreenPosition(elem);
+        var sheight = screen.height;
+        var i = 0;
+        if (top < -sheight) {
+            i = (-top - sheight) / fsize | 0;
+        }
+        elem.start = i;
+        css(elem, { paddingTop: i * 1.36 + 'em' });
+        top += i * fsize;
+        sheight += sheight;
+        var p = null;
+        while (top < sheight) {
+            var e = childrenMap[i];
+            if (!e) e = g(i, src[i]);
+            else delete childrenMap[i];
+            if (!e) break;
+            top += fsize;
+            e.i = i;
+            i++;
+            if (isMounted(e) && (!p || e.previousSibling === p));
+            else if (p) appendChild.after(p, e);
+            else appendChild(elem, e);
+            p = e;
+        }
+        elem.end = i;
+    };
+    var refresh = function () {
+        childrenMap = [];
+        Array.apply(null, elem.children).forEach(a => {
+            childrenMap[a.i] = a;
+        });
+        mount();
+        remove(childrenMap.filter(a => !!a));
+        childrenMap = [];
+    }
+    on("mounted")(elem, refresh);
+    elem.at = at;
+    elem.refresh = refresh;
+    return elem;
+}

package/coms//350/214/250/350/217/260/list.less

@@ -0,0 +1,3 @@
+& {
+    line-height: 1.36;
+}

package/coms//350/214/250/350/217/260/tab.js

@@ -1,59 +1,147 @@
 var ensp = s => Array(s + 1).join(" "/*&ensp*/);
-var getEnspBefore = function (node) {
+var getPrevEnsp = function (rowNode) {
+    var prev = rowNode.previousSibling;
+    var m;
+    if (prev) {
+        m = /^\u0020+/.exec(prev.innerText);
+        if (m) m = m[0].length;
+        else m = 0;
+        var pl = prev.lastChild;
+        if (pl && /^deep/i.test(pl.tagName) && /[\{\[\(]$/.test(pl.innerText)) m += 4;
+    }
+    else m = 0;
+    var rf = rowNode.firstChild;
+    if (rf && /^deep/i.test(rf.tagName) && /[\}\]\)]$/.test(rf.innerText)) {
+        if (m > 4) m -= 4;
+        else m = 0;
+    }
+    return [rowNode, rf, m];
+}
+var getEnspAt = function (node, offset) {
     if (!node) return 0;
-    while (node && (node.nodeType !== 1 || !/^br$/i.test(node.tagName))) {
-        node = node.previousSibling;
+    while (node.nodeType === 1) {
+        var c = node.childNodes[offset];
+        if (!c) {
+            c = node.lastChild
+        }
+        if (!c) return [node, null, 0];
+        node = c;
+        if (node.nodeType === 3) {
+            offset = node.nodeValue.length;
+            break;
+        }
     }
-    if (node) {
-        var next = node.nextSibling;
-        if (next) {
-            next = /^[\u2002\u0020\u00a0]+/.exec(next.nodeValue);
-            if (next) return next[0].length;
+    if (node.nodeType === 3) {
+        var t = node.nodeValue;
+        var s = offset;
+        while (t.charAt(s - 1) === " ") s--;
+        var e = offset;
+        while (t.charAt(e) === " ") e++;
+        var parentNode = node.parentNode;
+        var nextSibling = node.nextSibling;
+        if (e < t.length) {
+            var nextSibling1 = document.createTextNode(t.slice(e));
+            parentNode.insertBefore(nextSibling1, nextSibling);
+            nextSibling = nextSibling1;
+        }
+        if (s < t.length) {
+            if (s === 0) remove(node);
+            else node.nodeValue = t.slice(0, s);
+        }
+        return [parentNode, nextSibling, e - s];
+    }
+    return [node, null, 0];
+};
+var getFocusRows = function (elem, anchorNode, focusNode) {
+    var s = getTargetIn(elem, focusNode, false);
+    var e = getTargetIn(elem, anchorNode, false);
+    if (s.i > e.i) [s, e] = [e, s];
+    var rows = [];
+    if (!s || !e) return rows;
+    do {
+        rows.push(s);
+        s = s.nextSibling;
+    } while (s && s !== e);
+    rows.push(e);
+    return rows;
+};
+var tabRowRight = function (row) {
+    var e = document.createTextNode(ensp(4));
+    row.insertBefore(e, row.firstChild);
+};
+var tabRowLeft = function (row) {
+    var e = row.firstChild;
+    var size = 4;
+    while (e && size > 0) {
+        if (e.nodeType !== 3) break;
+        var nodeValue = e.nodeValue;
+        var m = / {1,4}|\t/.exec(nodeValue);
+        if (m) {
+            if (m === '\t') size -= 4;
+            else size -= m[0].length;
+            nodeValue = nodeValue.slice(m[0].length);
+        }
+        if (!nodeValue.length) {
+            var n = e.nextSibling;
+            remove(e);
+            e = n;
+        }
+        else {
+            size = 0;
         }
     }
 };
-return function (forcetab) {
+var tabSelection = function (elem, anchorNode, focusNode, forcetab) {
+    var rows = getFocusRows(elem, anchorNode, focusNode);
+    if (forcetab > 0) rows.forEach(tabRowRight);
+    else if (forcetab < 0) rows.forEach(tabRowLeft);
+};
+return function (elem, forcetab) {
+    if (!elem) return;
     var selection = document.getSelection();
     var { anchorNode, anchorOffset, focusNode, focusOffset } = selection;
-    if (anchorNode !== focusNode || anchorOffset !== focusOffset) return;
+    if (anchorNode !== focusNode || anchorOffset !== focusOffset) return tabSelection(elem, anchorNode, focusNode, forcetab);
+    var rowNode = getTargetIn(elem, anchorNode, false);
+    var [parentNode, child, spaceSize] = getEnspAt(anchorNode, anchorOffset);
     if (forcetab < 0) {
-        var tempNode = anchorNode;
-        var space = ensp(4);
-        while (tempNode) {
-            if (tempNode.nodeType === 1) {
-                if (/^br$/i.test(tempNode.tagName)) return;
-                tempNode = tempNode.lastChild || tempNode.previousSibling;
-                continue;
-            }
-            if (tempNode.nodeValue.indexOf(space) >= 0) {
-                tempNode.nodeValue = tempNode.nodeValue.replace(space, '');
-                if (tempNode === anchorNode) {
-                    anchorOffset -= 4;
-                    if (anchorOffset < 0) anchorOffset = 0;
-                    selection.setBaseAndExtent(tempNode, anchorOffset, tempNode, anchorOffset);
-                }
-                return;
+        if (spaceSize > 4) {
+            if (spaceSize % 4 > 0) {
+                spaceSize -= spaceSize % 4;
             }
-            if (/[\r\n\u2028\u2029]/.test(tempNode.nodeValue)) return;
-            tempNode = tempNode.previousSibling || tempNode.parentNode?.previousSibling;
+            else spaceSize -= 4;
         }
+        else spaceSize = 0;
+        if (spaceSize > 0) {
+            space = document.createTextNode(ensp(spaceSize));
+            parentNode.insertBefore(space, child);
+            selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
+            return;
+        }
+        tabRowLeft(rowNode);
         return;
     }
-    if (anchorNode.nodeType === 1) {
-        var child = anchorNode.childNodes[anchorOffset];
-        var spaceSize = 4;
-        if (child.nodeType === 1) spaceSize = getEnspBefore(child?.previousSibling?.previousSibling || anchorNode);
-        if (!spaceSize && forcetab !== false) spaceSize = 4;
+    if (forcetab > 0) {
+        if (!spaceSize) {
+            if (!child) {
+                [parentNode, child, spaceSize] = getPrevEnsp(rowNode);
+            }
+        }
+        else if (!anchorOffset && !spaceSize || anchorOffset >= spaceSize) {
+            spaceSize += 4 - spaceSize % 4;
+        }
         if (!spaceSize) return;
+
         var space = document.createTextNode(ensp(spaceSize));
-        anchorNode.insertBefore(space, child);
+        parentNode.insertBefore(space, child);
         selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
+        return;
     }
-    else if (anchorNode.nodeType === 3) {
-        if (forcetab === 0) return;
-        var spaceSize = (4 - anchorOffset % 4);
-        anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(spaceSize) + anchorNode.nodeValue.slice(anchorOffset);
-        anchorOffset += spaceSize;
-        selection.setBaseAndExtent(anchorNode, anchorOffset, anchorNode, anchorOffset);
+    if (forcetab === false) {
+        if (!rowNode.innerText) remove(rowNode.childNodes);
+        [parentNode, child, spaceSize] = getPrevEnsp(rowNode);
+        if (!spaceSize) return;
+        var space = document.createTextNode(ensp(spaceSize));
+        parentNode.insertBefore(space, child);
+        selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
     }
 };