Merge branch 'master' into v13

This commit is contained in:
Kevin Jahns 2017-06-19 10:48:16 +02:00
commit dfe3b0b1d1
3 changed files with 23 additions and 6 deletions

2
dist

@ -1 +1 @@
Subproject commit 3eafd78710a30cd01bf4c6b3553c141e7ac604a5
Subproject commit 42aa7ec5c9c0b4f2734b5b01eae7f0df63bfd9ff

View File

@ -1,6 +1,6 @@
{
"name": "yjs",
"version": "12.3.0",
"version": "12.3.1",
"description": "A framework for real-time p2p shared editing on any data",
"main": "./src/y.js",
"scripts": {

View File

@ -29,9 +29,13 @@ export default function Utils (Y) {
event.path = []
while (type != null && type._deepEventHandler != null) {
type._deepEventHandler.callEventListeners(event)
if (type._parent != null && type._parentSub != null) {
event.path = [type._parentSub].concat(event.path)
type = type.os.getType(type._parent)
var parent = null
if (type._parent != null) {
parent = type.os.getType(type._parent)
}
if (parent != null && parent._getPathToChild != null) {
event.path = [parent._getPathToChild(type._model)].concat(event.path)
type = parent
} else {
type = null
}
@ -476,7 +480,20 @@ export default function Utils (Y) {
Default class of custom types!
*/
class CustomType {
getPath () {
var parent = null
if (this._parent != null) {
parent = this.os.getType(this._parent)
}
if (parent != null && parent._getPathToChild != null) {
var firstKey = parent._getPathToChild(this._model)
var parentKeys = parent.getPath()
parentKeys.push(firstKey)
return parentKeys
} else {
return []
}
}
}
Y.utils.CustomType = CustomType