Deploy 12.3.3

Deploy 12.3.2
Deploy 12.3.1
2017-08-04 20:36:37 +02:00 · 2017-07-19 18:50:48 +02:00 · 2017-06-17 14:32:22 +02:00 · 2017-05-08 12:40:26 +02:00 · 2017-05-03 18:00:53 +02:00 · 2017-05-03 16:17:06 +02:00
16 changed files with 710 additions and 168 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+node_modules
 bower_components
--- a/Examples/CodeMirror/index.html
+++ b/Examples/CodeMirror/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  </head>
+  <body>
+    <div id="codeMirrorContainer"></div>
+
+    <script src="../bower_components/yjs/y.es6"></script>
+    <script src="../bower_components/codemirror/lib/codemirror.js"></script>
+    <script src="../bower_components/codemirror/mode/javascript/javascript.js"></script>
+    <link rel="stylesheet" href="../bower_components/codemirror/lib/codemirror.css">
+    <style>
+      .CodeMirror {
+        position: fixed;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+    <script src="./index.js"></script>
+  </body>
+</html>
--- a/Examples/CodeMirror/index.js
+++ b/Examples/CodeMirror/index.js
@@ -0,0 +1,24 @@
+/* global Y, CodeMirror */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
+  }
+}).then(function (y) {
+  window.yCodeMirror = y
+
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
+})
--- a/Examples/Monaco/index.html
+++ b/Examples/Monaco/index.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  </head>
+  <body>
+    <div id="monacoContainer"></div>
+    <style>
+      #monacoContainer {
+        position: fixed;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+    <script src="../bower_components/yjs/y.es6"></script>
+    <script src="../bower_components/y-array/y-array.es6"></script>
+    <script src="../bower_components/y-text/y-text.es6"></script>
+    <script src="../bower_components/y-websockets-client/y-websockets-client.es6"></script>
+    <script src="../bower_components/y-memory/y-memory.es6"></script>
+    <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
+    <script src="./index.js"></script>
+  </body>
+</html>
--- a/Examples/Monaco/index.js
+++ b/Examples/Monaco/index.js
@@ -0,0 +1,31 @@
+/* global Y */
+
+require.config({ paths: { 'vs': '../node_modules/monaco-editor/min/vs' }})
+require(['vs/editor/editor.main'], function() {
+
+  // Initialize a shared object. This function call returns a promise!
+  Y({
+    db: {
+      name: 'memory'
+    },
+    connector: {
+      name: 'websockets-client',
+      room: 'monaco-example'
+    },
+    sourceDir: '/bower_components',
+    share: {
+      monaco: 'Text' // y.share.monaco is of type Y.Text
+    }
+  }).then(function (y) {
+    window.yMonaco = y
+
+    // Create Monaco editor
+    var editor = monaco.editor.create(document.getElementById('monacoContainer'), {
+      language: 'javascript'
+    })
+
+    // Bind to y.share.monaco
+    y.share.monaco.bindMonaco(editor)
+  })
+})
+
--- a/Examples/ServiceWorker/index.html
+++ b/Examples/ServiceWorker/index.html
--- a/Examples/ServiceWorker/index.js
+++ b/Examples/ServiceWorker/index.js
@@ -1,21 +1,31 @@
 /* global Y, Quill */

