Compare commits

..

6 Commits

Author SHA1 Message Date
Kevin Jahns
240cf64841 v13.0.0-65 -- distribution files 2018-07-16 18:38:27 +02:00
Kevin Jahns
548125a944 13.0.0-65 2018-07-16 18:38:09 +02:00
Kevin Jahns
a7b124ca6e 13.0.0-64 2018-07-16 18:19:36 +02:00
Kevin Jahns
4022374620 dombinding: always set browser range after change 2018-07-16 18:15:24 +02:00
Kevin Jahns
860e4d7af6 13.0.0-63 2018-06-23 00:30:45 +02:00
Kevin Jahns
6376d69b58 fix undo of map update 2018-06-23 00:29:44 +02:00
8 changed files with 44 additions and 36 deletions

2
package-lock.json generated
View File

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

View File

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

@@ -140,7 +140,6 @@ export default class DomBinding extends Binding {
restoreSelection (selection) { restoreSelection (selection) {
if (selection !== null) { if (selection !== null) {
const { to, from } = selection const { to, from } = selection
let shouldUpdate = false
/** /**
* There is little information on the difference between anchor/focus and base/extent. * There is little information on the difference between anchor/focus and base/extent.
* MDN doesn't even mention base/extent anymore.. though you still have to call * MDN doesn't even mention base/extent anymore.. though you still have to call
@@ -159,7 +158,6 @@ export default class DomBinding extends Binding {
if (node !== baseNode || offset !== baseOffset) { if (node !== baseNode || offset !== baseOffset) {
baseNode = node baseNode = node
baseOffset = offset baseOffset = offset
shouldUpdate = true
} }
} }
} }
@@ -171,18 +169,15 @@ export default class DomBinding extends Binding {
if (node !== extentNode || offset !== extentOffset) { if (node !== extentNode || offset !== extentOffset) {
extentNode = node extentNode = node
extentOffset = offset extentOffset = offset
shouldUpdate = true
} }
} }
} }
if (shouldUpdate) { browserSelection.setBaseAndExtent(
browserSelection.setBaseAndExtent( baseNode,
baseNode, baseOffset,
baseOffset, extentNode,
extentNode, extentOffset
extentOffset )
)
}
} }
} }

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._start`. * which to insert to. Otherwise it is `parent._map`.
* @type {String} * @type {String}
*/ */
this._parentSub = null this._parentSub = null
@@ -125,8 +125,17 @@ export default class Item {
return this._redone return this._redone
} }
let struct = this._copy() let struct = this._copy()
let left = this._left let left, right
let right = this if (this._parentSub === null) {
// 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-62 * @version v13.0.0-65
* @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._start`. * which to insert to. Otherwise it is `parent._map`.
* @type {String} * @type {String}
*/ */
this._parentSub = null; this._parentSub = null;
@@ -1682,8 +1682,17 @@ class Item {
return this._redone return this._redone
} }
let struct = this._copy(); let struct = this._copy();
let left = this._left; let left, right;
let right = this; if (this._parentSub === null) {
// 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) {
@@ -5636,7 +5645,6 @@ class DomBinding extends Binding {
restoreSelection (selection) { restoreSelection (selection) {
if (selection !== null) { if (selection !== null) {
const { to, from } = selection; const { to, from } = selection;
let shouldUpdate = false;
/** /**
* There is little information on the difference between anchor/focus and base/extent. * There is little information on the difference between anchor/focus and base/extent.
* MDN doesn't even mention base/extent anymore.. though you still have to call * MDN doesn't even mention base/extent anymore.. though you still have to call
@@ -5655,7 +5663,6 @@ class DomBinding extends Binding {
if (node !== baseNode || offset !== baseOffset) { if (node !== baseNode || offset !== baseOffset) {
baseNode = node; baseNode = node;
baseOffset = offset; baseOffset = offset;
shouldUpdate = true;
} }
} }
} }
@@ -5667,18 +5674,15 @@ class DomBinding extends Binding {
if (node !== extentNode || offset !== extentOffset) { if (node !== extentNode || offset !== extentOffset) {
extentNode = node; extentNode = node;
extentOffset = offset; extentOffset = offset;
shouldUpdate = true;
} }
} }
} }
if (shouldUpdate) { browserSelection.setBaseAndExtent(
browserSelection.setBaseAndExtent( baseNode,
baseNode, baseOffset,
baseOffset, extentNode,
extentNode, extentOffset
extentOffset );
);
}
} }
} }

File diff suppressed because one or more lines are too long