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

fix preferUntransformed sync

Browse Source
This commit is contained in:
Kevin Jahns 2017-07-31 14:41:40 +02:00
parent 5384bf4faf
commit 4dce0816a6
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/bower.json
View File

@ -9,16 +9,6 @@
"license": "MIT", "license": "MIT",
"ignore": [], "ignore": [],
"dependencies": { "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", "quill": "^1.0.0-rc.2",
"ace": "~1.2.3", "ace": "~1.2.3",
"ace-builds": "~1.2.3", "ace-builds": "~1.2.3",

6
examples/drawing/index.html
View File

@ -12,7 +12,11 @@
</style> </style>
<button type="button" id="clearDrawingCanvas">Clear Drawing</button> <button type="button" id="clearDrawingCanvas">Clear Drawing</button>
<svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></svg> <svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></svg>
<script src="../bower_components/yjs/y.js"></script> <script src="../../y.js"></script>
<script src="../../../y-array/y-array.js"></script>
<script src="../../../y-map/dist/y-map.js"></script>
<script src="../../../y-memory/y-memory.js"></script>
<script src="../../../y-websockets-client/y-websockets-client.js"></script>
<script src="../bower_components/d3/d3.js"></script> <script src="../bower_components/d3/d3.js"></script>
<script src="./index.js"></script> <script src="./index.js"></script>
</body> </body>

4
examples/drawing/index.js
View File

@ -7,8 +7,8 @@ Y({
}, },
connector: { connector: {
name: 'websockets-client', name: 'websockets-client',
room: 'drawing-example' room: 'drawing-example',
// url: 'localhost:1234' url: 'localhost:1234'
}, },
sourceDir: '/bower_components', sourceDir: '/bower_components',
share: { share: {

3
examples/jigsaw/index.html
View File

@ -19,7 +19,8 @@
<script src="../../y.js"></script> <script src="../../y.js"></script>
<script src="../../../y-map/dist/y-map.js"></script> <script src="../../../y-map/dist/y-map.js"></script>
<script src="../../../y-memory/y-memory.js"></script> <script src="../../../y-memory/y-memory.js"></script>
<script src="../../../y-websockets-client/dist/y-websockets-client.js"></script> <script src="../bower_components/d3/d3.js"></script> <script src="../../../y-websockets-client/y-websockets-client.js"></script>
<script src="../bower_components/d3/d3.js"></script>
<script src="./index.js"></script> <script src="./index.js"></script>
</body> </body>
</html> </html>

3
examples/jigsaw/index.js
View File

@ -8,7 +8,8 @@ Y({
}, },
connector: { connector: {
name: 'websockets-client', name: 'websockets-client',
room: 'Puzzle-example' room: 'Puzzle-example',
url: 'http://localhost:1234'
}, },
share: { share: {
piece1: 'Map', piece1: 'Map',

2
src/Transaction.js
View File

@ -1097,7 +1097,7 @@ export default function extendTransaction (Y) {
yield * this.os.put(op) yield * this.os.put(op)
} }
yield * this.os.iterate(this, null, null, function * (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') { if (op.struct === 'Insert') {
// update parents .map/start/end properties // update parents .map/start/end properties
if (op.parentSub != null && op.left == null) { if (op.parentSub != null && op.left == null) {