updated npm+bower version to v0.3.1

README.md

@@ -1,23 +1,23 @@
 
-# ![Yatta!](https://dadamonad.github.io/files/layout/y_logo.png)
+# ![Yatta!](https://dadamonad.github.io/files/layout/yjs.svg)
+
 [![Build Status](http://layers.dbis.rwth-aachen.de/jenkins/job/Yatta/badge/icon)](http://layers.dbis.rwth-aachen.de/jenkins/job/Yatta/)
 
-
-Y is a framework for optimistic concurrency control and automatic conflict resolution on arbitrary data types. The framework implements a new OT-like concurrency algorithm and provides similar functionality as [ShareJs] and [OpenCoweb]. Y was designed to take away the pain from concurrently editing complex data types like Text, Json, and XML. For more information you should check out the [website](https://dadamonad.github.io/yjs/)!
+Yjs is a framework for optimistic concurrency control and automatic conflict resolution on arbitrary data types. The framework implements a new OT-like concurrency algorithm and provides similar functionality as [ShareJs] and [OpenCoweb]. Yjs was designed to take away the pain from concurrently editing complex data types like Text, Json, and XML. You can find some applications for this framework [here](https://dadamonad.github.io/yjs/examples/).
 
 In the future, we want to enable users to implement their own collaborative types. Currently we provide data types for
 * Text
 * Json
 * XML
 
-Unlike other frameworks, Y supports P2P message propagation and is not bound to a specific communication protocol. Therefore, Y 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 find a bunch of Connectors in the [Y-Connectors](https://github.com/rwth-acis/y-connectors) repository. Currently supported communication protocols:
+We support several communication protocols as so called *Connectors*. You find a bunch of Connectors in the [y-connectors](https://github.com/rwth-acis/y-connectors) repository. Currently supported communication protocols:
 * [XMPP-Connector](http://xmpp.org) - Propagates updates in a XMPP multi-user-chat room
 * [WebRTC-Connector](http://peerjs.com/) - Propagate updates directly with WebRTC
 * [IWC-Connector](http://dbis.rwth-aachen.de/cms/projects/the-xmpp-experience#interwidget-communication) - Inter-widget Communication
 
-You can use Y client-, and server- side. You can get it as via npm, and bower. We even provide a polymer element for Y!
+You can use Yjs client-, and server- side. You can get it as via npm, and bower. We even provide a polymer element for Yjs!
 
 The theoretical advantages over similar frameworks are support for
 * .. P2P message propagation and arbitrary communication protocols
@@ -26,6 +26,7 @@ The theoretical advantages over similar frameworks are support for
 * .. AnyUndo: Undo *any* action that was executed in constant time (unimplemented)
 * .. Intention Preservation: When working on Text, the intention of your changes are preserved. This is particularily important when working offline.
 
+
 ## Use it!
 You find a tutorial, examples, and documentation on the [website](https://dadamonad.github.io/yjs/).
 
@@ -33,7 +34,7 @@ Either clone this git repository, install it with [bower](http://bower.io/), or
 
 ### Bower
 ```
-bower install yjs
+bower install rwth-acis/yjs
 ```
 Then you include the libraries directly from the installation folder.
 ```
@@ -51,7 +52,7 @@ Y = require("yjs");
 ```
 
 ## Status
-yjs is still in an early development phase. Don't expect that everything is working fine.
+Yjs is still in an early development phase. Don't expect that everything is working fine.
 But I would become really motivated if you gave me some feedback :) ([github](https://github.com/rwth-acis/yjs/issues)).
 
 ### Current Issues
@@ -65,7 +66,7 @@ Please report _any_ issues to the [Github issue page](https://github.com/rwth-ac
 I would appreciate if developers give me feedback on how _convenient_ the framework is, and if it is easy to use. Particularly the XML-support may not support every DOM-methods - if you encounter a method that does not cause any change on other peers, please state function name, and sample parameters. However, there are browser-specific features, that Y won't support.
 
 ## License
-yjs is licensed under the [MIT License](./LICENSE.txt).
+Yjs is licensed under the [MIT License](./LICENSE.txt).
 
 [ShareJs]: https://github.com/share/ShareJS
 [OpenCoweb]: https://github.com/opencoweb/coweb

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "homepage": "https://github.com/DadaMonad/yjs",
   "authors": [
     "Kevin Jahns <kevin.jahns@rwth-aachen.de>"

build/node/ConnectorAdapter.js

@@ -55,14 +55,12 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
   connector.getStateVector = getStateVector;
   connector.getHB = getHB;
   connector.applyHB = applyHB;
-  connector.whenReceiving(function(sender, op) {
+  connector.receive_handlers.push(function(sender, op) {
     if (op.uid.creator !== HB.getUserId()) {
       return engine.applyOp(op);
     }
   });
-  if (connector._whenBoundToY != null) {
-    return connector._whenBoundToY();
-  }
+  return connector.setIsBoundToY();
 };
 
 module.exports = adaptConnector;

build/node/y.js

@@ -17,7 +17,7 @@ createY = function(connector) {
     user_id = connector.id;
   } else {
     user_id = "_temp";
-    connector.whenUserIdSet(function(id) {
+    connector.onUserIdSet(function(id) {
       user_id = id;
       return HB.resetUserId(id);
     });

lib/ConnectorAdapter.coffee

@@ -46,11 +46,10 @@ adaptConnector = (connector, engine, HB, execution_listener)->
   connector.getHB = getHB
   connector.applyHB = applyHB
 
-  connector.whenReceiving (sender, op)->
+  connector.receive_handlers.push (sender, op)->
     if op.uid.creator isnt HB.getUserId()
       engine.applyOp op
 
-  if connector._whenBoundToY?
-    connector._whenBoundToY()
+  connector.setIsBoundToY()
 
 module.exports = adaptConnector

lib/y.coffee

@@ -10,7 +10,7 @@ createY = (connector)->
     user_id = connector.id # TODO: change to getUniqueId()
   else
     user_id = "_temp"
-    connector.whenUserIdSet (id)->
+    connector.onUserIdSet (id)->
       user_id = id
       HB.resetUserId id
   HB = new HistoryBuffer user_id

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.",
   "main": "./build/node/y.js",
   "scripts": {