Deploy 11.0.0

updated examples to new version
Deploy 10.0.3
2016-04-26 15:02:41 +02:00 · 2016-04-26 14:39:49 +02:00 · 2016-03-23 19:55:48 +01:00 · 2016-03-23 19:53:52 +01:00 · 2016-03-23 14:42:23 +01:00 · 2016-03-23 14:41:04 +01:00
21 changed files with 3944 additions and 147 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+bower_components
--- a/Examples/Ace/index.html
+++ b/Examples/Ace/index.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <style type="text/css" media="screen">
+    #ace { 
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+    }
+    .inserted {
+      position:absolute;
+      z-index:20;
+      background-color: #FFC107;
+    }
+    .deleted {
+      position:absolute;
+      z-index:20;
+      background-color: #FFC107;
+    }
+    </style>
+  </head>
+  <body>
+
+    <div id="ace"></div>
+    <script src="../bower_components/yjs/y.es6"></script>
+    <script src="../bower_components/ace-builds/src/ace.js"></script>
+    
+    <script src="./index.js"></script>
+  </body>
+</html>
--- a/Examples/Ace/index.js
+++ b/Examples/Ace/index.js
@@ -0,0 +1,25 @@
+/* global Y, ace */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'ace-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    ace: 'Text' // y.share.textarea is of type Y.Text
+  }
+}).then(function (y) {
+  window.yAce = y
+
+  // bind the textarea to a shared text element
+  var editor = ace.edit('ace')
+  editor.setTheme('ace/theme/chrome')
+  editor.getSession().setMode('ace/mode/javascript')
+
+  y.share.ace.bindAce(editor)
+})
--- a/Examples/Chat/index.html
+++ b/Examples/Chat/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <style>
+      #chat p span {
+        color: blue;
+      }
+    </style>
+    <div id="chat"></div>
+    <form id="chatform">
+      <input name="username" type="text" style="width:15%;">
+      <input name="message" type="text" style="width:60%;">
+      <input type="submit" value="Send">
+    </form>
+    <script src="../bower_components/yjs/y.js"></script>
+    <script src="./index.js"></script>
+  </body>
+</html>
--- a/Examples/Chat/index.js
+++ b/Examples/Chat/index.js
@@ -0,0 +1,75 @@
+/* @flow */
+/* global Y */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'chat-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    chat: 'Array'
+  }
+}).then(function (y) {
+  window.yChat = y
+  // This functions inserts a message at the specified position in the DOM
+  function appendMessage(message, position) { 
+    var p = document.createElement('p')
+    var uname = document.createElement('span')
+    uname.appendChild(document.createTextNode(message.username + ": "))
+    p.appendChild(uname)
+    p.appendChild(document.createTextNode(message.message))
+    document.querySelector('#chat').insertBefore(p, chat.children[position] || null)
+  }
+  // This function makes sure that only 7 messages exist in the chat history.
+  // The rest is deleted
+  function cleanupChat () {
+    var len
+    while ((len = y.share.chat.length) > 7) {
+      y.share.chat.delete(0)        
+    }
+  }
+  // Insert the initial content
+  y.share.chat.toArray().forEach(appendMessage)
+  cleanupChat()
+  
+  // whenever content changes, make sure to reflect the changes in the DOM
+  y.share.chat.observe(function (event) {
+    if (event.type === 'insert') {
+      for (var i = 0; i < event.length; i++) {
+        appendMessage(event.values[i], event.index + i)
+      }
+    } else if (event.type === 'delete') {
+      for (var i = 0; i < event.length; i++) {
+        chat.children[event.index].remove()
+      }
+    }
+    // concurrent insertions may result in a history > 7, so cleanup here
+    cleanupChat()
+  })
+  document.querySelector('#chatform').onsubmit = function (event) {
+    // the form is submitted
+    var message = {
+      username: this.querySelector("[name=username]").value,
+      message: this.querySelector("[name=message]").value
+    }
+    if (message.username.length > 0 && message.message.length > 0) {
+      if (y.share.chat.length > 6) {
+        // If we are goint to insert the 8th element, make sure to delete first.
+        y.share.chat.delete(0)
+      }
+      // Here we insert a message in the shared chat type.
+      // This will call the observe function (see line 40)
+      // and reflect the change in the DOM
+      y.share.chat.push([message])
+      this.querySelector("[name=message]").value = ""
+    }
+    // Do not send this form!
+    event.preventDefault()
+    return false
+  }
+})
--- a/Examples/Jigsaw/index.html
+++ b/Examples/Jigsaw/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style type="text/css">
+    .draggable {
+      cursor: move;
+    }
+  </style>
+</head>
+<body>
+  <svg id="puzzle-example" width="100%" viewBox="0 0 800 800">
+    <g>
+      <path d="M 311.76636,154.23389 C 312.14136,171.85693 318.14087,184.97998 336.13843,184.23047 C 354.13647,183.48047 351.88647,180.48096 354.88599,178.98096 C 357.8855,177.48096 368.38452,170.35693 380.00806,169.98193 C 424.61841,168.54297 419.78296,223.6001 382.25757,223.6001 C 377.75806,223.6001 363.51001,219.10107 356.38599,211.97656 C 349.26196,204.85254 310.64185,207.10254 314.76636,236.34863 C 316.34888,247.5708 324.08374,267.90723 324.84595,286.23486 C 325.29321,296.99414 323.17603,307.00635 321.58911,315.6377 C 360.11353,305.4585 367.73462,304.30518 404.00513,312.83936 C 410.37915,314.33887 436.62573,310.21436 421.25269,290.3418 C 405.87964,270.46924 406.25464,248.34717 417.12817,240.84814 C 428.00171,233.34912 446.74976,228.84961 457.99829,234.09912 C 469.24683,239.34814 484.61987,255.84619 475.24585,271.59424 C 465.87231,287.34229 452.74878,290.7168 456.49829,303.84033 C 460.2478,316.96387 479.74536,320.33838 500.74292,321.83789 C 509.70142,322.47803 527.97192,323.28467 542.10864,320.12939 C 549.91821,318.38672 556.92212,315.89502 562.46753,313.56396 C 561.40796,277.80664 560.84888,245.71729 560.3606,241.97314 C 558.85278,230.41455 542.49536,217.28564 525.86499,223.2251 C 520.61548,225.1001 519.86548,231.84912 505.24243,232.59912 C 444.92798,235.69238 462.06958,143.26709 525.86499,180.48096 C 539.52759,188.45068 575.19409,190.7583 570.10913,156.85889 C 567.85962,141.86035 553.98608,102.86523 553.98608,102.86523 C 553.98608,102.86523 477.23755,111.82227 451.99878,91.991699 C 441.50024,83.74292 444.87476,69.494629 449.37427,61.245605 C 453.87378,52.996582 465.12231,46.622559 464.74731,36.123779 C 463.02563,-12.086426 392.96704,-10.902832 396.5061,36.873535 C 397.25562,46.997314 406.62964,52.621582 410.75415,60.495605 C 420.00757,78.161377 405.50024,96.073486 384.50757,99.490723 C 377.36206,100.65381 349.17505,102.65332 320.39429,102.23486 C 319.677,102.22461 318.95923,102.21143 318.24194,102.19775 C 315.08423,120.9751 311.55688,144.39697 311.76636,154.23389 z " style="fill:#f2c569;stroke:#000000" id="path2502"/>
+      <path d="M 500.74292,321.83789 C 479.74536,320.33838 460.2478,316.96387 456.49829,303.84033 C 452.74878,290.7168 465.87231,287.34229 475.24585,271.59424 C 484.61987,255.84619 469.24683,239.34814 457.99829,234.09912 C 446.74976,228.84961 428.00171,233.34912 417.12817,240.84814 C 406.25464,248.34717 405.87964,270.46924 421.25269,290.3418 C 436.62573,310.21436 410.37915,314.33887 404.00513,312.83936 C 367.73462,304.30518 360.11353,305.4585 321.58911,315.6377 C 320.56372,321.21484 319.75854,326.2207 320.01538,330.46191 C 320.76538,342.83545 329.3894,385.95508 327.8894,392.7041 C 326.3894,399.45312 313.64136,418.20117 297.89331,407.32715 C 282.14526,396.45361 276.52075,393.4541 265.27222,394.5791 C 254.02368,395.70361 239.77563,402.07812 239.77563,419.32568 C 239.77563,436.57373 250.27417,449.69727 268.64673,447.82227 C 287.36353,445.9126 317.92163,423.11035 325.63989,452.69678 C 330.1394,469.94434 330.51392,487.19238 330.1394,498.44092 C 329.95825,503.87646 326.09985,518.06592 322.16089,531.28125 C 353.2854,532.73682 386.47095,531.26611 394.2561,529.93701 C 430.30933,523.78174 429.31909,496.09766 412.62866,477.44385 C 406.25464,470.31934 401.75513,455.32129 405.87964,444.82275 C 414.07056,423.97314 458.8064,422.17773 473.37134,438.82324 C 483.86987,450.82178 475.99585,477.44385 468.49683,482.69287 C 453.52222,493.17529 457.22485,516.83008 473.37134,528.06201 C 504.79126,549.91943 572.35913,535.56152 572.35913,535.56152 C 572.35913,535.56152 567.85962,498.06592 567.48462,471.81934 C 567.10962,445.57275 589.60669,450.07227 593.3562,450.07227 C 597.10571,450.07227 604.22974,455.32129 609.47925,459.4458 C 614.72876,463.57031 618.85327,469.94434 630.85181,470.69434 C 677.43726,473.60596 674.58813,420.7373 631.97632,413.32666 C 623.35229,411.82666 614.72876,416.32617 603.10522,424.57519 C 591.48169,432.82422 577.23315,425.32519 570.10913,417.45117 C 566.07788,412.99561 563.8479,360.16406 562.46753,313.56396 C 556.92212,315.89502 549.91821,318.38672 542.10864,320.12939 C 527.97192,323.28467 509.70142,322.47803 500.74292,321.83789 z " style="fill:#f3f3d6;stroke:#000000" id="path2504"/>
+      <path d="M 240.52563,141.86035 C 257.60327,159.6499 243.94507,188.68799 214.65356,190.22949 C 185.09448,191.78516 164.66675,157.17822 190.28589,136.61621 C 200.49585,128.42139 198.05786,114.12158 179.78296,106.98975 C 154.4187,97.091553 90.54419,107.73975 90.54419,107.73975 C 90.54419,107.73975 100.88794,135.11328 101.41772,168.48242 C 101.79272,192.104 68.796875,189.47949 63.172607,186.85498 C 57.54834,184.23047 45.924805,173.73145 37.675781,173.73145 C -14.411865,173.73145 -10.013184,245.84375 39.925537,232.22412 C 48.174316,229.97461 56.42334,220.97559 68.796875,222.47559 C 81.17041,223.9751 87.544434,232.59912 87.544434,246.09766 C 87.544434,252.51709 87.0354,281.24268 86.340576,312.87012 C 119.15894,313.67676 160.60962,314.46582 170.03442,313.58887 C 186.15698,312.08936 195.90601,301.59033 188.40698,293.3418 C 180.90796,285.09277 156.16089,256.59619 179.03296,239.34814 C 201.90503,222.10059 235.65112,231.84912 239.77563,247.22217 C 243.90015,262.59521 240.52563,273.46924 234.90112,279.09326 C 229.27661,284.71777 210.52905,298.96582 221.40259,308.71484 C 232.27661,318.46338 263.77222,330.83691 302.39282,320.71338 C 309.58862,318.82715 315.92114,317.13525 321.58911,315.6377 C 323.17603,307.00635 325.29321,296.99414 324.84595,286.23486 C 324.08374,267.90723 316.34888,247.5708 314.76636,236.34863 C 310.64185,207.10254 349.26196,204.85254 356.38599,211.97656 C 363.51001,219.10107 377.75806,223.6001 382.25757,223.6001 C 419.78296,223.6001 424.61841,168.54297 380.00806,169.98193 C 368.38452,170.35693 357.8855,177.48096 354.88599,178.98096 C 351.88647,180.48096 354.13647,183.48047 336.13843,184.23047 C 318.14087,184.97998 312.14136,171.85693 311.76636,154.23389 C 311.55688,144.39697 315.08423,120.9751 318.24194,102.19775 C 290.37524,101.67725 262.46069,98.968262 254.39868,97.991211 C 233.38013,95.443359 217.17456,117.53662 240.52563,141.86035 z " style="fill:#bebcdb;stroke:#000000" id="path2506"/>
+      <path d="M 325.63989,452.69678 C 317.92163,423.11035 287.36353,445.9126 268.64673,447.82227 C 250.27417,449.69727 239.77563,436.57373 239.77563,419.32568 C 239.77563,402.07812 254.02368,395.70361 265.27222,394.5791 C 276.52075,393.4541 282.14526,396.45361 297.89331,407.32715 C 313.64136,418.20117 326.3894,399.45313 327.8894,392.7041 C 329.3894,385.95508 320.76538,342.83545 320.01538,330.46191 C 319.75855,326.2207 320.56372,321.21484 321.58911,315.6377 C 315.92114,317.13525 309.58862,318.82715 302.39282,320.71338 C 263.77222,330.83691 232.27661,318.46338 221.40259,308.71484 C 210.52905,298.96582 229.27661,284.71777 234.90112,279.09326 C 240.52563,273.46924 243.90015,262.59521 239.77563,247.22217 C 235.65112,231.84912 201.90503,222.10059 179.03296,239.34814 C 156.16089,256.59619 180.90796,285.09277 188.40698,293.3418 C 195.90601,301.59033 186.15698,312.08936 170.03442,313.58887 C 160.60962,314.46582 119.15894,313.67676 86.340576,312.87012 C 85.573975,347.74561 84.581299,386.15088 83.794922,402.07812 C 82.295166,432.44922 109.29175,422.32568 115.66577,420.82568 C 122.04028,419.32568 126.16479,409.57715 143.03735,408.45215 C 185.9231,405.59326 186.09985,466.69629 144.16235,467.69482 C 128.41431,468.06982 113.79126,451.19678 108.16675,447.44727 C 102.54272,443.69775 87.919433,442.94775 83.794922,457.9458 C 82.01709,464.41113 78.118652,481.65137 78.098144,496.18994 C 78.071045,515.38037 82.295166,531.81201 82.295166,531.81201 C 82.295166,531.81201 105.54224,526.5625 149.41187,526.5625 C 193.28149,526.5625 199.65552,547.93506 194.78101,558.80859 C 189.90649,569.68213 181.28296,568.93213 179.40796,583.18066 C 172.7063,634.11133 253.34106,631.08203 249.14917,584.68018 C 247.96948,571.62354 237.16528,571.66699 232.27661,557.68359 C 222.17944,528.80273 244.64966,523.56299 257.39819,524.68799 C 263.59351,525.23437 290.95679,529.73389 320.75757,531.21582 C 321.22437,531.23877 321.69312,531.25928 322.16089,531.28125 C 326.09985,518.06592 329.95825,503.87646 330.1394,498.44092 C 330.51392,487.19238 330.1394,469.94434 325.63989,452.69678 z " style="fill:#d3ea9d;stroke:#000000" id="path2508"/>
+		</g>
+  </svg>
+  <script src="../bower_components/yjs/y.js"></script>
+  <script src="../bower_components/d3/d3.js"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/Jigsaw/index.js
+++ b/Examples/Jigsaw/index.js
@@ -0,0 +1,69 @@
+/* @flow */
+/* global Y, d3 */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Puzzle-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    piece1: 'Map',
+    piece2: 'Map',
+    piece3: 'Map',
+    piece4: 'Map'
+  }
+}).then(function (y) {
+  window.yJigsaw = y
+  var origin // mouse start position - translation of piece  
+  var drag = d3.behavior.drag()
+    .on('dragstart', function (params) {
+      // get the translation of the element
+      var translation = d3.select(this).attr('transform').slice(10,-1).split(',').map(Number)
+      // mouse coordinates
+      var mouse = d3.mouse(this.parentNode)
+      origin = {
+        x: mouse[0] - translation[0],
+        y: mouse[1] - translation[1]
+      }
+    })
+    .on("drag", function(){
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x // =^= mouse - mouse at dragstart + translation at dragstart
+      var y = mouse[1] - origin.y
+      d3.select(this).attr("transform", "translate(" + x + "," + y + ")")
+    })
+    .on('dragend', function (piece, i) {
+      // save the current translation of the puzzle piece
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x
+      var y = mouse[1] - origin.y
+      piece.set('translation', {x: x, y: y})
+    })
+
+  var data = [y.share.piece1, y.share.piece2, y.share.piece3, y.share.piece4]
+  var pieces = d3.select(document.querySelector("#puzzle-example")).selectAll("path").data(data)
+
+  pieces
+    .classed('draggable', true)
+    .attr("transform", function (piece) {
+      var translation = piece.get('translation') || {x: 0, y: 0}
+      return "translate(" + translation.x + "," + translation.y + ")"
+    }).call(drag)
+
+  data.forEach(function(piece){
+    piece.observe(function () {
+      // whenever a property of a piece changes, update the translation of the pieces
+      pieces
+        .transition()
+        .attr("transform", function (piece) {
+          var translation = piece.get('translation') || {x: 0, y: 0}
+          return "translate(" + translation.x + "," + translation.y + ")"
+        })
+    })
+  })
+})
--- a/Examples/Quill/index.html
+++ b/Examples/Quill/index.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <link rel="stylesheet" href="../bower_components/quill/dist/quill.snow.css" />
+  <style>
+    #quill {
+      border: 1px solid gray;
+      box-shadow: 0px 0px 10px gray;
+    }
+    #toolbar {
+      border-bottom: 1px solid gray;
+    }
+  </style>
+</head>
+<body>
+  <div id="quill">
+    <!-- Create the toolbar container -->
+    <div id="toolbar" class="toolbar">
+      <span class="ql-format-group">
+          <select title="Font" class="ql-font">
+            <option value="sans-serif" selected="">Sans Serif</option>
+            <option value="serif">Serif</option>
+            <option value="monospace">Monospace</option>
+          </select>
+          <select title="Size" class="ql-size">
+            <option value="10px">Small</option>
+            <option value="13px" selected="">Normal</option>
+            <option value="18px">Large</option>
+            <option value="32px">Huge</option>
+          </select>
+        </span>
+      <span class="ql-format-group">
+          <span title="Bold" class="ql-format-button ql-bold"></span>
+      <span class="ql-format-separator"></span>
+      <span title="Italic" class="ql-format-button ql-italic"></span>
+      <span class="ql-format-separator"></span>
+      <span title="Underline" class="ql-format-button ql-underline"></span>
+      <span class="ql-format-separator"></span>
+      <span title="Strikethrough" class="ql-format-button ql-strike"></span>
+      </span>
+      <span class="ql-format-group">
+          <select title="Text Color" class="ql-color">
+            <option value="rgb(0, 0, 0)" label="rgb(0, 0, 0)" selected=""></option>
+            <option value="rgb(230, 0, 0)" label="rgb(230, 0, 0)"></option>
+            <option value="rgb(255, 153, 0)" label="rgb(255, 153, 0)"></option>
+            <option value="rgb(255, 255, 0)" label="rgb(255, 255, 0)"></option>
+            <option value="rgb(0, 138, 0)" label="rgb(0, 138, 0)"></option>
+            <option value="rgb(0, 102, 204)" label="rgb(0, 102, 204)"></option>
+            <option value="rgb(153, 51, 255)" label="rgb(153, 51, 255)"></option>
+            <option value="rgb(255, 255, 255)" label="rgb(255, 255, 255)"></option>
+            <option value="rgb(250, 204, 204)" label="rgb(250, 204, 204)"></option>
+            <option value="rgb(255, 235, 204)" label="rgb(255, 235, 204)"></option>
+            <option value="rgb(255, 255, 204)" label="rgb(255, 255, 204)"></option>
+            <option value="rgb(204, 232, 204)" label="rgb(204, 232, 204)"></option>
+            <option value="rgb(204, 224, 245)" label="rgb(204, 224, 245)"></option>
+            <option value="rgb(235, 214, 255)" label="rgb(235, 214, 255)"></option>
+            <option value="rgb(187, 187, 187)" label="rgb(187, 187, 187)"></option>
+            <option value="rgb(240, 102, 102)" label="rgb(240, 102, 102)"></option>
+            <option value="rgb(255, 194, 102)" label="rgb(255, 194, 102)"></option>
+            <option value="rgb(255, 255, 102)" label="rgb(255, 255, 102)"></option>
+            <option value="rgb(102, 185, 102)" label="rgb(102, 185, 102)"></option>
+            <option value="rgb(102, 163, 224)" label="rgb(102, 163, 224)"></option>
+            <option value="rgb(194, 133, 255)" label="rgb(194, 133, 255)"></option>
+            <option value="rgb(136, 136, 136)" label="rgb(136, 136, 136)"></option>
+            <option value="rgb(161, 0, 0)" label="rgb(161, 0, 0)"></option>
+            <option value="rgb(178, 107, 0)" label="rgb(178, 107, 0)"></option>
+            <option value="rgb(178, 178, 0)" label="rgb(178, 178, 0)"></option>
+            <option value="rgb(0, 97, 0)" label="rgb(0, 97, 0)"></option>
+            <option value="rgb(0, 71, 178)" label="rgb(0, 71, 178)"></option>
+            <option value="rgb(107, 36, 178)" label="rgb(107, 36, 178)"></option>
+            <option value="rgb(68, 68, 68)" label="rgb(68, 68, 68)"></option>
+            <option value="rgb(92, 0, 0)" label="rgb(92, 0, 0)"></option>
+            <option value="rgb(102, 61, 0)" label="rgb(102, 61, 0)"></option>
+            <option value="rgb(102, 102, 0)" label="rgb(102, 102, 0)"></option>
+            <option value="rgb(0, 55, 0)" label="rgb(0, 55, 0)"></option>
+            <option value="rgb(0, 41, 102)" label="rgb(0, 41, 102)"></option>
+            <option value="rgb(61, 20, 102)" label="rgb(61, 20, 102)"></option>
+          </select>
+          <span class="ql-format-separator"></span>
+      <select title="Background Color" class="ql-background">
+        <option value="rgb(0, 0, 0)" label="rgb(0, 0, 0)"></option>
+        <option value="rgb(230, 0, 0)" label="rgb(230, 0, 0)"></option>
+        <option value="rgb(255, 153, 0)" label="rgb(255, 153, 0)"></option>
+        <option value="rgb(255, 255, 0)" label="rgb(255, 255, 0)"></option>
+        <option value="rgb(0, 138, 0)" label="rgb(0, 138, 0)"></option>
+        <option value="rgb(0, 102, 204)" label="rgb(0, 102, 204)"></option>
+        <option value="rgb(153, 51, 255)" label="rgb(153, 51, 255)"></option>
+        <option value="rgb(255, 255, 255)" label="rgb(255, 255, 255)" selected=""></option>
+        <option value="rgb(250, 204, 204)" label="rgb(250, 204, 204)"></option>
+        <option value="rgb(255, 235, 204)" label="rgb(255, 235, 204)"></option>
+        <option value="rgb(255, 255, 204)" label="rgb(255, 255, 204)"></option>
+        <option value="rgb(204, 232, 204)" label="rgb(204, 232, 204)"></option>
+        <option value="rgb(204, 224, 245)" label="rgb(204, 224, 245)"></option>
+        <option value="rgb(235, 214, 255)" label="rgb(235, 214, 255)"></option>
+        <option value="rgb(187, 187, 187)" label="rgb(187, 187, 187)"></option>
+        <option value="rgb(240, 102, 102)" label="rgb(240, 102, 102)"></option>
+        <option value="rgb(255, 194, 102)" label="rgb(255, 194, 102)"></option>
+        <option value="rgb(255, 255, 102)" label="rgb(255, 255, 102)"></option>
+        <option value="rgb(102, 185, 102)" label="rgb(102, 185, 102)"></option>
+        <option value="rgb(102, 163, 224)" label="rgb(102, 163, 224)"></option>
+        <option value="rgb(194, 133, 255)" label="rgb(194, 133, 255)"></option>
+        <option value="rgb(136, 136, 136)" label="rgb(136, 136, 136)"></option>
+        <option value="rgb(161, 0, 0)" label="rgb(161, 0, 0)"></option>
+        <option value="rgb(178, 107, 0)" label="rgb(178, 107, 0)"></option>
+        <option value="rgb(178, 178, 0)" label="rgb(178, 178, 0)"></option>
+        <option value="rgb(0, 97, 0)" label="rgb(0, 97, 0)"></option>
+        <option value="rgb(0, 71, 178)" label="rgb(0, 71, 178)"></option>
+        <option value="rgb(107, 36, 178)" label="rgb(107, 36, 178)"></option>
+        <option value="rgb(68, 68, 68)" label="rgb(68, 68, 68)"></option>
+        <option value="rgb(92, 0, 0)" label="rgb(92, 0, 0)"></option>
+        <option value="rgb(102, 61, 0)" label="rgb(102, 61, 0)"></option>
+        <option value="rgb(102, 102, 0)" label="rgb(102, 102, 0)"></option>
+        <option value="rgb(0, 55, 0)" label="rgb(0, 55, 0)"></option>
+        <option value="rgb(0, 41, 102)" label="rgb(0, 41, 102)"></option>
+        <option value="rgb(61, 20, 102)" label="rgb(61, 20, 102)"></option>
+      </select>
+      </span>
+      <span class="ql-format-group">
+          <span title="List" class="ql-format-button ql-list"></span>
+      <span class="ql-format-separator"></span>
+      <span title="Bullet" class="ql-format-button ql-bullet"></span>
+      <span class="ql-format-separator"></span>
+      <select title="Text Alignment" class="ql-align">
+        <option value="left" label="Left" selected=""></option>
+        <option value="center" label="Center"></option>
+        <option value="right" label="Right"></option>
+        <option value="justify" label="Justify"></option>
+      </select>
+      </span>
+      <span class="ql-format-group">
+          <span title="Link" class="ql-format-button ql-link"></span>
+      </span>
+    </div>
+
+    <!-- Create the editor container -->
+    <div id="editor">
+    </div>
+  </div>
+
+  <!-- Include the Quill library -->
+  <script src="../bower_components/quill/dist/quill.js"></script>
+  <script src="../bower_components/yjs/y.es6"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/Quill/index.js
+++ b/Examples/Quill/index.js
@@ -0,0 +1,31 @@
+/* global Y, Quill */
+
+// initialize a shared object. This function call returns a promise!
+
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'richtext-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    richtext: 'Richtext' // y.share.richtext is of type Y.Richtext
+  }
+}).then(function (y) {
+  window.yQuill = y
+
+  // create quill element
+  window.quill = new Quill('#editor', {
+    modules: {
+      'toolbar': { container: '#toolbar' },
+      'link-tooltip': true
+    },
+    theme: 'snow'
+  })
+  // bind quill to richtext type
+  y.share.richtext.bind(window.quill)
+})
+
--- a/Examples/Textarea/index.html
+++ b/Examples/Textarea/index.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
+  <script src="../bower_components/yjs/y.es6"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/Textarea/index.js
+++ b/Examples/Textarea/index.js
@@ -0,0 +1,22 @@
+/* global Y */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Textarea-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    textarea: 'Text' // y.share.textarea is of type Y.Text
+  }
+}).then(function (y) {
+  window.yTextarea = y
+
+  // bind the textarea to a shared text element
+  y.share.textarea.bind(document.getElementById('textfield'))
+  // thats it..
+})
--- a/Examples/Xml/index.html
+++ b/Examples/Xml/index.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+</head>
+  <script src="../bower_components/yjs/y.es6"></script>
+  <script src="../bower_components/jquery/dist/jquery.min.js"></script>
+  <script src="./index.js"></script>
+</head>
+<body>
+  <h1> Shared DOM Example </h1>
+  <p> Use native DOM function or jQuery to manipulate the shared DOM (window.sharedDom). </p>
+  <div class="command">
+    <button type="button">Execute</button>
+    <input type="text" value='$(sharedDom).append("<h3>Appended headline</h3>")' size="40"/>
+  </div>
+  <div class="command">
+    <button type="button">Execute</button>
+    <input type="text" value='$(sharedDom).attr("align","right")' size="40"/>
+  </div>
+  <div class="command">
+    <button type="button">Execute</button>
+    <input type="text" value='$(sharedDom).attr("style","color:blue;")' size="40"/>
+  </div>
+  
+  <script>
+    var commands = document.querySelectorAll(".command");
+    Array.prototype.forEach.call(document.querySelectorAll('.command'), function (command) {
+      var execute = function(){
+        eval(command.querySelector("input").value);
+      }
+      command.querySelector("button").onclick = execute
+      $(command.querySelector("input")).keyup(function (e) {
+        if (e.keyCode == 13) {
+          execute()
+        }
+      })
+    })
+  </script>
+</body>
+</html>
--- a/Examples/Xml/index.js
+++ b/Examples/Xml/index.js
@@ -0,0 +1,23 @@
+/* global Y */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Xml-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    xml: 'Xml("p")' // y.share.xml is of type Y.Xml with tagname "p"
+  }
+}).then(function (y) {
+  window.yXml = y
+  // bind xml type to a dom, and put it in body
+  y.share.xml.getDom().then(function (dom) {
+    window.sharedDom = dom
+    document.body.appendChild(dom)
+  })
+})
--- a/Examples/bower.json
+++ b/Examples/bower.json
@@ -0,0 +1,27 @@
+{
+  "name": "yjs-examples",
+  "version": "0.0",
+  "homepage": "y-js.org",
+  "authors": [
+    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
+  ],
+  "description": "Examples for yjs",
+  "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": "~0.20.1",
+    "ace": "~1.2.3",
+    "ace-builds": "~1.2.3",
+    "jquery": "~2.2.2"
+  }
+}
--- a/README.md
+++ b/README.md
@@ -1,50 +1,57 @@

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

