Deploy 11.1.0

Deploy 11.0.4
added drawing example
2016-05-07 13:20:37 +01:00 · 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
14 changed files with 1194 additions and 428 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-node_modules
 bower_components
-.directory
-.codio
-.settings
-.jshintignore
-.jshintrc
-.validate.json
--- 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
@@ -8,9 +8,7 @@ Y({
  },
  connector: {
    name: 'websockets-client',
-    room: 'richtext-example',
-    debug: true
-    // url: 'http://127.0.0.1:1234'
+    room: 'richtext-example'
  },
  sourceDir: '/bower_components',
  share: {
--- 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
@@ -9,17 +9,20 @@
  "license": "MIT",
  "ignore": [],
  "dependencies": {
-    "yjs": "~0.7.6",
-    "y-array": "~0.7.5",
-    "y-map": "~0.7.2",
-    "y-memory": "~0.7.0",
-    "y-richtext": "~0.7.5",
-    "y-webrtc": "~0.7.1",
-    "y-websockets-client": "~0.7.10",
-    "y-text": "~0.7.1",
-    "y-indexeddb": "~0.7.1",
+    "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"
+    "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
@@ -49,7 +51,7 @@ Install yjs and its modules with [bower](http://bower.io/), or with [npm](https:

 ### Bower
 ```
-bower install yjs
+bower install yjs --save
 ```
 Then you include the libraries directly from the installation folder.
 ```
@@ -168,18 +170,36 @@ The promise returns an instance of Y. We denote it with a lower case `y`.
 * y.db.userId :: String
  * The used user id for this client. **Never overwrite this**

-
-# 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.
-
 ## 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.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
--- a/bower.json
+++ b/bower.json
@@ -1,19 +1,21 @@
 {
  "name": "yjs",
-  "version": "0.8.21",
+  "version": "11.1.0",
  "homepage": "y-js.org",
  "authors": [
    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
  ],
-  "description": "A Framework that enables Real-Time collaboration on arbitrary data structures.",
-  "main": "y.js",
+  "description": "A Framework for shared editing on any data",
+  "main": "./y.js",
  "keywords": [
+    "Yjs",
    "OT",
-    "collaboration",
-    "synchronization",
-    "sharejs",
-    "coweb",
-    "concurrency"
+    "Collaboration",
+    "Synchronization",
+    "ShareJS",
+    "Coweb",
+    "Concurrency"
  ],
-  "license": "MIT"
+  "license": "MIT",
+  "ignore": []
 }
--- 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	80ab682b0a	Deploy 11.1.0	2016-05-07 13:20:37 +01:00
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
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