Compare commits

..

1 Commits

Author SHA1 Message Date
Kevin Jahns
00135dcfab v13.0.0-62 -- distribution files 2018-06-13 00:08:16 +02:00
7 changed files with 14 additions and 32 deletions

2
package-lock.json generated
View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "13.0.0-63", "version": "13.0.0-62",
"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

@@ -87,7 +87,7 @@ export default class Item {
* If the parent refers to this item with some kind of key (e.g. YMap, the * If the parent refers to this item with some kind of key (e.g. YMap, the
* key is specified here. The key is then used to refer to the list in which * key is specified here. The key is then used to refer to the list in which
* to insert this item. If `parentSub = null` type._start is the list in * to insert this item. If `parentSub = null` type._start is the list in
* which to insert to. Otherwise it is `parent._map`. * which to insert to. Otherwise it is `parent._start`.
* @type {String} * @type {String}
*/ */
this._parentSub = null this._parentSub = null
@@ -125,17 +125,8 @@ export default class Item {
return this._redone return this._redone
} }
let struct = this._copy() let struct = this._copy()
let left, right let left = this._left
if (this._parentSub === null) { let right = this
// Is an array item. Insert at the old position
left = this._left
right = this
} else {
// Is a map item. Insert at the start
left = null
right = this._parent._map.get(this._parentSub)
right._delete(y)
}
let parent = this._parent let parent = this._parent
// make sure that parent is redone // make sure that parent is redone
if (parent._deleted === true && parent._redone === null) { if (parent._deleted === true && parent._redone === null) {

6
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-63 * @version v13.0.0-62
* @license MIT * @license MIT
*/ */
@@ -1644,7 +1644,7 @@ class Item {
* If the parent refers to this item with some kind of key (e.g. YMap, the * If the parent refers to this item with some kind of key (e.g. YMap, the
* key is specified here. The key is then used to refer to the list in which * key is specified here. The key is then used to refer to the list in which
* to insert this item. If `parentSub = null` type._start is the list in * to insert this item. If `parentSub = null` type._start is the list in
* which to insert to. Otherwise it is `parent._map`. * which to insert to. Otherwise it is `parent._start`.
* @type {String} * @type {String}
*/ */
this._parentSub = null; this._parentSub = null;
@@ -1682,17 +1682,8 @@ class Item {
return this._redone return this._redone
} }
let struct = this._copy(); let struct = this._copy();
let left, right; let left = this._left;
if (this._parentSub === null) { let right = this;
// Is an array item. Insert at the old position
left = this._left;
right = this;
} else {
// Is a map item. Insert at the start
left = null;
right = this._parent._map.get(this._parentSub);
right._delete(y);
}
let parent = this._parent; let parent = this._parent;
// make sure that parent is redone // make sure that parent is redone
if (parent._deleted === true && parent._redone === null) { if (parent._deleted === true && parent._redone === null) {

File diff suppressed because one or more lines are too long