+// register yjs service worker
+if('serviceWorker' in navigator){
+  // Register service worker
+  // it is important to copy yjs-sw-template to the root directory!
+  navigator.serviceWorker.register('./yjs-sw-template.js').then(function(reg){
+    console.log("Yjs service worker registration succeeded. Scope is " + reg.scope);
+  }).catch(function(err){
+    console.error("Yjs service worker registration failed with error " + err);
+  })
+}
+
 // initialize a shared object. This function call returns a promise!
 Y({
  db: {
    name: 'memory'
  },
  connector: {
-    name: 'webworker',
-    url: '../bower_components/y-webworker/yjs-webworker.js',
-    room: 'WebWorkerExample2'
+    name: 'serviceworker',
+    room: 'ServiceWorkerExample2'
  },
  sourceDir: '/bower_components',
  share: {
    richtext: 'Richtext' // y.share.richtext is of type Y.Richtext
  }
 }).then(function (y) {
-  window.yQuill = y
+  window.yServiceWorker = y

  // create quill element
  window.quill = new Quill('#quill', {
--- a/Examples/ServiceWorker/yjs-sw-template.js
+++ b/Examples/ServiceWorker/yjs-sw-template.js
@@ -0,0 +1,22 @@
+/* eslint-env worker */
+
+// copy and modify this file
+
+self.DBConfig = {
+  name: 'indexeddb'
+}
+self.ConnectorConfig = {
+  name: 'websockets-client',
+  // url: '..',
+  options: {
+    jsonp: false
+  }
+}
+
+importScripts(
+  '/bower_components/yjs/y.js',
+  '/bower_components/y-memory/y-memory.js',
+  '/bower_components/y-indexeddb/y-indexeddb.js',
+  '/bower_components/y-websockets-client/y-websockets-client.js',
+  '/bower_components/y-serviceworker/yjs-sw-include.js'
+)
--- a/Examples/bower.json
+++ b/Examples/bower.json
@@ -23,6 +23,7 @@
    "ace": "~1.2.3",
    "ace-builds": "~1.2.3",
    "jquery": "~2.2.2",
-    "d3": "^3.5.16"
+    "d3": "^3.5.16",
+    "codemirror": "^5.25.0"
  }
 }
--- a/Examples/package.json
+++ b/Examples/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "examples",
+  "version": "1.0.0",
+  "description": "",
+  "author": "Kevin Jahns",
+  "license": "MIT",
+  "dependencies": {
+    "monaco-editor": "^0.8.3"
+  }
+}
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@

 # ![Yjs](http://y-js.org/images/yjs.png)

-Yjs is a framework for offline-first p2p shared editing on structured data like text, richtext, json, or XML.
-It is fairly easy to get started, as Yjs hides most of the complexity of concurrent editing.
-For additional information, demos, and tutorials visit [y-js.org](http://y-js.org/).
+Yjs is a framework for offline-first p2p shared editing on structured data like
+text, richtext, json, or XML. It is fairly easy to get started, as Yjs hides
+most of the complexity of concurrent editing. For additional information, demos,
+and tutorials visit [y-js.org](http://y-js.org/).

 ### Extensions
 Yjs only knows how to resolve conflicts on shared data. You have to choose a ..
@@ -11,7 +12,8 @@ Yjs only knows how to resolve conflicts on shared data. You have to choose a ..
 * *Database* - a database to store your changes
 * one or more *Types* - that represent the shared data

-Connectors, Databases, and Types are available as modules that extend Yjs. Here is a list of the modules we know of:
+Connectors, Databases, and Types are available as modules that extend Yjs. Here
+is a list of the modules we know of:

 ##### Connectors

@@ -20,6 +22,7 @@ Connectors, Databases, and Types are available as modules that extend Yjs. Here
 |[webrtc](https://github.com/y-js/y-webrtc) | Propagate updates Browser2Browser via WebRTC|
 |[websockets](https://github.com/y-js/y-websockets-client) | Set up [a central server](https://github.com/y-js/y-websockets-client), and connect to it via websockets |
 |[xmpp](https://github.com/y-js/y-xmpp) | Propagate updates in a XMPP multi-user-chat room ([XEP-0045](http://xmpp.org/extensions/xep-0045.html))|
+|[ipfs](https://github.com/ipfs-labs/y-ipfs-connector) | Connector for the [Interplanetary File System](https://ipfs.io/)!|
 |[test](https://github.com/y-js/y-test) | A Connector for testing purposes. It is designed to simulate delays that happen in worst case scenarios|

 ##### Database adapters
@@ -38,7 +41,7 @@ Connectors, Databases, and Types are available as modules that extend Yjs. Here
 |[map](https://github.com/y-js/y-map) | A shared Map implementation. Maps from text to any stringify-able object |
 |[array](https://github.com/y-js/y-array) | A shared Array implementation |
 |[xml](https://github.com/y-js/y-xml) | An implementation of the DOM. You can create a two way binding to Browser DOM objects |
-|[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to the [Ace Editor](https://ace.c9.io), textareas, input elements, and HTML elements (e.g. <*h1*>, or <*p*>) |
+|[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to the [Ace Editor](https://ace.c9.io), [CodeMirror](https://codemirror.net/), [Monaco](https://github.com/Microsoft/monaco-editor), textareas, input elements, and HTML elements (e.g. <*h1*>, or <*p*>) |
 |[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to the [Quill Rich Text Editor](http://quilljs.com/)|

 ##### Other
@@ -48,24 +51,27 @@ Connectors, Databases, and Types are available as modules that extend Yjs. Here
 |[y-element](http://y-js.org/y-element/) | Yjs Polymer Element |

 ## Use it!
-Install Yjs, and its modules with [bower](http://bower.io/), or [npm](https://www.npmjs.org/package/yjs).
+Install Yjs, and its modules with [bower](http://bower.io/), or
+[npm](https://www.npmjs.org/package/yjs).

 ### Bower
-```
+```sh
 bower install --save yjs y-array % add all y-* modules you want to use
 ```
-You only need to include the `y.js` file. Yjs is able to automatically require missing modules.  
-```
+You only need to include the `y.js` file. Yjs is able to automatically require
+missing modules.  
+```html
 <script src="./bower_components/yjs/y.js"></script>
 ```

 ### Npm
-```
+```sh
 npm install --save yjs % add all y-* modules you want to use
 ```

-If you don't include via script tag, you have to explicitly include all modules! (Same goes for other module systems)
-```
+If you don't include via script tag, you have to explicitly include all modules!
+(Same goes for other module systems)
+```js
 var Y = require('yjs')
 require('y-array')(Y) // add the y-array type to Yjs
 require('y-websockets-client')(Y)
@@ -78,7 +84,7 @@ require('y-text')(Y)
 ```

 ### ES6 Syntax
-```
+```js
 import Y from 'yjs'
 import yArray from 'y-array'
 import yWebsocketsClient from 'y-webrtc'
@@ -92,7 +98,7 @@ Y.extend(yArray, yWebsocketsClient, yMemory, yArray, yMap, yText /*, .. */)

 # Text editing example
 Install dependencies
-```
+```sh
 bower i yjs y-memory y-webrtc y-array y-text
 ```

@@ -135,30 +141,66 @@ Here is a simple example of a shared textarea
 ## Get Help & Give Help
 There are some friendly people on [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/y-js/yjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) who are eager to help, and answer questions. Please join!

-Report _any_ issues to the [Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very soon, if possible.
+Report _any_ issues to the
+[Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very
+soon, if possible.

 # API

 ### Y(options)
 * Y.extend(module1, module2, ..)
  * Add extensions to Y
-  * `Y.extend(require('y-webrtc'))` has the same semantics as `require('y-webrtc')(Y)`
+  * `Y.extend(require('y-webrtc'))` has the same semantics as
+    `require('y-webrtc')(Y)`
 * options.db
-  * Will be forwarded to the database adapter. Specify the database adaper on `options.db.name`.
-  * Have a look at the used database adapter repository to see all available options.
+  * Will be forwarded to the database adapter. Specify the database adaper on
+    `options.db.name`.
+  * Have a look at the used database adapter repository to see all available
+    options.
 * options.connector
-  * Will be forwarded to the connector adapter. Specify the connector adaper on `options.connector.name`.
-  * All our connectors implement a `room` property. Clients that specify the same room share the same data.
-  * All of our connectors specify an `url` property that defines the connection endpoint of the used connector.
-    * All of our connectors also have a default connection endpoint that you can use for development.
-  * Set `options.connector.generateUserId = true` in order to genenerate a userid, instead of receiving one from the server. This way the `Y(..)` is immediately going to be resolved, without waiting for any confirmation from the server. Use with caution.
+  * Will be forwarded to the connector adapter. Specify the connector adaper on
+    `options.connector.name`.
+  * All our connectors implement a `room` property. Clients that specify the
+    same room share the same data.
+  * All of our connectors specify an `url` property that defines the connection
+    endpoint of the used connector.
+    * All of our connectors also have a default connection endpoint that you can
+      use for development.
+  * We provide basic authentification for all connectors. The value of
+    `options.connector.auth` (this can be a passphase) is sent to all connected
+    Yjs instances. `options.connector.checkAuth` may grant read or write access
+    depending on the `auth` information.
+    Example: A client specifies `options.connector.auth = 'superSecretPassword`.
+    A server specifies
+    ```js
+    options.connector.checkAuth = function (auth, yjsInstance, sender) {
+      return new Promise(function (resolve, reject){
+        if (auth === 'superSecretPassword') {
+          resolve('write') // grant read-write access
+        } else if (auth === 'different password') {
+          resolve('read') // grant read-only access
+        } else {
+          reject('wrong password!') // reject connection
+        }
+      })
+    }
+    ```
+  * Set `options.connector.generateUserId = true` in order to genenerate a
+    userid, instead of receiving one from the server. This way the `Y(..)` is
+    immediately going to be resolved, without waiting for any confirmation from
+    the server. Use with caution.
  * Have a look at the used connector repository to see all available options.
+  * *Only if you know what you are doing:* Set
+    `options.connector.preferUntransformed = true` in order receive the shared
+    data untransformed. This is very efficient as the database content is simply
+    copied to this client. This does only work if this client receives content
+    from only one client.
 * options.sourceDir (browser only)
  * Path where all y-* modules are stored
  * Defaults to `/bower_components`
  * Not required when running on `nodejs` / `iojs`
  * When using nodejs you need to manually extend Yjs:
-```
+```js
 var Y = require('yjs')
 // you have to require a db, connector, and *all* types you use!
 require('y-memory')(Y)
@@ -167,16 +209,27 @@ require('y-map')(Y)
 // ..
 ```
 * options.share
-  * Specify on `options.share[arbitraryName]` types that are shared among all users.
-  * E.g. Specify `options.share[arbitraryName] = 'Array'` to require y-array and create an y-array type on `y.share[arbitraryName]`.
-  * If userA doesn't specify `options.share[arbitraryName]`, it won't be available for userA.
-  * If userB specifies `options.share[arbitraryName]`, it still won't be available for userA. But all the updates are send from userB to userA.
-  * In contrast to y-map, types on `y.share.*` cannot be overwritten or deleted. Instead, they are merged among all users. This feature is only available on `y.share.*`
-  * Weird behavior: It is supported that two users specify different types with the same property name.
-     E.g. userA specifies `options.share.x = 'Array'`, and userB specifies `options.share.x = 'Text'`. But they only share data if they specified the same type with the same property name
+  * Specify on `options.share[arbitraryName]` types that are shared among all
+    users.
+  * E.g. Specify `options.share[arbitraryName] = 'Array'` to require y-array and
+    create an y-array type on `y.share[arbitraryName]`.
+  * If userA doesn't specify `options.share[arbitraryName]`, it won't be
+    available for userA.
+  * If userB specifies `options.share[arbitraryName]`, it still won't be
+    available for userA. But all the updates are send from userB to userA.
+  * In contrast to y-map, types on `y.share.*` cannot be overwritten or deleted.
+    Instead, they are merged among all users. This feature is only available on
+    `y.share.*`
+  * Weird behavior: It is supported that two users specify different types with
+    the same property name.
+     E.g. userA specifies `options.share.x = 'Array'`, and userB specifies
+     `options.share.x = 'Text'`. But they only share data if they specified the
+     same type with the same property name
 * options.type (browser only)
-  * Array of modules that Yjs needs to require, before instantiating a shared type.
-  * By default Yjs requires the specified database adapter, the specified connector, and all modules that are used in `options.share.*`
+  * Array of modules that Yjs needs to require, before instantiating a shared
+    type.
+  * By default Yjs requires the specified database adapter, the specified
+    connector, and all modules that are used in `options.share.*`
  * Put all types here that you intend to use, but are not used in y.share.*

 ### Instantiated Y object (y)
@@ -186,7 +239,8 @@ require('y-map')(Y)
  * The specified database adapter is loaded
  * The specified connector is loaded
  * All types are included
-* The connector is initialized, and a unique user id is set (received from the server)
+* The connector is initialized, and a unique user id is set (received from the
+  server)
  * Note: When using y-indexeddb, a retrieved user id is stored on `localStorage`

 The promise returns an instance of Y. We denote it with a lower case `y`.
@@ -204,7 +258,8 @@ The promise returns an instance of Y. We denote it with a lower case `y`.
 * y.connector.disconnect()
  * Force to disconnect this instance from the other instances
 * y.connector.reconnect()
-  * Try to reconnect to the other instances (needs to be supported by the connector)
+  * Try to reconnect to the other instances (needs to be supported by the
+    connector)
  * Not supported by y-xmpp
 * y.close()
  * Destroy this object.
@@ -216,12 +271,14 @@ The promise returns an instance of Y. We denote it with a lower case `y`.
  * Removes all data from the database
  * Returns a promise
 * y.db.stopGarbageCollector()
-  * Stop the garbage collector. Call y.db.garbageCollect() to continue garbage collection
+  * Stop the garbage collector. Call y.db.garbageCollect() to continue garbage
+    collection
 * y.db.gc :: Boolean
  * Whether gc is turned on
 * y.db.gcTimeout :: Number (defaults to 50000 ms)
  * Time interval between two garbage collect cycles
-  * It is required that all instances exchanged all messages after two garbage collect cycles (after 100000 ms per default)
+  * It is required that all instances exchanged all messages after two garbage
+    collect cycles (after 100000 ms per default)
 * y.db.userId :: String
  * The used user id for this client. **Never overwrite this**

@@ -247,7 +304,9 @@ localStorage.debug = 'y*'
 ```

 ## Contribution
-I created this framework during my bachelor thesis at the chair of computer science 5 [(i5)](http://dbis.rwth-aachen.de/cms), RWTH University. Since December 2014 I'm working on Yjs as a part of my student worker job at the i5.
+I created this framework during my bachelor thesis at the chair of computer
+science 5 [(i5)](http://dbis.rwth-aachen.de/cms), RWTH University. Since
+December 2014 I'm working on Yjs as a part of my student worker job at the i5.

 ## License
 Yjs is licensed under the [MIT License](./LICENSE).
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "12.1.6",
+  "version": "12.3.3",
  "homepage": "y-js.org",
  "authors": [
    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
--- a/y.es6
+++ b/y.es6
@@ -1,11 +1,11 @@
 /**
 * yjs - A framework for real-time p2p shared editing on any data
- * @version v12.1.5
+ * @version v12.3.2
 * @link http://y-js.org
 * @license MIT
 */
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Y = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-
+(function (process){
 /**
 * This is the web browser implementation of `debug()`.
 *
@@ -45,13 +45,23 @@ exports.colors = [
 */

 function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
+
  // is webkit? http://stackoverflow.com/a/16459606/376773
-  return ('WebkitAppearance' in document.documentElement.style) ||
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
    // is firebug? http://stackoverflow.com/a/398120/376773
-    (window.console && (console.firebug || (console.exception && console.table))) ||
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
    // is firefox >= v31?
    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-    (navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31);
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
 }

 /**
@@ -59,7 +69,11 @@ function useColors() {
 */

 exports.formatters.j = function(v) {
-  return JSON.stringify(v);
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
 };


@@ -69,8 +83,7 @@ exports.formatters.j = function(v) {
 * @api public
 */

-function formatArgs() {
-  var args = arguments;
+function formatArgs(args) {
  var useColors = this.useColors;

  args[0] = (useColors ? '%c' : '')
@@ -80,17 +93,17 @@ function formatArgs() {
    + (useColors ? '%c ' : ' ')
    + '+' + exports.humanize(this.diff);

-  if (!useColors) return args;
+  if (!useColors) return;

  var c = 'color: ' + this.color;
-  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));
+  args.splice(1, 0, c, 'color: inherit')

  // the final "%c" is somewhat tricky, because there could be other
  // arguments passed either before or after the %c, so we need to
  // figure out the correct index to insert the CSS into
  var index = 0;
  var lastC = 0;
-  args[0].replace(/%[a-z%]/g, function(match) {
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
    if ('%%' === match) return;
    index++;
    if ('%c' === match) {
@@ -101,7 +114,6 @@ function formatArgs() {
  });

  args.splice(lastC, 0, c);
-  return args;
 }

 /**
@@ -148,6 +160,12 @@ function load() {
  try {
    r = exports.storage.debug;
  } catch(e) {}
+
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
+
  return r;
 }

@@ -168,13 +186,15 @@ exports.enable(load());
 * @api private
 */

-function localstorage(){
+function localstorage() {
  try {
    return window.localStorage;
  } catch (e) {}
 }

-},{"./debug":2}],2:[function(require,module,exports){
+}).call(this,require('_process'))
+
+},{"./debug":2,"_process":4}],2:[function(require,module,exports){

 /**
 * This is the common logic for both the Node.js and web browser
@@ -183,7 +203,7 @@ function localstorage(){
 * Expose `debug()` as the module.
 */

-exports = module.exports = debug;
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
 exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
@@ -200,17 +220,11 @@ exports.skips = [];
 /**
 * Map of special "%n" handling functions, for the debug "format" argument.
 *
- * Valid key names are a single, lowercased letter, i.e. "n".
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
 */

 exports.formatters = {};

-/**
- * Previously assigned color.
- */
-
-var prevColor = 0;
-
 /**
 * Previous log timestamp.
 */
@@ -219,13 +233,20 @@ var prevTime;

 /**
 * Select a color.
- *
+ * @param {String} namespace
 * @return {Number}
 * @api private
 */

-function selectColor() {
-  return exports.colors[prevColor++ % exports.colors.length];
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
+
+  return exports.colors[Math.abs(hash) % exports.colors.length];
 }

 /**
@@ -236,17 +257,13 @@ function selectColor() {
 * @api public
 */

-function debug(namespace) {
+function createDebug(namespace) {

-  // define the `disabled` version
-  function disabled() {
-  }
-  disabled.enabled = false;
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;

-  // define the `enabled` version
-  function enabled() {
-
-    var self = enabled;
+    var self = debug;

    // set `diff` timestamp
    var curr = +new Date();
@@ -256,22 +273,22 @@ function debug(namespace) {
    self.curr = curr;
    prevTime = curr;

-    // add the `color` if not set
-    if (null == self.useColors) self.useColors = exports.useColors();
-    if (null == self.color && self.useColors) self.color = selectColor();
-
-    var args = Array.prototype.slice.call(arguments);
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }

    args[0] = exports.coerce(args[0]);

    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %o
-      args = ['%o'].concat(args);
+      // anything else let's inspect with %O
+      args.unshift('%O');
    }

    // apply any `formatters` transformations
    var index = 0;
-    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
      // if we encounter an escaped % then don't increase the array index
      if (match === '%%') return match;
      index++;
@@ -287,19 +304,24 @@ function debug(namespace) {
      return match;
    });

-    if ('function' === typeof exports.formatArgs) {
-      args = exports.formatArgs.apply(self, args);
-    }
-    var logFn = enabled.log || exports.log || console.log.bind(console);
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
+
+    var logFn = debug.log || exports.log || console.log.bind(console);
    logFn.apply(self, args);
  }
-  enabled.enabled = true;

-  var fn = exports.enabled(namespace) ? enabled : disabled;
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);

-  fn.namespace = namespace;
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }

-  return fn;
+  return debug;
 }

 /**
@@ -313,7 +335,10 @@ function debug(namespace) {
 function enable(namespaces) {
  exports.save(namespaces);

-  var split = (namespaces || '').split(/[\s,]+/);
+  exports.names = [];
+  exports.skips = [];
+
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
  var len = split.length;

  for (var i = 0; i < len; i++) {
@@ -392,17 +417,24 @@ var y = d * 365.25;
 *  - `long` verbose formatting [false]
 *
 * @param {String|Number} val
- * @param {Object} options
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
 * @return {String|Number}
 * @api public
 */

-module.exports = function(val, options){
+module.exports = function(val, options) {
  options = options || {};
-  if ('string' == typeof val) return parse(val);
-  return options.long
-    ? long(val)
-    : short(val);
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
 };

 /**
@@ -414,10 +446,16 @@ module.exports = function(val, options){
 */

 function parse(str) {
-  str = '' + str;
-  if (str.length > 10000) return;
-  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str);
-  if (!match) return;
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
  var n = parseFloat(match[1]);
  var type = (match[2] || 'ms').toLowerCase();
  switch (type) {
@@ -455,6 +493,8 @@ function parse(str) {
    case 'msec':
    case 'ms':
      return n;
+    default:
+      return undefined;
  }
 }

@@ -466,11 +506,19 @@ function parse(str) {
 * @api private
 */

-function short(ms) {
-  if (ms >= d) return Math.round(ms / d) + 'd';
-  if (ms >= h) return Math.round(ms / h) + 'h';
-  if (ms >= m) return Math.round(ms / m) + 'm';
-  if (ms >= s) return Math.round(ms / s) + 's';
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
  return ms + 'ms';
 }

@@ -482,12 +530,12 @@ function short(ms) {
 * @api private
 */

-function long(ms) {
-  return plural(ms, d, 'day')
-    || plural(ms, h, 'hour')
-    || plural(ms, m, 'minute')
-    || plural(ms, s, 'second')
-    || ms + ' ms';
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
 }

 /**
@@ -495,15 +543,202 @@ function long(ms) {
 */

 function plural(ms, n, name) {
-  if (ms < n) return;
-  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
+  if (ms < n) {
+    return;
+  }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
  return Math.ceil(ms / n) + ' ' + name + 's';
 }

 },{}],4:[function(require,module,exports){
-/* @flow */
-'use strict'
+// shim for using process in browser
+var process = module.exports = {};

+// cached from whatever global is present so that test runners that stub it
+// don't break things.  But we need to wrap it in a try catch in case it is
+// wrapped in strict mode code which doesn't define any globals.  It's inside a
+// function because try/catches deoptimize in certain engines.
+
+var cachedSetTimeout;
+var cachedClearTimeout;
+
+function defaultSetTimout() {
+    throw new Error('setTimeout has not been defined');
+}
+function defaultClearTimeout () {
+    throw new Error('clearTimeout has not been defined');
+}
+(function () {
+    try {
+        if (typeof setTimeout === 'function') {
+            cachedSetTimeout = setTimeout;
+        } else {
+            cachedSetTimeout = defaultSetTimout;
+        }
+    } catch (e) {
+        cachedSetTimeout = defaultSetTimout;
+    }
+    try {
+        if (typeof clearTimeout === 'function') {
+            cachedClearTimeout = clearTimeout;
+        } else {
+            cachedClearTimeout = defaultClearTimeout;
+        }
+    } catch (e) {
+        cachedClearTimeout = defaultClearTimeout;
+    }
+} ())
+function runTimeout(fun) {
+    if (cachedSetTimeout === setTimeout) {
+        //normal enviroments in sane situations
+        return setTimeout(fun, 0);
+    }
+    // if setTimeout wasn't available but was latter defined
+    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
+        cachedSetTimeout = setTimeout;
+        return setTimeout(fun, 0);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedSetTimeout(fun, 0);
+    } catch(e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
+            return cachedSetTimeout.call(null, fun, 0);
+        } catch(e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
+            return cachedSetTimeout.call(this, fun, 0);
+        }
+    }
+
+
+}
+function runClearTimeout(marker) {
+    if (cachedClearTimeout === clearTimeout) {
+        //normal enviroments in sane situations
+        return clearTimeout(marker);
+    }
+    // if clearTimeout wasn't available but was latter defined
+    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
+        cachedClearTimeout = clearTimeout;
+        return clearTimeout(marker);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedClearTimeout(marker);
+    } catch (e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
+            return cachedClearTimeout.call(null, marker);
+        } catch (e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
+            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
+            return cachedClearTimeout.call(this, marker);
+        }
+    }
+
+
+
+}
+var queue = [];
+var draining = false;
+var currentQueue;
+var queueIndex = -1;
+
+function cleanUpNextTick() {
+    if (!draining || !currentQueue) {
+        return;
+    }
+    draining = false;
+    if (currentQueue.length) {
+        queue = currentQueue.concat(queue);
+    } else {
+        queueIndex = -1;
+    }
+    if (queue.length) {
+        drainQueue();
+    }
+}
+
+function drainQueue() {
+    if (draining) {
+        return;
+    }
+    var timeout = runTimeout(cleanUpNextTick);
+    draining = true;
+
+    var len = queue.length;
+    while(len) {
+        currentQueue = queue;
+        queue = [];
+        while (++queueIndex < len) {
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
+        }
+        queueIndex = -1;
+        len = queue.length;
+    }
+    currentQueue = null;
+    draining = false;
+    runClearTimeout(timeout);
+}
+
+process.nextTick = function (fun) {
+    var args = new Array(arguments.length - 1);
+    if (arguments.length > 1) {
+        for (var i = 1; i < arguments.length; i++) {
+            args[i - 1] = arguments[i];
+        }
+    }
+    queue.push(new Item(fun, args));
+    if (queue.length === 1 && !draining) {
+        runTimeout(drainQueue);
+    }
+};
+
+// v8 likes predictible objects
+function Item(fun, array) {
+    this.fun = fun;
+    this.array = array;
+}
+Item.prototype.run = function () {
+    this.fun.apply(null, this.array);
+};
+process.title = 'browser';
+process.browser = true;
+process.env = {};
+process.argv = [];
+process.version = ''; // empty string to avoid regexp issues
+process.versions = {};
+
+function noop() {}
+
+process.on = noop;
+process.addListener = noop;
+process.once = noop;
+process.off = noop;
+process.removeListener = noop;
+process.removeAllListeners = noop;
+process.emit = noop;
+process.prependListener = noop;
+process.prependOnceListener = noop;
+
+process.listeners = function (name) { return [] }
+
+process.binding = function (name) {
+    throw new Error('process.binding is not supported');
+};
+
+process.cwd = function () { return '/' };
+process.chdir = function (dir) {
+    throw new Error('process.chdir is not supported');
+};
+process.umask = function() { return 0; };
+
+},{}],5:[function(require,module,exports){
 function canRead (auth) { return auth === 'read' || auth === 'write' }
 function canWrite (auth) { return auth === 'write' }

@@ -520,7 +755,6 @@ module.exports = function (Y/* :any */) {
    syncingClients: Array<UserId>;
    forwardToSyncingClients: boolean;
    debug: boolean;
-    broadcastedHB: boolean;
    syncStep2: Promise;
    userId: UserId;
    send: Function;
@@ -539,6 +773,10 @@ module.exports = function (Y/* :any */) {
      if (opts == null) {
        opts = {}
      }
+      // Prefer to receive untransformed operations. This does only work if
+      // this client receives operations from only one other client.
+      // In particular, this does not work with y-webrtc.
+      // It will work with y-websockets-client
      if (opts.role == null || opts.role === 'master') {
        this.role = 'master'
      } else if (opts.role === 'slave') {
@@ -558,7 +796,6 @@ module.exports = function (Y/* :any */) {
      this.syncingClients = []
      this.forwardToSyncingClients = opts.forwardToSyncingClients !== false
      this.debug = opts.debug === true
-      this.broadcastedHB = false
      this.syncStep2 = Promise.resolve()
      this.broadcastOpBuffer = []
      this.protocolVersion = 11
@@ -579,16 +816,17 @@ module.exports = function (Y/* :any */) {
    }
    reconnect () {
      this.log('reconnecting..')
+      return this.y.db.startGarbageCollector()
    }
    disconnect () {
      this.log('discronnecting..')
      this.connections = {}
      this.isSynced = false
      this.currentSyncTarget = null
-      this.broadcastedHB = false
      this.syncingClients = []
      this.whenSyncedListeners = []
-      return this.y.db.stopGarbageCollector()
+      this.y.db.stopGarbageCollector()
+      return this.y.db.whenTransactionsFinished()
    }
    repair () {
      this.log('Repairing the state of Yjs. This can happen if messages get lost, and Yjs detects that something is wrong. If this happens often, please report an issue here: https://github.com/y-js/yjs/issues')
@@ -597,7 +835,6 @@ module.exports = function (Y/* :any */) {
      }
      this.isSynced = false
      this.currentSyncTarget = null
-      this.broadcastedHB = false
      this.findNextSyncTarget()
    }
    setUserId (userId) {
@@ -684,13 +921,14 @@ module.exports = function (Y/* :any */) {
        this.y.db.requestTransaction(function *() {
          var stateSet = yield* this.getStateSet()
          var deleteSet = yield* this.getDeleteSet()
-          conn.send(syncUser, {
+          var answer = {
            type: 'sync step 1',
            stateSet: stateSet,
            deleteSet: deleteSet,
            protocolVersion: conn.protocolVersion,
            auth: conn.authInfo
-          })
+          }
+          conn.send(syncUser, answer)
        })
      } else {
        if (!conn.isSynced) {
@@ -768,7 +1006,7 @@ module.exports = function (Y/* :any */) {
      }
      if (message.auth != null && this.connections[sender] != null) {
        // authenticate using auth in message
-        var auth = this.checkAuth(message.auth, this.y)
+        var auth = this.checkAuth(message.auth, this.y, sender)
        this.connections[sender].auth = auth
        auth.then(auth => {
          for (var f of this.userEventListeners) {
@@ -781,7 +1019,7 @@ module.exports = function (Y/* :any */) {
        })
      } else if (this.connections[sender] != null && this.connections[sender].auth == null) {
        // authenticate without otherwise
-        this.connections[sender].auth = this.checkAuth(null, this.y)
+        this.connections[sender].auth = this.checkAuth(null, this.y, sender)
      }
      if (this.connections[sender] != null && this.connections[sender].auth != null) {
        return this.connections[sender].auth.then((auth) => {
@@ -796,15 +1034,15 @@ module.exports = function (Y/* :any */) {
              }

              var ds = yield* this.getDeleteSet()
-              var ops = yield* this.getOperations(m.stateSet)
-              conn.send(sender, {
+              var answer = {
                type: 'sync step 2',
-                os: ops,
                stateSet: currentStateSet,
                deleteSet: ds,
                protocolVersion: this.protocolVersion,
                auth: this.authInfo
-              })
+              }
+              answer.os = yield* this.getOperations(m.stateSet)
+              conn.send(sender, answer)
              if (this.forwardToSyncingClients) {
                conn.syncingClients.push(sender)
                setTimeout(function () {
@@ -822,9 +1060,6 @@ module.exports = function (Y/* :any */) {
              }
            })
          } else if (message.type === 'sync step 2' && canWrite(auth)) {
-            let conn = this
-            var broadcastHB = !this.broadcastedHB
-            this.broadcastedHB = true
            var db = this.y.db
            var defer = {}
            defer.promise = new Promise(function (resolve) {
@@ -834,7 +1069,15 @@ module.exports = function (Y/* :any */) {
            let m /* :MessageSyncStep2 */ = message
            db.requestTransaction(function * () {
              yield* this.applyDeleteSet(m.deleteSet)
-              this.store.apply(m.os)
+              if (m.osUntransformed != null) {
+                yield* this.applyOperationsUntransformed(m.osUntransformed, m.stateSet)
+              } else {
+                this.store.apply(m.os)
+              }
+              /*
+               * This just sends the complete hb after some time
+               * Mostly for debugging..
+               *
              db.requestTransaction(function * () {
                var ops = yield* this.getOperations(m.stateSet)
                if (ops.length > 0) {
@@ -848,8 +1091,9 @@ module.exports = function (Y/* :any */) {
                    conn.broadcastOps(ops)
                  }
                }
-                defer.resolve()
              })
+              */
+              defer.resolve()
            })
          } else if (message.type === 'sync done') {
            var self = this
@@ -981,7 +1225,7 @@ module.exports = function (Y/* :any */) {
  Y.AbstractConnector = AbstractConnector
 }

-},{}],5:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 /* global getRandom, async */
 'use strict'

@@ -1021,7 +1265,7 @@ module.exports = function (Y) {
            ps.push(self.users[name].y.db.whenTransactionsFinished())
          }
          Promise.all(ps).then(resolve, reject)
-        }, 0)
+        }, 10)
      })
    },
    flushOne: function flushOne () {
@@ -1131,11 +1375,15 @@ module.exports = function (Y) {
      return Y.utils.globalRoom.flushAll()
    }
    disconnect () {
+      var waitForMe = Promise.resolve()
      if (!this.isDisconnected()) {
        globalRoom.removeUser(this.userId)
-        super.disconnect()
+        waitForMe = super.disconnect()
      }
-      return this.y.db.whenTransactionsFinished()
+      var self = this
+      return waitForMe.then(function () {
+        return self.y.db.whenTransactionsFinished()
+      })
    }
    flush () {
      var self = this
@@ -1157,7 +1405,7 @@ module.exports = function (Y) {
  Y.Test = Test
 }

-},{}],6:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 /* @flow */
 'use strict'

@@ -1199,6 +1447,7 @@ module.exports = function (Y /* :any */) {
    */
    constructor (y, opts) {
      this.y = y
+      this.dbOpts = opts
      var os = this
      this.userId = null
      var resolve
@@ -1235,12 +1484,6 @@ module.exports = function (Y /* :any */) {
      }
      this.gc1 = [] // first stage
      this.gc2 = [] // second stage -> after that, remove the op
-      this.gc = opts.gc == null || opts.gc
-      if (this.gc) {
-        this.gcTimeout = !opts.gcTimeout ? 50000 : opts.gcTimeout
-      } else {
-        this.gcTimeout = -1
-      }

      function garbageCollect () {
        return os.whenTransactionsFinished().then(function () {
@@ -1275,13 +1518,23 @@ module.exports = function (Y /* :any */) {
        })
      }
      this.garbageCollect = garbageCollect
-      if (this.gcTimeout > 0) {
-        garbageCollect()
-      }
+      this.startGarbageCollector()
+
      this.repairCheckInterval = !opts.repairCheckInterval ? 6000 : opts.repairCheckInterval
      this.opsReceivedTimestamp = new Date()
      this.startRepairCheck()
    }
+    startGarbageCollector () {
+      this.gc = this.dbOpts.gc == null || this.dbOpts.gc
+      if (this.gc) {
+        this.gcTimeout = !this.dbOpts.gcTimeout ? 50000 : this.dbOpts.gcTimeout
+      } else {
+        this.gcTimeout = -1
+      }
+      if (this.gcTimeout > 0) {
+        this.garbageCollect()
+      }
+    }
    startRepairCheck () {
      var os = this
      if (this.repairCheckInterval > 0) {
@@ -1758,7 +2011,7 @@ module.exports = function (Y /* :any */) {
  Y.AbstractDatabase = AbstractDatabase
 }

-},{}],7:[function(require,module,exports){
+},{}],8:[function(require,module,exports){
 /* @flow */
 'use strict'

@@ -2174,7 +2427,7 @@ module.exports = function (Y/* :any */) {
  Y.Struct = Struct
 }

-},{}],8:[function(require,module,exports){
+},{}],9:[function(require,module,exports){
 /* @flow */
 'use strict'

@@ -2273,7 +2526,7 @@ module.exports = function (Y/* :any */) {
          send.push(Y.Struct[op.struct].encode(op))
        }
      }
-      if (this.store.y.connector.isSynced && send.length > 0) { // TODO: && !this.store.forwardAppliedOperations (but then i don't send delete ops)
+      if (send.length > 0) { // TODO: && !this.store.forwardAppliedOperations (but then i don't send delete ops)
        // is connected, and this is not going to be send in addOperation
        this.store.y.connector.broadcastOps(send)
      }
@@ -2894,7 +3147,7 @@ module.exports = function (Y/* :any */) {
    }
    * addOperation (op) {
      yield* this.os.put(op)
-      if (this.store.y.connector.isSynced && this.store.forwardAppliedOperations && typeof op.id[1] !== 'string') {
+      if (this.store.forwardAppliedOperations && typeof op.id[1] !== 'string') {
        // is connected, and this is not going to be send in addOperation
        this.store.y.connector.broadcastOps([op])
      }
@@ -3190,6 +3443,56 @@ module.exports = function (Y/* :any */) {
      }
      return send.reverse()
    }
+    /*
+     * Get the plain untransformed operations from the database.
+     * You can apply these operations using .applyOperationsUntransformed(ops)
+     *
+     */
+    * getOperationsUntransformed () {
+      var ops = []
+      yield* this.os.iterate(this, null, null, function * (op) {
+        if (op.id[0] !== '_') {
+          ops.push(op)
+        }
+      })
+      return {
+        untransformed: ops
+      }
+    }
+    * applyOperationsUntransformed (m, stateSet) {
+      var ops = m.untransformed
+      for (var i = 0; i < ops.length; i++) {
+        var op = ops[i]
+        // create, and modify parent, if it is created implicitly
+        if (op.parent != null && op.parent[0] === '_') {
+          if (op.struct === 'Insert') {
+            // update parents .map/start/end properties
+            if (op.parentSub != null && op.left == null) {
+              // op is child of Map
+              let parent = yield* this.getOperation(op.parent)
+              parent.map[op.parentSub] = op.id
+              yield* this.setOperation(parent)
+            } else if (op.right == null || op.left == null) {
+              let parent = yield* this.getOperation(op.parent)
+              if (op.right == null) {
+                parent.end = Y.utils.getLastId(op)
+              }
+              if (op.left == null) {
+                parent.start = op.id
+              }
+              yield* this.setOperation(parent)
+            }
+          }
+        }
+        yield* this.os.put(op)
+      }
+      for (var user in stateSet) {
+        yield* this.ss.put({
+          id: [user],
+          clock: stateSet[user]
+        })
+      }
+    }
    /* this is what we used before.. use this as a reference..
    * makeOperationReady (startSS, op) {
      op = Y.Struct[op.struct].encode(op)
@@ -3224,7 +3527,7 @@ module.exports = function (Y/* :any */) {
  Y.Transaction = TransactionInterface
 }

-},{}],9:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 /* @flow */
 'use strict'

@@ -3253,6 +3556,24 @@ module.exports = function (Y/* :any */) {
 module.exports = function (Y /* : any*/) {
  Y.utils = {}

+  Y.utils.bubbleEvent = function (type, event) {
+    type.eventHandler.callEventListeners(event)
+    event.path = []
+    while (type != null && type._deepEventHandler != null) {
+      type._deepEventHandler.callEventListeners(event)
+      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
+      }
+    }
+  }
+
  class EventListenerHandler {
    constructor () {
      this.eventListeners = []
@@ -3277,7 +3598,11 @@ module.exports = function (Y /* : any*/) {
    callEventListeners (event) {
      for (var i = 0; i < this.eventListeners.length; i++) {
        try {
-          this.eventListeners[i](event)
+          var _event = {}
+          for (var name in event) {
+            _event[name] = event[name]
+          }
+          this.eventListeners[i](_event)
        } catch (e) {
          console.error('Your observer threw an error. This error was caught so that Yjs still can ensure data consistency! In order to debug this error you have to check "Pause On Caught Exceptions"', e)
        }
@@ -3687,7 +4012,20 @@ module.exports = function (Y /* : any*/) {
    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

@@ -3986,7 +4324,7 @@ module.exports = function (Y /* : any*/) {
  Y.utils.generateGuid = generateGuid
 }

-},{}],10:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 /* @flow */
 'use strict'

@@ -3998,7 +4336,6 @@ require('./Utils.js')(Y)
 require('./Connectors/Test.js')(Y)

 Y.debug = require('debug')
-// Y.debug.log = console.log.bind(console)

 var requiringModules = {}

@@ -4226,6 +4563,6 @@ class YConfig {
  }
 }

-},{"./Connector.js":4,"./Connectors/Test.js":5,"./Database.js":6,"./Struct.js":7,"./Transaction.js":8,"./Utils.js":9,"debug":1}]},{},[10])(10)
+},{"./Connector.js":5,"./Connectors/Test.js":6,"./Database.js":7,"./Struct.js":8,"./Transaction.js":9,"./Utils.js":10,"debug":1}]},{},[11])(11)
 });

--- a/y.es6.map
+++ b/y.es6.map
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
Author	SHA1	Message	Date
Kevin Jahns	8739fd3a9c	Deploy 12.3.3	2017-08-04 20:36:37 +02:00
Kevin Jahns	b3b12958fa	Deploy 12.3.2	2017-07-19 18:50:48 +02:00
Kevin Jahns	42aa7ec5c9	Deploy 12.3.1	2017-06-17 14:32:22 +02:00
Kevin Jahns	73e53e3dcc	Deploy 12.3.0	2017-05-08 12:40:26 +02:00
Kevin Jahns	222ffea11e	Deploy 12.2.1	2017-05-03 18:00:53 +02:00
Kevin Jahns	c3d21b5c8e	Deploy 12.2.0	2017-05-03 16:17:06 +02:00
Kevin Jahns	3eafd78710	Added Monaco editor example	2017-04-18 18:23:17 +02:00
Kevin Jahns	e30e16c91b	add serviceworker demo	2017-04-11 16:20:13 +02:00
Kevin Jahns	20e3491a64	Deploy 12.1.7	2017-04-10 11:22:28 +02:00
Kevin Jahns	11b30c7072	update CodeMirror Example	2017-03-29 13:42:41 +02:00
Kevin Jahns	d285e4258b	actually committing the codemirror example	2017-03-29 13:21:05 +02:00
Kevin Jahns	54b0bf9e4c	added CodeMirror example	2017-03-29 13:18:22 +02:00