Deploy 11.0.4

added drawing example
Deploy 11.0.3
2016-05-02 10:59:58 +02:00 · 2016-04-30 23:00:23 +01:00 · 2016-04-27 12:04:30 +01:00 · 2016-04-26 21:28:18 +02:00 · 2016-04-26 15:34:16 +02:00 · 2016-04-26 15:02:41 +02:00
13 changed files with 739 additions and 333 deletions
--- a/Examples/Chat/index.js
+++ b/Examples/Chat/index.js
@@ -38,12 +38,14 @@ Y({
  cleanupChat()
  
  // whenever content changes, make sure to reflect the changes in the DOM
-  y.share.chat.observe(function (events) {
-    for (var i = 0; i < events.length; i++) {
-      if (events[i].type === 'insert') {
-        appendMessage(events[i].value, events[i].index)
-      } else if (events[i].type === 'delete') {
-        chat.children[events[i].index].remove()
+  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
--- a/Examples/Drawing/index.html
+++ b/Examples/Drawing/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <style>
+    path {
+      fill: none;
+      stroke: blue;
+      stroke-width: 1px;
+      stroke-linejoin: round;
+      stroke-linecap: round;
+    }
+  </style>
+  <button type="button" id="clearDrawingCanvas">Clear Drawing</button>
+  <svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></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/Drawing/index.js
+++ b/Examples/Drawing/index.js
@@ -0,0 +1,88 @@
+/* globals Y, d3 */
+'strict mode'
+
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'drawing-example'
+    // url: 'localhost:1234'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    drawing: 'Array'
+  }
+}).then(function (y) {
+  window.yDrawing = y
+  var drawing = y.share.drawing
+  var renderPath = d3.svg.line()
+    .x(function (d) { return d[0] })
+    .y(function (d) { return d[1] })
+    .interpolate('basis')
+
+  var svg = d3.select('#drawingCanvas')
+    .call(d3.behavior.drag()
+      .on('dragstart', dragstart)
+      .on('drag', drag)
+      .on('dragend', dragend))
+
+  // create line from a shared array object and update the line when the array changes
+  function drawLine (yarray) {
+    var line = svg.append('path').datum(yarray.toArray())
+    line.attr('d', renderPath)
+    yarray.observe(function (event) {
+      // we only implement insert events that are appended to the end of the array
+      event.values.forEach(function (value) {
+        line.datum().push(value)
+      })
+      line.attr('d', renderPath)
+    })
+  }
+  // call drawLine every time an array is appended
+  y.share.drawing.observe(function (event) {
+    if (event.type === 'insert') {
+      event.values().then(function (values) {
+        values.forEach(drawLine)
+      })
+    } else {
+      // just remove all elements (thats what we do anyway)
+      svg.selectAll('path').remove()
+    }
+  })
+  // draw all existing content
+  for (var i = 0; i < drawing.length; i++) {
+    drawing.get(i).then(drawLine)
+  }
+
+  // clear canvas on request
+  document.querySelector('#clearDrawingCanvas').onclick = function () {
+    drawing.delete(0, drawing.length)
+  }
+
+  var sharedLine = null
+  function dragstart () {
+    drawing.insert(drawing.length, [Y.Array])
+    drawing.get(drawing.length - 1).then(function (array) {
+      sharedLine = array
+    })
+  }
+
+  // After one dragged event is recognized, we ignore them for 33ms.
+  var ignoreDrag = null
+  function drag () {
+    if (sharedLine != null && ignoreDrag == null) {
+      ignoreDrag = window.setTimeout(function () {
+        ignoreDrag = null
+      }, 33)
+      sharedLine.push([d3.mouse(this)])
+    }
+  }
+
+  function dragend () {
+    sharedLine = null
+    window.clearTimeout(ignoreDrag)
+    ignoreDrag = null
+  }
+})
--- a/Examples/Quill/index.js
+++ b/Examples/Quill/index.js
@@ -9,7 +9,6 @@ Y({
  connector: {
    name: 'websockets-client',
    room: 'richtext-example'
-    // url: 'http://127.0.0.1:1234'
  },
  sourceDir: '/bower_components',
  share: {
--- a/Examples/Xml/index.html
+++ b/Examples/Xml/index.html
@@ -1,8 +1,39 @@
 <!DOCTYPE html>
 <html>
-<body>
+</head>
  <script src="../bower_components/yjs/y.es6"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></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
@@ -7,7 +7,6 @@ Y({
  },
  connector: {
    name: 'websockets-client',
-    // url: 'http://127.0.0.1:1234',
    room: 'Xml-example'
  },
  sourceDir: '/bower_components',
--- a/Examples/bower.json
+++ b/Examples/bower.json
@@ -18,8 +18,11 @@
    "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"
+    "ace-builds": "~1.2.3",
+    "jquery": "~2.2.2",
+    "d3": "^3.5.16"
  }
 }
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@

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

-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.
+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/).

 You can create you own shared types easily.
-Therefore, you can design the sturcture of your custom type,
+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

@@ -36,8 +40,6 @@ You are not limited to use a specific database to store the shared data. We prov
 |[memory](https://github.com/y-js/y-memory) | In-memory storage. |
 |[indexeddb](https://github.com/y-js/y-indexeddb) | Offline storage for the browser |

-You can use Yjs client-, and server- side. You can get it as via npm, and bower. We even provide polymer elements for Yjs!
-
 The advantages over similar frameworks are support for
 * .. P2P message propagation and arbitrary communication protocols
 * .. share any type of data. The types provide a convenient interface
@@ -177,6 +179,14 @@ If you want to see an issue fixed, please subscribe to the thread (or remind me

 ## Changelog

+### 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)
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "10.0.2",
+  "version": "11.0.4",
  "homepage": "y-js.org",
  "authors": [
    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
--- 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	3f60690880	Deploy 11.0.4	2016-05-02 10:59:58 +02:00
Kevin Jahns	e2f93af86e	added drawing example	2016-04-30 23:00:23 +01:00
Kevin Jahns	76ebd3043d	Deploy 11.0.3	2016-04-27 12:04:30 +01:00
Kevin Jahns	b958b72f1d	Deploy 11.0.2	2016-04-26 21:28:18 +02:00
Kevin Jahns	89a920df68	Deploy 11.0.1	2016-04-26 15:34:16 +02:00
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