-[![Build Status](https://travis-ci.org/y-js/yjs.svg)](https://travis-ci.org/y-js/yjs)
+Yjs is a framework for optimistic concurrency control and automatic conflict resolution on shared data.
+The framework provides similar functionality as [ShareJs] and [OpenCoweb], but supports peer-to-peer
+communication protocols by default. Yjs was designed to handle concurrent actions on arbitrary data
+like Text, Json, and XML. We also provide support for storing and manipulating your shared data offline.
+For more information and demo applications visit our [homepage](http://y-js.org/).

-Yjs is a framework for optimistic concurrency control and automatic conflict resolution on shared data types. The framework implements a new OT-like concurrency algorithm and provides similar functionality as [ShareJs] and [OpenCoweb]. Yjs was designed to handle concurrent actions on arbitrary complex data types like Text, Json, and XML. We provide a tutorial and some applications for this framework on our [homepage](http://y-js.org/).
+You can create you own shared types easily.
+Therefore, you can design the structure of your custom type,
+and ensure data validity, while Yjs ensures data consistency (everyone will eventually end up with the same data).
+We already provide abstract data types for

-You can create you own shared types easily. Therefore, you can take matters into your own hand by defining the meaning of the shared types and ensure that it is valid, while Yjs ensures data consistency (everyone will eventually end up with the same data). We already provide data types for
+| Name     | Description       |
+|----------|-------------------|
+|[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 textareas, input elements, or HTML elements (e.g. <*h1*>, or <*p*>). Also supports the [Ace Editor](https://ace.c9.io) |
+|[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/)|

-| Name                                                 | Description
-| ---------------------------------------------------- | ---------------------------------------------
-y-object | Add, update, and remove properties of an object. Circular references are supported. Included in Yjs
-[y-list](https://github.com/y-js/y-list) | A shared linked list implementation. Circular references are supported
-[y-selections](https://github.com/y-js/y-selections) | Manages selections on types that use linear structures (e.g. the y-list type). You can select a range of elements and assign meaning to them.
-[y-xml](https://github.com/y-js/y-xml) | An implementation of the DOM. You can create a two way binding to Browser DOM objects
-[y-text](https://github.com/y-js/y-text) | Collaborate on text. You can create a two way binding to textareas, input elements, or HTML elements (e.g. *h1*, or *p*)
-[y-richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. You can create a two way binding to several editors
+Yjs supports P2P message propagation, and is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.

-Unlike other frameworks, Yjs supports P2P message propagation and is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.
+We support several communication protocols as so called *Connectors*.
+You can create your own connector too - read [this wiki page](https://github.com/y-js/yjs/wiki/Custom-Connectors).
+Currently, we support the following communication protocols:

-We support several communication protocols as so called *Connectors*. You can create your own connector too - read [this wiki page](https://github.com/y-js/yjs/wiki/Custom-Connectors). Currently, we support the following communication protocols:
+|Name            | Description               |
+|----------------|-----------------------------------|
+|[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))|
+|[webrtc](https://github.com/y-js/y-webrtc) | Propagate updates Browser2Browser via WebRTC|
+|[websockets](https://github.com/y-js/y-websockets-client) | Exchange updates efficiently in the classical client-server model |
+|[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|

-Name                                     | Description
---------------------------------------- | -------------------------------------------------------
-[y-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))
-[y-webrtc](https://github.com/y-js/y-webrtc) | Propagate updates Browser2Browser via WebRTC
-[y-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
+You are not limited to use a specific database to store the shared data. We provide the following database adapters:

-
-You can use Yjs client-, and server- side. You can get it as via npm, and bower. We even provide polymer elements for Yjs!
+|Name            | Description               |
+|----------------|-----------------------------------|
+|[memory](https://github.com/y-js/y-memory) | In-memory storage. |
+|[indexeddb](https://github.com/y-js/y-indexeddb) | Offline storage for the browser |

 The advantages over similar frameworks are support for
 * .. P2P message propagation and arbitrary communication protocols
-* .. arbitrary complex data types
-* .. offline editing: Changes are stored persistently and only relevant changes are propagated on rejoin
-* .. AnyUndo: Undo *any* action that was executed in constant time (coming..)
+* .. share any type of data. The types provide a convenient interface
+* .. offline support: Changes are stored persistently and only relevant changes are propagated on rejoin
 * .. Intention Preservation: When working on Text, the intention of your changes are preserved. This is particularily important when working offline. Every type has a notion on how we define Intention Preservation on it.

-
 ## Use it!
-You can find a tutorial, and examples on the [website](http://y-js.org). Furthermore, the [github wiki](https://github.com/y-js/yjs/wiki) offers more information about how you can use Yjs in your application.
-
-Either clone this git repository, install it with [bower](http://bower.io/), or install it with [npm](https://www.npmjs.org/package/yjs).
+Install yjs and its modules with [bower](http://bower.io/), or with [npm](https://www.npmjs.org/package/yjs).

 ### Bower
 ```
-bower install y-js/yjs
+bower install yjs --save
 ```
 Then you include the libraries directly from the installation folder.
 ```
@@ -61,69 +68,138 @@ And use it like this with *npm*:
 Y = require("yjs");
 ```

-# Y()
-In order to create an instance of Y, you need to have a connection object (instance of a Connector). Then, you can create a shared data type like this:
+# Text editing example
 ```
-var y = new Y(connector);
+Y({
+  db: {
+    name: 'memory' // store in memory.
+    // name: 'indexeddb'
+  },
+  connector: {
+    name: 'websockets-client', // choose the websockets connector
+    // name: 'webrtc'
+    // name: 'xmpp'
+    room: 'Textarea-example-dev'
+  },
+  sourceDir: '/bower_components', // location of the y-* modules
+  share: {
+    textarea: 'Text' // y.share.textarea is of type Y.Text
+  }
+  // types: ['Richtext', 'Array'] // optional list of types you want to import
+}).then(function (y) {
+  // bind the textarea to a shared text element
+  y.share.textarea.bind(document.getElementById('textfield'))
+}
 ```

+# Api

-# Y.Map
-Yjs includes only one type by default - the Y.Map type. It mimics the behaviour of a javascript Object. You can create, update, and remove properies on the Y.Map type. Furthermore, you can observe changes on this type as you can observe changes on Javascript Objects with [Object.observe](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/observe) - an ECMAScript 7 proposal which is likely to become accepted by the committee. Until then, we have our own implementation.
-
-
-##### Reference
-* Create
+### Y(options)
+* 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.
+* 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. 
+  * Have a look at the used connector repository to see all available options.
+* options.sourceDir
+  * Path where all y-* modules are stored.
+  * Defaults to `/bower_components`
+  * Not required when running on `nodejs` / `iojs`
+  * When using browserify you can specify all used modules like this:
 ```
-var map = y.set("new_map", Y.Map).then(function(map){
-  map // is my map type
-});
-```
-* Every instance of Y is an Y.Map
-```
-var y = new Y(options);
-```
-* .get(name)
-  * Retrieve the value of a property. If the value is a type, `.get(name)` returns a promise
-* .set(name, value)
-  * Set/update a property. `value` may be a primitive type, or a custom type definition (e.g. `Y.Map`)
-* .delete(name)
-  * Delete a property
-* .observe(observer)
-  * The `observer` is called whenever something on this object changes. Throws *add*, *update*, and *delete* events
-* .observePath(path, observer)
-  * `path` is an array of property names. `observer` is called when the property under `path` is set, deleted, or updated
-* .unobserve(f)
-  * Delete an observer
+var Y = require('yjs')
+// you need to require the db, connector, and *all* types you use! 
+require('y-memory')(Y)
+require('y-webrtc')(Y)
+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'll only share data if they specified the same type with the same property name
+* options.type
+  * 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.*

-# A note on intention preservation
-When users create/update/delete the same property concurrently, only one change will prevail. Changes on different properties do not conflict with each other.
+### Instantiated Y object (y)
+`Y(options)` returns a promise that is fulfilled when..

-# A note on time complexities
-* .get(name)
-  * O(1)
-* .set(name, value)
-  * O(1)
-* .delete(name)
-  * O(1)
-* Apply a delete operation from another user
-  * O(1)
-* Apply an update operation from another user (set/update a property)
-  * Yjs does not transform against operations that do not conflict with each other.
-  * An operation conflicts with another operation if it changes the same property.
-  * Overall worst case complexety: O(|conflicts|!)
+* All modules are loaded
+  * 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)
+  * Note: When using y-indexeddb, a retrieved user id is stored on `localStorage`

-# Status
-Yjs is a work in progress. Different versions of the *y-* repositories may not work together. Just drop me a line if you run into troubles.
+The promise returns an instance of Y. We denote it with a lower case `y`.
+
+* y.share.*
+  * Instances of the types you specified on options.share.*
+  * y.share.* can only be defined once when you instantiate Y!
+* y.connector is an instance of Y.AbstractConnector
+* y.connector.onUserEvent(function (event) {..})
+  * Observe user events (event.action is either 'userLeft' or 'userJoined')
+* y.connector.whenSynced(listener)
+  * `listener` is executed when y synced with at least one user.
+  * `listener` is not called when no other user is in the same room.
+  * y-websockets-client aways waits to sync with the server
+* 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)
+  * Not supported by y-xmpp 
+* y.destroy()
+  * Destroy this object.
+  * Destroys all types (they will throw weird errors if you still use them)
+  * Disconnects from the other instances (via connector)
+  * Removes all data from the database
+* y.db.stopGarbageCollector()
+  * Stop the garbage collector. Call y.db.garbageCollect() to continue garbage collection
+* 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)
+* y.db.userId :: String
+  * The used user id for this client. **Never overwrite this**

 ## Get 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 may help you with your problem, and answer your questions.

 Please report _any_ issues to the [Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very soon, if possible.
+If you want to see an issue fixed, please subscribe to the thread (or remind me via gitter).
+

 ## Changelog
-##### 1.0
-This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 1.0 it is possible to work asynchronously on a persistent database, which enables offline support.
+
+### 11.0.0
+
+* **All types now return a single event instead of list of events**
+  * Insert events contain a list of values
+* Improved performance for large insertions & deletions
+* Several bugfixes (offline editing related)
+* Native support for node 4 (see #49)
+
+### 10.0.0
+
+* Support for more complex types (a type can be a composition of several types)
+* Fixes several memory leaks
+
+### 9.0.0
+There were several rolling updates from 0.6 to 0.8. We consider Yjs stable since a long time, 
+and intend to continue stable releases. From this release forward y-* modules will implement peer-dependencies for npm, and dependencies for bower.
+Furthermore, incompatible yjs instances will now throw errors when syncing - this feature was influenced by #48. The versioning jump was influenced by react (see [here](https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html))
+
+
+### 0.6.0
+This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 0.6.0 it is possible to work asynchronously on a persistent database, which enables offline support.
 * Switched to semver versioning
 * Requires a promise implementation in environment (es6 promises suffice, included in all the major browsers). Otherwise you have to include a polyfill
 * Y.Object has been renamed to Y.Map
@@ -132,6 +208,7 @@ This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 1.0 it is possib
 * The Connector definition slightly changed (I'll update the wiki)
 * The Type definitions completely changed, so you have to rewrite them (I'll rewrite the article in the wiki)
 * Support for several packaging systems
+* Flowtype


 ## Contribution
@@ -142,4 +219,6 @@ Yjs is licensed under the [MIT License](./LICENSE.txt).

 <yjs@dbis.rwth-aachen.de>

-[ShareJs]: https://github.com/sh
+[ShareJs]: https://github.com/share/ShareJS
+[OpenCoweb]: https://github.com/opencoweb/coweb/wiki
+
--- a/bower.json
+++ b/bower.json
@@ -0,0 +1,21 @@
+{
+  "name": "yjs",
+  "version": "11.0.0",
+  "homepage": "y-js.org",
+  "authors": [
+    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
+  ],
+  "description": "A Framework for shared editing on any data",
+  "main": "./y.js",
+  "keywords": [
+    "Yjs",
+    "OT",
+    "Collaboration",
+    "Synchronization",
+    "ShareJS",
+    "Coweb",
+    "Concurrency"
+  ],
+  "license": "MIT",
+  "ignore": []
+}
--- a/package.json
+++ b/package.json
@@ -1,65 +0,0 @@
-{
-  "name": "yjs",
-  "version": "0.6.23",
-  "description": "A framework for real-time p2p shared editing on arbitrary complex data types",
-  "main": "y.js",
-  "scripts": {
-    "test": "node --harmony ./node_modules/.bin/gulp test",
-    "lint": "./node_modules/.bin/standard",
-    "build": "./node_modules/.bin/standard build"
-  },
-  "pre-commit": [
-    "lint",
-    "test"
-  ],
-  "standard": {
-    "parser": "babel-eslint",
-    "ignore": [
-      "build/**",
-      "./y.js",
-      "./y.js.map"
-    ]
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/y-js/yjs.git"
-  },
-  "keywords": [
-    "OT",
-    "Operational Transformation",
-    "collaboration",
-    "synchronization",
-    "ShareJs",
-    "OpenCoweb",
-    "concurrency"
-  ],
-  "author": "Kevin Jahns",
-  "email": "kevin.jahns@rwth-aachen.de",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/y-js/yjs/issues"
-  },
-  "homepage": "http://y-js.org",
-  "devDependencies": {
-    "babel-eslint": "^4.1.2",
-    "gulp": "^3.9.0",
-    "gulp-babel": "^5.2.1",
-    "gulp-bump": "^1.0.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-filter": "^3.0.1",
-    "gulp-git": "^1.6.0",
-    "gulp-jasmine": "^2.0.1",
-    "gulp-jasmine-browser": "^0.2.3",
-    "gulp-load-plugins": "^1.0.0",
-    "gulp-shell": "^0.5.1",
-    "gulp-sourcemaps": "^1.5.2",
-    "gulp-tag-version": "^1.3.0",
-    "gulp-uglify": "^1.4.1",
-    "gulp-util": "^3.0.6",
-    "gulp-watch": "^4.3.5",
-    "minimist": "^1.2.0",
-    "pre-commit": "^1.1.1",
-    "promise-polyfill": "^2.1.0",
-    "standard": "^5.2.2"
-  }
-}
--- a/y.es6
+++ b/y.es6
--- 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	c2b8d7b164	Deploy 11.0.0	2016-04-26 15:02:41 +02:00
Kevin Jahns	5c7bab422f	updated examples to new version	2016-04-26 14:39:49 +02:00
Kevin Jahns	f21e1c549a	Deploy 10.0.3	2016-03-23 19:55:48 +01:00
Kevin Jahns	3156c7b19f	updated xml example with commands	2016-03-23 19:53:52 +01:00
Kevin Jahns	658081566b	Deploy 10.0.2	2016-03-23 14:42:23 +01:00
Kevin Jahns	ffe0ec5a38	Deploy 10.0.1	2016-03-23 14:41:04 +01:00
Kevin Jahns	5cfe209688	added xml example	2016-03-14 19:45:50 +01:00
Kevin Jahns	51c8d3bdc6	Deploy 9.0.4	2016-02-24 12:00:45 +01:00
Kevin Jahns	0f86b71f78	add readme?	2016-02-24 12:00:02 +01:00
Kevin Jahns	fafda2726f	Deploy 9.0.3	2016-02-23 15:50:16 +01:00
Kevin Jahns	116770fbce	fix gitignore, fix Examples/bower.json	2016-02-23 15:47:53 +01:00
Kevin Jahns	5286f507c8	Deploy 9.0.2	2016-02-23 15:42:09 +01:00
Kevin Jahns	2f7349b712	fixed bower & added dependencies & cleanup	2016-02-23 15:41:22 +01:00
Kevin Jahns	54529ab1e7	Deploy 9.0.1	2016-02-23 11:58:10 +01:00
Kevin Jahns	e165c5ee2a	added peer dependencies, upgraded version to major (new versioning scheme)	2016-02-23 11:57:27 +01:00
Kevin Jahns	7b3693aff3	Deploy 0.8.28	2016-02-23 11:27:26 +01:00
Kevin Jahns	f75f47646b	Deploy 0.8.27	2016-02-22 13:08:01 +01:00
Kevin Jahns	64044123e3	Deploy 0.8.26	2016-02-22 13:06:11 +01:00
Kevin Jahns	a286162ace	Deploy 0.8.25	2016-02-22 13:04:32 +01:00
Kevin Jahns	f739f3b5d7	Deploy 0.8.23	2016-02-22 12:40:21 +01:00
Kevin Jahns	f2052f95f8	Deploy 0.8.22	2016-02-22 12:38:21 +01:00
Kevin Jahns	81324dc7d4	Deploy 0.8.21	2016-02-18 16:57:27 +01:00
Kevin Jahns	6599cb20b4	Deploy 0.8.20	2016-02-16 16:08:50 +01:00
Kevin Jahns	74ed9e4107	Deploy 0.8.18	2016-02-15 15:22:51 +01:00
Kevin Jahns	ef6d63c19a	Deploy 0.8.17	2016-02-04 23:13:47 +01:00
Kevin Jahns	941dd36e74	Deploy 0.8.16	2016-02-04 23:12:49 +01:00
Kevin Jahns	e74c22f0a9	Deploy 0.8.15	2016-02-04 23:11:07 +01:00
Kevin Jahns	98085b2807	Deploy 0.8.14	2016-02-04 15:26:28 +01:00
Kevin Jahns	e48608a7d4	update ace example	2016-02-04 12:53:27 +01:00
Kevin Jahns	ddbe19d78e	Deploy 0.8.13	2016-02-04 12:47:05 +01:00
Kevin Jahns	f9a9edcc26	Deploy 0.8.12	2016-02-04 12:12:53 +01:00
Kevin Jahns	4340f028b5	cleanup	2016-02-04 12:05:47 +01:00
Kevin Jahns	6a4aabe69c	Deploy 0.8.11	2016-02-04 10:52:55 +01:00
Kevin Jahns	6904e6018d	added ace example	2016-02-03 11:37:10 +01:00
Kevin Jahns	5e295b80d7	Deploy 0.8.9	2016-01-18 16:45:40 +01:00
Kevin Jahns	e58f633115	Deploy 0.8.8	2016-01-18 15:40:31 +01:00
Kevin Jahns	65ea42481e	Deploy 0.8.7	2016-01-16 01:45:53 +01:00
Kevin Jahns	a220b06ad9	Deploy 0.8.6	2016-01-16 01:41:55 +01:00
Kevin Jahns	2650338b4b	Deploy 0.8.5	2016-01-15 18:09:41 +01:00
Kevin Jahns	919dfb5e16	Deploy 0.8.4	2016-01-15 17:58:01 +01:00
Kevin Jahns	3b8e148d8f	Deploy 0.8.3	2016-01-15 03:46:51 +01:00
Kevin Jahns	a77eb39218	Deploy 0.8.2	2016-01-15 03:10:52 +01:00
Kevin Jahns	9902da470b	Deploy 0.8.1	2016-01-15 00:03:37 +01:00
Kevin Jahns	0ec83aa431	Deploy 0.8.0	2016-01-15 00:01:56 +01:00
Kevin Jahns	ff006c92d7	Deploy 0.7.6	2016-01-11 15:48:06 +01:00
Kevin Jahns	15a472df44	Deploy 0.7.5	2016-01-11 15:47:19 +01:00
Kevin Jahns	4cb0f2b5b9	publish v0.7.3	2016-01-09 21:07:04 +01:00
Kevin Jahns	ab6a193ec6	added safety to setUserId (when called twice)	2015-12-30 16:34:39 +01:00
Kevin Jahns	f18a6ee151	added quill example	2015-12-27 14:57:23 +01:00
Kevin Jahns	8ba1e4ce27	update	2015-12-18 16:34:00 +01:00
Kevin Jahns	625a64635a	added another example, updated readme	2015-12-09 18:39:09 +01:00
Kevin Jahns	b32c2e4ed6	publish 0.7 - with (hopefully) stable API	2015-12-09 10:10:43 +01:00
Kevin Jahns	96f8f77dc4	update	2015-12-03 18:02:37 +01:00
Kevin Jahns	08f0702fcd	update port	2015-12-02 20:04:11 +01:00
Kevin Jahns	5da36f07ce	update	2015-12-02 16:57:33 +01:00
Kevin Jahns	c44c86054e	added jigsaw puzzle	2015-12-02 15:58:08 +01:00
Kevin Jahns	434432a742	update	2015-12-01 19:27:03 +01:00
Kevin Jahns	b471c91d1d	added es6 distribution	2015-11-30 15:24:35 +01:00
Kevin Jahns	14a3fbc638	changed to memory adapter	2015-11-15 02:13:32 +01:00
Kevin Jahns	4efc428ce0	Deploy 0.6.40	2015-11-15 02:11:41 +01:00
Kevin Jahns	ded8ef07bb	Deploy 0.6.39	2015-11-15 02:09:37 +01:00
Kevin Jahns	dcf6212436	example update	2015-11-11 17:18:57 +01:00
Kevin Jahns	acfce06912	removed disconnect button for example	2015-11-10 18:38:21 +01:00
Kevin Jahns	6c13be376f	updated examples	2015-11-09 03:04:03 +01:00
Kevin Jahns	0292181830	Deploy 0.6.36	2015-11-07 22:17:25 +01:00
Kevin Jahns	93a3ff3d6e	Deploy 0.6.32	2015-11-05 17:08:57 +01:00
Kevin Jahns	5116d70adb	Deploy 0.6.25	2015-11-04 16:57:35 +01:00
Kevin Jahns	e2e89e198f	outsourced examples	2015-11-04 16:52:31 +01:00