diff --git a/examples/bower.json b/examples/bower.json index d4114831..e1f399be 100644 --- a/examples/bower.json +++ b/examples/bower.json @@ -9,16 +9,6 @@ "license": "MIT", "ignore": [], "dependencies": { - "yjs": "latest", - "y-array": "latest", - "y-map": "latest", - "y-memory": "latest", - "y-richtext": "latest", - "y-webrtc": "latest", - "y-websockets-client": "latest", - "y-text": "latest", - "y-indexeddb": "latest", - "y-xml": "latest", "quill": "^1.0.0-rc.2", "ace": "~1.2.3", "ace-builds": "~1.2.3", diff --git a/examples/drawing/index.html b/examples/drawing/index.html index 75e4ed53..65bb20b5 100644 --- a/examples/drawing/index.html +++ b/examples/drawing/index.html @@ -12,7 +12,11 @@ - + + + + + diff --git a/examples/drawing/index.js b/examples/drawing/index.js index 7d954967..980a7c73 100644 --- a/examples/drawing/index.js +++ b/examples/drawing/index.js @@ -7,8 +7,8 @@ Y({ }, connector: { name: 'websockets-client', - room: 'drawing-example' - // url: 'localhost:1234' + room: 'drawing-example', + url: 'localhost:1234' }, sourceDir: '/bower_components', share: { diff --git a/examples/jigsaw/index.html b/examples/jigsaw/index.html index ee2cf0de..61fc6da0 100644 --- a/examples/jigsaw/index.html +++ b/examples/jigsaw/index.html @@ -19,7 +19,8 @@ - + + diff --git a/examples/jigsaw/index.js b/examples/jigsaw/index.js index 8fb92aeb..9865267f 100644 --- a/examples/jigsaw/index.js +++ b/examples/jigsaw/index.js @@ -8,7 +8,8 @@ Y({ }, connector: { name: 'websockets-client', - room: 'Puzzle-example' + room: 'Puzzle-example', + url: 'http://localhost:1234' }, share: { piece1: 'Map', diff --git a/src/Transaction.js b/src/Transaction.js index 6e9dd66c..a708619f 100644 --- a/src/Transaction.js +++ b/src/Transaction.js @@ -1097,7 +1097,7 @@ export default function extendTransaction (Y) { yield * this.os.put(op) } yield * this.os.iterate(this, null, null, function * (op) { - if (op.parent != null && op.parent[0] === 0xFFFFFF) { + if (op.parent != null) { if (op.struct === 'Insert') { // update parents .map/start/end properties if (op.parentSub != null && op.left == null) {