Compare commits

..

5 Commits

Author SHA1 Message Date
Kevin Jahns
9eb1e459f0 v13.0.0-38 -- distribution files 2017-12-05 00:53:36 -08:00
Kevin Jahns
4091b7d004 13.0.0-38 2017-12-05 00:53:25 -08:00
Kevin Jahns
dfc183643d support data-yjs-hook attribute for yjs hooks 2017-12-05 00:52:52 -08:00
Kevin Jahns
cf8698f2b6 13.0.0-37 2017-12-02 01:45:55 -08:00
Kevin Jahns
3595f14da7 fix insert in y-text 2017-12-02 01:45:22 -08:00
8 changed files with 23 additions and 17 deletions

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "13.0.0-32", "version": "13.0.0-38",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "13.0.0-36", "version": "13.0.0-38",
"description": "A framework for real-time p2p shared editing on any data", "description": "A framework for real-time p2p shared editing on any data",
"main": "./y.node.js", "main": "./y.node.js",
"browser": "./y.js", "browser": "./y.js",

View File

@@ -29,14 +29,17 @@ export default class YText extends YArray {
let right = this._start let right = this._start
let count = 0 let count = 0
while (right !== null) { while (right !== null) {
if (count <= pos && pos < count + right._length) { const rightLen = right._deleted ? 0 : (right._length - 1)
if (count <= pos && pos <= count + rightLen) {
const splitDiff = pos - count const splitDiff = pos - count
right = right._splitAt(this._y, pos - count) right = right._splitAt(this._y, splitDiff)
left = right._left left = right._left
count += splitDiff count += splitDiff
break break
} }
count += right._length if (!right._deleted) {
count += right._length
}
left = right left = right
right = right._right right = right._right
} }

View File

@@ -17,7 +17,7 @@ function domToYXml (parent, doms, _document) {
} }
if (parent._domFilter(d.nodeName, new Map()) !== null) { if (parent._domFilter(d.nodeName, new Map()) !== null) {
let type let type
const hookName = d._yjsHook const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined)
if (hookName !== undefined) { if (hookName !== undefined) {
type = new YXmlHook(hookName, d) type = new YXmlHook(hookName, d)
} else if (d.nodeType === d.TEXT_NODE) { } else if (d.nodeType === d.TEXT_NODE) {

8
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,7 @@
/** /**
* yjs - A framework for real-time p2p shared editing on any data * yjs - A framework for real-time p2p shared editing on any data
* @version v13.0.0-36 * @version v13.0.0-38
* @license MIT * @license MIT
*/ */
@@ -2556,14 +2556,17 @@ class YText extends YArray {
let right = this._start; let right = this._start;
let count = 0; let count = 0;
while (right !== null) { while (right !== null) {
if (count <= pos && pos < count + right._length) { const rightLen = right._deleted ? 0 : (right._length - 1);
if (count <= pos && pos <= count + rightLen) {
const splitDiff = pos - count; const splitDiff = pos - count;
right = right._splitAt(this._y, pos - count); right = right._splitAt(this._y, splitDiff);
left = right._left; left = right._left;
count += splitDiff; count += splitDiff;
break break
} }
count += right._length; if (!right._deleted) {
count += right._length;
}
left = right; left = right;
right = right._right; right = right._right;
} }
@@ -3714,7 +3717,7 @@ function domToYXml (parent, doms, _document) {
} }
if (parent._domFilter(d.nodeName, new Map()) !== null) { if (parent._domFilter(d.nodeName, new Map()) !== null) {
let type; let type;
const hookName = d._yjsHook; const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined);
if (hookName !== undefined) { if (hookName !== undefined) {
type = new YXmlHook(hookName, d); type = new YXmlHook(hookName, d);
} else if (d.nodeType === d.TEXT_NODE) { } else if (d.nodeType === d.TEXT_NODE) {

File diff suppressed because one or more lines are too long