yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

less duplicate code

Browse Source
This commit is contained in:
Kevin Jahns
2018-03-23 05:22:45 +01:00
parent ba97bfdd9e
commit 61149b458a
3 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Util/Tree.js
View File

@@ -1,4 +1,17 @@
function rotate (tree, parent, newParent, n) {
if (parent === null) {
tree.root = newParent
newParent._parent = null
} else if (parent.left === n) {
parent.left = newParent
} else if (parent.right === n) {
parent.right = newParent
} else {
throw new Error('The elements are wrongly connected!')
}
}
class N {
// A created node is always red!
constructor (val) {
@@ -41,21 +54,12 @@ class N {
this._right = n
}
rotateLeft (tree) {
var parent = this.parent
var newParent = this.right
var newRight = this.right.left
const parent = this.parent
const newParent = this.right
const newRight = this.right.left
newParent.left = this
this.right = newRight
if (parent === null) {
tree.root = newParent
newParent._parent = null
} else if (parent.left === this) {
parent.left = newParent
} else if (parent.right === this) {
parent.right = newParent
} else {
throw new Error('The elements are wrongly connected!')
}
rotate(tree, parent, newParent, this)
}
next () {
if (this.right !== null) {
@@ -90,21 +94,12 @@ class N {
}
}
rotateRight (tree) {
var parent = this.parent
var newParent = this.left
var newLeft = this.left.right
const parent = this.parent
const newParent = this.left
const newLeft = this.left.right
newParent.right = this
this.left = newLeft
if (parent === null) {
tree.root = newParent
newParent._parent = null
} else if (parent.left === this) {
parent.left = newParent
} else if (parent.right === this) {
parent.right = newParent
} else {
throw new Error('The elements are wrongly connected!')
}
rotate(tree, parent, newParent, this)
}
getUncle () {
// we can assume that grandparent exists when this is called!

20
src/Util/YEvent.js
View File

@@ -31,24 +31,6 @@ export default class YEvent {
* type === event.target // => true
*/
get path () {
const path = []
let type = this.target
const y = type._y
while (type !== this.currentTarget && type !== y) {
let parent = type._parent
if (type._parentSub !== null) {
path.unshift(type._parentSub)
} else {
// parent is array-ish
for (let [i, child] of parent) {
if (child === type) {
path.unshift(i)
break
}
}
}
type = parent
}
return path
return this.currentTarget.getPathTo(this.target)
}
}