fixed text binding (enter, utf8 chars..)

there are some cases that may lead to inconsistencies. Currently, only the master-slave method is a reliable sync method

README.md

@@ -12,9 +12,9 @@ In the future, we want to enable users to implement their own collaborative type
 
 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 can create your own connector too - as it is described [here](https://dadamonad.github.io/yjs/connector/Howto-create-your-own-Connector.html). Currently, we support the following 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
+* [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 Yjs client-, and server- side. You can get it as via npm, and bower. We even provide a polymer element for Yjs!
@@ -61,18 +61,21 @@ But I would become really motivated if you gave me some feedback :) ([github](ht
 * Reimplement support for XML as a data type
 * Custom data types
 
-## Support
-Please report _any_ issues to the [Github issue page](https://github.com/rwth-acis/yjs/issues)!
-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.
+
+## Get help
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rwth-acis/yjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+Please report _any_ issues to the [Github issue page](https://github.com/rwth-acis/yjs/issues)! I try to fix them very soon, if possible.
+
+## 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.
 
 ## License
 Yjs is licensed under the [MIT License](./LICENSE.txt).
 
+<kevin.jahns@rwth-aachen.de>
+
 [ShareJs]: https://github.com/share/ShareJS
 [OpenCoweb]: https://github.com/opencoweb/coweb
 
-<kevin.jahns@rwth-aachen.de>
-
-
-
 

bower.json

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

build/README.md

@@ -0,0 +1,11 @@
+
+# Directories
+
+### build/browser
+You find the browserified (not minified) version of yjs here. This is nice for debugging, since it also includes sourcemaps. For production, however, you should use the version that you find in the main directory.
+
+### build/node
+Yjs for nodejs is located here. You can only use the submodules, or require 'y' in your node project. Also works with browserify.
+
+### build/test
+Start build/test/index.html' in your browser, to perform testing Yjs.

build/browser/y-object.html

@@ -0,0 +1,7 @@
+
+<polymer-element name="y-object" hidden attributes="val connector y">
+</polymer-element>
+<polymer-element name="y-property" hidden attributes="val name y">
+</polymer-element>
+
+<script src="./y-object.js"></script>

build/node/ConnectorAdapter.js

@@ -1,9 +1,16 @@
-var adaptConnector;
+var ConnectorClass, adaptConnector;
+
+ConnectorClass = require("./ConnectorClass");
 
 adaptConnector = function(connector, engine, HB, execution_listener) {
-  var applyHB, encode_state_vector, getHB, getStateVector, parse_state_vector, send_;
+  var applyHB, encode_state_vector, f, getHB, getStateVector, name, parse_state_vector, send_;
+  for (name in ConnectorClass) {
+    f = ConnectorClass[name];
+    connector[name] = f;
+  }
+  connector.setIsBoundToY();
   send_ = function(o) {
-    if (o.uid.creator === HB.getUserId() && (typeof o.uid.op_number !== "string")) {
+    if ((o.uid.creator === HB.getUserId()) && (typeof o.uid.op_number !== "string") && (o.uid.doSync === "true" || o.uid.doSync === true) && (HB.getUserId() !== "_temp")) {
       return connector.broadcast(o);
     }
   };
@@ -12,7 +19,7 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
   }
   execution_listener.push(send_);
   encode_state_vector = function(v) {
-    var name, value, _results;
+    var value, _results;
     _results = [];
     for (name in v) {
       value = v[name];
@@ -36,31 +43,29 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
     return encode_state_vector(HB.getOperationCounter());
   };
   getHB = function(v) {
-    var hb, json, o, state_vector, _i, _len;
+    var hb, json, state_vector;
     state_vector = parse_state_vector(v);
     hb = HB._encode(state_vector);
-    for (_i = 0, _len = hb.length; _i < _len; _i++) {
-      o = hb[_i];
-      o.fromHB = "true";
-    }
     json = {
       hb: hb,
       state_vector: encode_state_vector(HB.getOperationCounter())
     };
     return json;
   };
-  applyHB = function(hb) {
-    return engine.applyOp(hb);
+  applyHB = function(hb, fromHB) {
+    return engine.applyOp(hb, fromHB);
   };
   connector.getStateVector = getStateVector;
   connector.getHB = getHB;
   connector.applyHB = applyHB;
-  connector.receive_handlers.push(function(sender, op) {
+  if (connector.receive_handlers == null) {
+    connector.receive_handlers = [];
+  }
+  return connector.receive_handlers.push(function(sender, op) {
     if (op.uid.creator !== HB.getUserId()) {
       return engine.applyOp(op);
     }
   });
-  return connector.setIsBoundToY();
 };
 
 module.exports = adaptConnector;

build/node/ConnectorClass.js

@@ -0,0 +1,355 @@
+module.exports = {
+  init: function(options) {
+    var req;
+    req = (function(_this) {
+      return function(name, choices) {
+        if (options[name] != null) {
+          if ((choices == null) || choices.some(function(c) {
+            return c === options[name];
+          })) {
+            return _this[name] = options[name];
+          } else {
+            throw new Error("You can set the '" + name + "' option to one of the following choices: " + JSON.encode(choices));
+          }
+        } else {
+          throw new Error("You must specify " + name + ", when initializing the Connector!");
+        }
+      };
+    })(this);
+    req("syncMethod", ["syncAll", "master-slave"]);
+    req("role", ["master", "slave"]);
+    req("user_id");
+    if (typeof this.on_user_id_set === "function") {
+      this.on_user_id_set(this.user_id);
+    }
+    if (options.perform_send_again != null) {
+      this.perform_send_again = options.perform_send_again;
+    } else {
+      this.perform_send_again = true;
+    }
+    if (this.role === "master") {
+      this.syncMethod = "syncAll";
+    }
+    this.is_synced = false;
+    this.connections = {};
+    if (this.receive_handlers == null) {
+      this.receive_handlers = [];
+    }
+    this.connections = {};
+    this.current_sync_target = null;
+    this.sent_hb_to_all_users = false;
+    return this.is_initialized = true;
+  },
+  isRoleMaster: function() {
+    return this.role === "master";
+  },
+  isRoleSlave: function() {
+    return this.role === "slave";
+  },
+  findNewSyncTarget: function() {
+    var c, user, _ref;
+    this.current_sync_target = null;
+    if (this.syncMethod === "syncAll") {
+      _ref = this.connections;
+      for (user in _ref) {
+        c = _ref[user];
+        if (!c.is_synced) {
+          this.performSync(user);
+          break;
+        }
+      }
+    }
+    if (this.current_sync_target == null) {
+      this.setStateSynced();
+    }
+    return null;
+  },
+  userLeft: function(user) {
+    delete this.connections[user];
+    return this.findNewSyncTarget();
+  },
+  userJoined: function(user, role) {
+    var _base;
+    if (role == null) {
+      throw new Error("Internal: You must specify the role of the joined user! E.g. userJoined('uid:3939','slave')");
+    }
+    if ((_base = this.connections)[user] == null) {
+      _base[user] = {};
+    }
+    this.connections[user].is_synced = false;
+    if ((!this.is_synced) || this.syncMethod === "syncAll") {
+      if (this.syncMethod === "syncAll") {
+        return this.performSync(user);
+      } else if (role === "master") {
+        return this.performSyncWithMaster(user);
+      }
+    }
+  },
+  whenSynced: function(args) {
+    if (args.constructore === Function) {
+      args = [args];
+    }
+    if (this.is_synced) {
+      return args[0].apply(this, args.slice(1));
+    } else {
+      if (this.compute_when_synced == null) {
+        this.compute_when_synced = [];
+      }
+      return this.compute_when_synced.push(args);
+    }
+  },
+  onReceive: function(f) {
+    return this.receive_handlers.push(f);
+  },
+
+  /*
+   * Broadcast a message to all connected peers.
+   * @param message {Object} The message to broadcast.
+   *
+  broadcast: (message)->
+    throw new Error "You must implement broadcast!"
+  
+   *
+   * Send a message to a peer, or set of peers
+   *
+  send: (peer_s, message)->
+    throw new Error "You must implement send!"
+   */
+  performSync: function(user) {
+    var hb, o, _hb, _i, _len;
+    if (this.current_sync_target == null) {
+      this.current_sync_target = user;
+      this.send(user, {
+        sync_step: "getHB",
+        send_again: "true",
+        data: []
+      });
+      if (!this.sent_hb_to_all_users) {
+        this.sent_hb_to_all_users = true;
+        hb = this.getHB([]).hb;
+        _hb = [];
+        for (_i = 0, _len = hb.length; _i < _len; _i++) {
+          o = hb[_i];
+          _hb.push(o);
+          if (_hb.length > 30) {
+            this.broadcast({
+              sync_step: "applyHB_",
+              data: _hb
+            });
+            _hb = [];
+          }
+        }
+        return this.broadcast({
+          sync_step: "applyHB",
+          data: _hb
+        });
+      }
+    }
+  },
+  performSyncWithMaster: function(user) {
+    var hb, o, _hb, _i, _len;
+    this.current_sync_target = user;
+    this.send(user, {
+      sync_step: "getHB",
+      send_again: "true",
+      data: []
+    });
+    hb = this.getHB([]).hb;
+    _hb = [];
+    for (_i = 0, _len = hb.length; _i < _len; _i++) {
+      o = hb[_i];
+      _hb.push(o);
+      if (_hb.length > 30) {
+        this.broadcast({
+          sync_step: "applyHB_",
+          data: _hb
+        });
+        _hb = [];
+      }
+    }
+    return this.broadcast({
+      sync_step: "applyHB",
+      data: _hb
+    });
+  },
+  setStateSynced: function() {
+    var f, _i, _len, _ref;
+    if (!this.is_synced) {
+      this.is_synced = true;
+      if (this.compute_when_synced != null) {
+        _ref = this.compute_when_synced;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          f = _ref[_i];
+          f();
+        }
+        delete this.compute_when_synced;
+      }
+      return null;
+    }
+  },
+  receiveMessage: function(sender, res) {
+    var data, f, hb, o, sendApplyHB, send_again, _hb, _i, _j, _len, _len1, _ref, _results;
+    if (res.sync_step == null) {
+      _ref = this.receive_handlers;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        f = _ref[_i];
+        _results.push(f(sender, res));
+      }
+      return _results;
+    } else {
+      if (sender === this.user_id) {
+        return;
+      }
+      if (res.sync_step === "getHB") {
+        data = this.getHB(res.data);
+        hb = data.hb;
+        _hb = [];
+        if (this.is_synced) {
+          sendApplyHB = (function(_this) {
+            return function(m) {
+              return _this.send(sender, m);
+            };
+          })(this);
+        } else {
+          sendApplyHB = (function(_this) {
+            return function(m) {
+              return _this.broadcast(m);
+            };
+          })(this);
+        }
+        for (_j = 0, _len1 = hb.length; _j < _len1; _j++) {
+          o = hb[_j];
+          _hb.push(o);
+          if (_hb.length > 30) {
+            sendApplyHB({
+              sync_step: "applyHB_",
+              data: _hb
+            });
+            _hb = [];
+          }
+        }
+        sendApplyHB({
+          sync_step: "applyHB",
+          data: _hb
+        });
+        if ((res.send_again != null) && this.perform_send_again) {
+          send_again = (function(_this) {
+            return function(sv) {
+              return function() {
+                hb = _this.getHB(sv).hb;
+                return _this.send(sender, {
+                  sync_step: "applyHB",
+                  data: hb,
+                  sent_again: "true"
+                });
+              };
+            };
+          })(this)(data.state_vector);
+          return setTimeout(send_again, 3000);
+        }
+      } else if (res.sync_step === "applyHB") {
+        this.applyHB(res.data, sender === this.current_sync_target);
+        if ((this.syncMethod === "syncAll" || (res.sent_again != null)) && (!this.is_synced) && ((this.current_sync_target === sender) || (this.current_sync_target == null))) {
+          this.connections[sender].is_synced = true;
+          return this.findNewSyncTarget();
+        }
+      } else if (res.sync_step === "applyHB_") {
+        return this.applyHB(res.data, sender === this.current_sync_target);
+      }
+    }
+  },
+  parseMessageFromXml: function(m) {
+    var parse_array, parse_object;
+    parse_array = function(node) {
+      var n, _i, _len, _ref, _results;
+      _ref = node.children;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        n = _ref[_i];
+        if (n.getAttribute("isArray") === "true") {
+          _results.push(parse_array(n));
+        } else {
+          _results.push(parse_object(n));
+        }
+      }
+      return _results;
+    };
+    parse_object = function(node) {
+      var int, json, n, name, value, _i, _len, _ref, _ref1;
+      json = {};
+      _ref = node.attrs;
+      for (name in _ref) {
+        value = _ref[name];
+        int = parseInt(value);
+        if (isNaN(int) || ("" + int) !== value) {
+          json[name] = value;
+        } else {
+          json[name] = int;
+        }
+      }
+      _ref1 = node.children;
+      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+        n = _ref1[_i];
+        name = n.name;
+        if (n.getAttribute("isArray") === "true") {
+          json[name] = parse_array(n);
+        } else {
+          json[name] = parse_object(n);
+        }
+      }
+      return json;
+    };
+    return parse_object(m);
+  },
+  encodeMessageToXml: function(m, json) {
+    var encode_array, encode_object;
+    encode_object = function(m, json) {
+      var name, value;
+      for (name in json) {
+        value = json[name];
+        if (value == null) {
+
+        } else if (value.constructor === Object) {
+          encode_object(m.c(name), value);
+        } else if (value.constructor === Array) {
+          encode_array(m.c(name), value);
+        } else {
+          m.setAttribute(name, value);
+        }
+      }
+      return m;
+    };
+    encode_array = function(m, array) {
+      var e, _i, _len;
+      m.setAttribute("isArray", "true");
+      for (_i = 0, _len = array.length; _i < _len; _i++) {
+        e = array[_i];
+        if (e.constructor === Object) {
+          encode_object(m.c("array-element"), e);
+        } else {
+          encode_array(m.c("array-element"), e);
+        }
+      }
+      return m;
+    };
+    if (json.constructor === Object) {
+      return encode_object(m.c("y", {
+        xmlns: "http://y.ninja/connector-stanza"
+      }), json);
+    } else if (json.constructor === Array) {
+      return encode_array(m.c("y", {
+        xmlns: "http://y.ninja/connector-stanza"
+      }), json);
+    } else {
+      throw new Error("I can't encode this json!");
+    }
+  },
+  setIsBoundToY: function() {
+    if (typeof this.on_bound_to_y === "function") {
+      this.on_bound_to_y();
+    }
+    delete this.when_bound_to_y;
+    return this.is_bound_to_y = true;
+  }
+};

build/node/Engine.js

@@ -59,13 +59,19 @@ Engine = (function() {
     return this.applyOp(ops_json);
   };
 
-  Engine.prototype.applyOp = function(op_json_array) {
+  Engine.prototype.applyOp = function(op_json_array, fromHB) {
     var o, op_json, _i, _len;
+    if (fromHB == null) {
+      fromHB = false;
+    }
     if (op_json_array.constructor !== Array) {
       op_json_array = [op_json_array];
     }
     for (_i = 0, _len = op_json_array.length; _i < _len; _i++) {
       op_json = op_json_array[_i];
+      if (fromHB) {
+        op_json.fromHB = "true";
+      }
       o = this.parseOperation(op_json);
       if (op_json.fromHB != null) {
         o.fromHB = op_json.fromHB;

build/node/HistoryBuffer.js

@@ -22,7 +22,12 @@ HistoryBuffer = (function() {
     if (own != null) {
       for (o_name in own) {
         o = own[o_name];
-        o.uid.creator = id;
+        if (o.uid.creator != null) {
+          o.uid.creator = id;
+        }
+        if (o.uid.alt != null) {
+          o.uid.alt.creator = id;
+        }
       }
       if (this.buffer[id] != null) {
         throw new Error("You are re-assigning an old user id - this is not (yet) possible!");
@@ -30,8 +35,10 @@ HistoryBuffer = (function() {
       this.buffer[id] = own;
       delete this.buffer[this.user_id];
     }
-    this.operation_counter[id] = this.operation_counter[this.user_id];
-    delete this.operation_counter[this.user_id];
+    if (this.operation_counter[this.user_id] != null) {
+      this.operation_counter[id] = this.operation_counter[this.user_id];
+      delete this.operation_counter[this.user_id];
+    }
     return this.user_id = id;
   };
 
@@ -138,7 +145,7 @@ HistoryBuffer = (function() {
       user = _ref[u_name];
       for (o_number in user) {
         o = user[o_number];
-        if (o.uid.doSync && unknown(u_name, o_number)) {
+        if ((o.uid.noOperation == null) && o.uid.doSync && unknown(u_name, o_number)) {
           o_json = o._encode();
           if (o.next_cl != null) {
             o_next = o.next_cl;
@@ -221,7 +228,7 @@ HistoryBuffer = (function() {
     _results = [];
     for (user in state_vector) {
       state = state_vector[user];
-      if ((this.operation_counter[user] == null) || (this.operation_counter[user] < state_vector[user])) {
+      if (((this.operation_counter[user] == null) || (this.operation_counter[user] < state_vector[user])) && (state_vector[user] != null)) {
         _results.push(this.operation_counter[user] = state_vector[user]);
       } else {
         _results.push(void 0);

build/node/Types/BasicTypes.js

@@ -88,10 +88,18 @@ module.exports = function(HB) {
     };
 
     Operation.prototype.getUid = function() {
+      var map_uid;
       if (this.uid.noOperation == null) {
         return this.uid;
       } else {
-        return this.uid.alt;
+        if (this.uid.alt != null) {
+          map_uid = this.uid.alt.cloneUid();
+          map_uid.sub = this.uid.sub;
+          map_uid.doSync = false;
+          return map_uid;
+        } else {
+          return void 0;
+        }
       }
     };
 

build/node/Types/StructuredTypes.js

@@ -66,17 +66,16 @@ module.exports = function(HB) {
     };
 
     MapManager.prototype.retrieveSub = function(property_name) {
-      var event_properties, event_this, map_uid, rm, rm_uid;
+      var event_properties, event_this, rm, rm_uid;
       if (this.map[property_name] == null) {
         event_properties = {
           name: property_name
         };
         event_this = this;
-        map_uid = this.cloneUid();
-        map_uid.sub = property_name;
         rm_uid = {
           noOperation: true,
-          alt: map_uid
+          sub: property_name,
+          alt: this
         };
         rm = new types.ReplaceManager(event_properties, event_this, rm_uid);
         this.map[property_name] = rm;
@@ -138,7 +137,7 @@ module.exports = function(HB) {
       while (true) {
         if (o instanceof types.Delimiter && (o.prev_cl != null)) {
           o = o.prev_cl;
-          while (o.isDeleted() || !(o instanceof types.Delimiter)) {
+          while (o.isDeleted() && (o.prev_cl != null)) {
             o = o.prev_cl;
           }
           break;

build/node/Types/TextTypes.js

@@ -71,7 +71,7 @@ module.exports = function(HB) {
       if (((_ref = this.content) != null ? _ref.getUid : void 0) != null) {
         json['content'] = this.content.getUid();
       } else {
-        json['content'] = this.content;
+        json['content'] = JSON.stringify(this.content);
       }
       return json;
     };
@@ -82,6 +82,9 @@ module.exports = function(HB) {
   types.TextInsert.parse = function(json) {
     var content, next, origin, parent, prev, uid;
     content = json['content'], uid = json['uid'], prev = json['prev'], next = json['next'], origin = json['origin'], parent = json['parent'];
+    if (typeof content === "string") {
+      content = JSON.parse(content);
+    }
     return new types.TextInsert(content, uid, prev, next, origin, parent);
   };
   types.Array = (function(_super) {
@@ -322,20 +325,23 @@ module.exports = function(HB) {
         };
       } else {
         createRange = function(fix) {
-          var clength, left, right, s;
+          var clength, edited_element, range, s;
+          range = {};
           s = dom_root.getSelection();
           clength = textfield.textContent.length;
-          left = Math.min(s.anchorOffset, clength);
-          right = Math.min(s.focusOffset, clength);
+          range.left = Math.min(s.anchorOffset, clength);
+          range.right = Math.min(s.focusOffset, clength);
           if (fix != null) {
-            left = fix(left);
-            right = fix(right);
+            range.left = fix(range.left);
+            range.right = fix(range.right);
           }
-          return {
-            left: left,
-            right: right,
-            isReal: true
-          };
+          edited_element = s.focusNode;
+          if (edited_element === textfield || edited_element === textfield.childNodes[0]) {
+            range.isReal = true;
+          } else {
+            range.isReal = false;
+          }
+          return range;
         };
         writeRange = function(range) {
           var r, s, textnode;
@@ -359,14 +365,20 @@ module.exports = function(HB) {
           }
         };
         writeContent = function(content) {
-          var append;
-          append = "";
-          if (content[content.length - 1] === " ") {
-            content = content.slice(0, content.length - 1);
-            append = ' ';
+          var c, content_array, i, _j, _len1, _results;
+          content_array = content.replace(new RegExp("\n", 'g'), " ").split(" ");
+          textfield.innerText = "";
+          _results = [];
+          for (i = _j = 0, _len1 = content_array.length; _j < _len1; i = ++_j) {
+            c = content_array[i];
+            textfield.innerText += c;
+            if (i !== content_array.length - 1) {
+              _results.push(textfield.innerHTML += '&nbsp;');
+            } else {
+              _results.push(void 0);
+            }
           }
-          textfield.textContent = content;
-          return textfield.innerHTML += append;
+          return _results;
         };
       }
       writeContent(this.val());
@@ -417,11 +429,11 @@ module.exports = function(HB) {
         }
         creator_token = true;
         char = null;
-        if (event.key != null) {
+        if (event.keyCode === 13) {
+          char = '\n';
+        } else if (event.key != null) {
           if (event.charCode === 32) {
             char = " ";
-          } else if (event.keyCode === 13) {
-            char = '\n';
           } else {
             char = event.key;
           }

build/node/y.js

@@ -13,14 +13,14 @@ adaptConnector = require("./ConnectorAdapter");
 createY = function(connector) {
   var HB, Y, type_manager, types, user_id;
   user_id = null;
-  if (connector.id != null) {
-    user_id = connector.id;
+  if (connector.user_id != null) {
+    user_id = connector.user_id;
   } else {
     user_id = "_temp";
-    connector.onUserIdSet(function(id) {
+    connector.on_user_id_set = function(id) {
       user_id = id;
       return HB.resetUserId(id);
-    });
+    };
   }
   HB = new HistoryBuffer(user_id);
   type_manager = json_types_uninitialized(HB);

build/test/index.html

@@ -1,7 +1,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Test Yatta!</title>
+  <title>Test Yjs!</title>
     <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
 </head>
 <body>
@@ -13,9 +13,9 @@
     mocha.ui('bdd');
     mocha.reporter('html');
   </script>
-  <script src="TextYatta_test.js"></script>
-  <script src="JsonYatta_test.js"></script>
-  <!--script src="XmlYatta_test_browser.js"></script-->
+  <script src="Text_test.js"></script>
+  <script src="Json_test.js"></script>
+  <!--script src="Xml_test_browser.js"></script-->
   <script>
     //mocha.checkLeaks();
     //mocha.run();

examples/README.md

@@ -1,5 +1,5 @@
 # Examples
 
-Here you find some (hopefully) usefull examples on how to use Yatta!
+Here you find some (hopefully) usefull examples on how to use Yjs!
 
-Please note, that the XMPP Connector is the best supported Connector at the moment.
+Feel free to use the code of the examples in your own project. They include basic examples how to use Yjs.

examples/WebRTC-Polymer/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <meta charset=utf-8 />
+    <title>Y Example</title>
+    <script src="../../../webcomponentsjs/webcomponents.min.js"></script>
+    <link rel="import" href="../../../polymer/polymer.html">
+
+    <link rel="import" href="y-test.html">
+  </head>
+  <body>
+    <y-test></y-test>
+    <p> This example tests a few things like Late Join, the synchronization process while editing, and if the Connector and Yjs work together as Polymer elements. you can use this example as a starting point for your own Polymer project too. </p>
+  </body>
+</html>

examples/WebRTC-Polymer/y-test.html

@@ -0,0 +1,55 @@
+<link rel="import" href="../../build/browser/y-object.html">
+<link rel="import" href="../../../y-webrtc/build/browser/y-webrtc.html">
+<link rel="import" href="../../../paper-slider/paper-slider.html">
+
+<polymer-element name="y-test" attributes="y connector stuff">
+  <template>
+    <h1 id="text" contentEditable> Check this out !</h1>
+    <y-webrtc id="connector" connector={{connector}} room="testy-webrtc-polymer" debug="true"></y-webrtc>
+    <y-object connector={{connector}} val={{y}}>
+      <y-property name="slider" val={{slider}}>
+      </y-property>
+      <y-property name="stuff" val={{stuff}}>
+        <y-property id="otherstuff" name="otherstuff" val={{otherstuff}}>
+        </y-property>
+      </y-property>
+    </y-object>
+    <y-object val={{otherstuff}}>
+      <y-property name="nostuff" val={{nostuff}}>
+      </y-property>
+    </y-object>
+    <paper-slider min="0" max="200" immediateValue={{slider}}></paper-slider>
+  </template>
+  <script>
+  Polymer({
+    ready: function(){
+      window.y_stuff_property = this.$.otherstuff;
+      this.y.val("slider",50)
+      var that = this;
+      this.connector.whenSynced(function(){
+        if(that.y.val("text") == null){
+          that.y.val("text","stuff","mutable");
+        }
+        that.y.val("text").bind(that.$.text,that.shadowRoot)
+      })
+
+      // Everything is initialized. Lets test stuff!
+      window.y_test = this;
+      window.y_test.y.val("stuff",{otherstuff:{nostuff:"this is no stuff"}})
+      setTimeout(function(){
+        var res = y_test.y.val("stuff");
+        if(!(y_test.nostuff === "this is no stuff")){
+          console.log("Deep inherit doesn't work!")
+        }
+        window.y_stuff_property.val = {nostuff: "this is also no stuff"};
+        setTimeout(function(){
+          if(!(y_test.nostuff === "this is also no stuff")){
+            console.log("Element val overwrite doesn't work")
+          }
+          console.log("Everything is fine :)");
+        },500)
+      },500);
+    }
+  })
+  </script>
+</polymer-element>

examples/WebRTC/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+        <meta charset=utf-8 />
+        <title>Y Example</title>
+        <script src="../../build/browser/y.js"></script>
+        <script src="../../../y-webrtc/build/browser/y-webrtc.js"></script>
+        <script src="./index.js"></script>
+</head>
+<body>
+<h1 contentEditable> yjs Tutorial</h1>
+<p> Collaborative Json editing with <a href="https://github.com/rwth-acis/yjs/">yjs</a>
+and WebRTC Connector. </p>
+
+<textarea style="width:80%;" rows=40 id="textfield"></textarea>
+
+<p> <a href="https://github.com/rwth-acis/yjs/">yjs</a> is a Framework for Real-Time collaboration on arbitrary data types.
+</p>
+</body>
+</html>

examples/WebRTC/index.js

@@ -0,0 +1,27 @@
+
+
+connector = new Y.WebRTC("testy", {debug: true});
+
+connector.debug = true
+
+y = new Y(connector);
+
+window.onload = function(){
+  var textbox = document.getElementById("textfield");
+  y.observe(function(events){
+    for(var i=0; i<events.length; i++){
+      var event = events[i];
+      if(event.name === "textfield" && event.type !== "delete"){
+        y.val("textfield").bind(textbox);
+        y.val("headline").bind(document.querySelector("h1"))
+      }
+    }
+  });
+  connector.whenSynced(function(){
+    if(y.val("textfield") == null){
+      y.val("headline","headline", "mutable");
+      y.val("textfield","stuff", "mutable")
+    }
+  })
+
+};

examples/XMPP-Polymer/index.html

@@ -10,6 +10,5 @@
   </head>
   <body>
     <y-test></y-test>
-    <script src="./index.js"></script>
   </body>
 </html>

examples/XMPP-Polymer/index.js

@@ -1,19 +0,0 @@
-
-setTimeout(function(){
-  window.y_test = document.querySelector("y-test");
-
-  window.y_test.y.val("stuff",{otherstuff:{nostuff:"this is no stuff"}})
-  setTimeout(function(){
-    var res = y_test.y.val("stuff");
-    if(!(y_test.nostuff === "this is no stuff")){
-      console.log("Deep inherit doesn't work!")
-    }
-    window.y_stuff_property.val = {nostuff: "this is also no stuff"};
-    setTimeout(function(){
-      if(!(y_test.nostuff === "this is also no stuff")){
-        console.log("Element val overwrite doesn't work")
-      }
-      console.log("Everything is fine :)");
-    },500)
-  },500);
-},3000)

examples/XMPP-Polymer/y-test.html

@@ -1,11 +1,11 @@
-<link rel="import" href="../../y-object.html">
-<link rel="import" href="../../../y-connectors/y-xmpp/y-xmpp.html">
+<link rel="import" href="../../build/browser/y-object.html">
+<link rel="import" href="../../../y-xmpp/build/browser/y-xmpp.html">
 <link rel="import" href="../../../paper-slider/paper-slider.html">
 
 <polymer-element name="y-test" attributes="y connector stuff">
   <template>
     <h1 id="text" contentEditable> Check this out !</h1>
-    <y-xmpp id="connector" connector={{connector}} room="testy-xmpp-polymer"></y-xmpp>
+    <y-xmpp id="connector" connector={{connector}} room="testy-xmpp-polymer" syncMode="syncAll" debug="true"></y-xmpp>
     <y-object connector={{connector}} val={{y}}>
       <y-property name="slider" val={{slider}}>
       </y-property>
@@ -32,6 +32,23 @@
         }
         that.y.val("text").bind(that.$.text,that.shadowRoot)
       })
+
+      // Everything is initialized. Lets test stuff!
+      window.y_test = this;
+      window.y_test.y.val("stuff",{otherstuff:{nostuff:"this is no stuff"}})
+      setTimeout(function(){
+        var res = y_test.y.val("stuff");
+        if(!(y_test.nostuff === "this is no stuff")){
+          console.log("Deep inherit doesn't work!")
+        }
+        window.y_stuff_property.val = {nostuff: "this is also no stuff"};
+        setTimeout(function(){
+          if(!(y_test.nostuff === "this is also no stuff")){
+            console.log("Element val overwrite doesn't work")
+          }
+          console.log("Everything is fine :)");
+        },500)
+      },500);
     }
   })
   </script>

examples/XMPP/index.html

@@ -4,7 +4,7 @@
         <meta charset=utf-8 />
         <title>Y Example</title>
         <script src="../../build/browser/y.js"></script>
-        <script src="../../../y-connectors/y-xmpp/y-xmpp.js"></script>
+        <script src="../../../y-xmpp/y-xmpp.js"></script>
         <script src="./index.js"></script>
 </head>
 <body>

examples/XMPP/index.js

@@ -1,6 +1,6 @@
 
 
-connector = new Y.XMPP("testy-xmpp-json2");
+connector = new Y.XMPP().join("testy-xmpp-json3", {syncMode: "syncAll"});
 connector.debug = true
 
 y = new Y(connector);

lib/ConnectorAdapter.coffee

@@ -1,13 +1,22 @@
 
-
+ConnectorClass = require "./ConnectorClass"
 #
 # @param {Engine} engine The transformation engine
 # @param {HistoryBuffer} HB
 # @param {Array<Function>} execution_listener You must ensure that whenever an operation is executed, every function in this Array is called.
 #
 adaptConnector = (connector, engine, HB, execution_listener)->
+
+  for name, f of ConnectorClass
+    connector[name] = f
+
+  connector.setIsBoundToY()
+
   send_ = (o)->
-    if o.uid.creator is HB.getUserId() and (typeof o.uid.op_number isnt "string")
+    if (o.uid.creator is HB.getUserId()) and
+        (typeof o.uid.op_number isnt "string") and # TODO: i don't think that we need this anymore..
+        (o.uid.doSync is "true" or o.uid.doSync is true) and # TODO: ensure, that only true is valid
+        (HB.getUserId() isnt "_temp")
       connector.broadcast o
 
   if connector.invokeSync?
@@ -32,24 +41,22 @@ adaptConnector = (connector, engine, HB, execution_listener)->
   getHB = (v)->
     state_vector = parse_state_vector v
     hb = HB._encode state_vector
-    for o in hb
-      o.fromHB = "true" # execute immediately
     json =
       hb: hb
       state_vector: encode_state_vector HB.getOperationCounter()
     json
 
-  applyHB = (hb)->
-    engine.applyOp hb
+  applyHB = (hb, fromHB)->
+    engine.applyOp hb, fromHB
 
   connector.getStateVector = getStateVector
   connector.getHB = getHB
   connector.applyHB = applyHB
 
+  connector.receive_handlers ?= []
   connector.receive_handlers.push (sender, op)->
     if op.uid.creator isnt HB.getUserId()
       engine.applyOp op
 
-  connector.setIsBoundToY()
 
 module.exports = adaptConnector

lib/ConnectorClass.coffee

@@ -0,0 +1,316 @@
+
+module.exports =
+  #
+  # @params new Connector(options)
+  #   @param options.syncMethod {String}  is either "syncAll" or "master-slave".
+  #   @param options.role {String} The role of this client
+  #            (slave or master (only used when syncMethod is master-slave))
+  #   @param options.perform_send_again {Boolean} Whetehr to whether to resend the HB after some time period. This reduces sync errors, but has some overhead (optional)
+  #
+  init: (options)->
+    req = (name, choices)=>
+      if options[name]?
+        if (not choices?) or choices.some((c)->c is options[name])
+          @[name] = options[name]
+        else
+          throw new Error "You can set the '"+name+"' option to one of the following choices: "+JSON.encode(choices)
+      else
+        throw new Error "You must specify "+name+", when initializing the Connector!"
+
+    req "syncMethod", ["syncAll", "master-slave"]
+    req "role", ["master", "slave"]
+    req "user_id"
+    @on_user_id_set?(@user_id)
+
+    # whether to resend the HB after some time period. This reduces sync errors.
+    # But this is not necessary in the test-connector
+    if options.perform_send_again?
+      @perform_send_again = options.perform_send_again
+    else
+      @perform_send_again = true
+
+    # A Master should sync with everyone! TODO: really? - for now its safer this way!
+    if @role is "master"
+      @syncMethod = "syncAll"
+
+    # is set to true when this is synced with all other connections
+    @is_synced = false
+    # Peerjs Connections: key: conn-id, value: object
+    @connections = {}
+    # List of functions that shall process incoming data
+    @receive_handlers ?= []
+
+    # whether this instance is bound to any y instance
+    @connections = {}
+    @current_sync_target = null
+    @sent_hb_to_all_users = false
+    @is_initialized = true
+
+  isRoleMaster: ->
+    @role is "master"
+
+  isRoleSlave: ->
+    @role is "slave"
+
+  findNewSyncTarget: ()->
+    @current_sync_target = null
+    if @syncMethod is "syncAll"
+      for user, c of @connections
+        if not c.is_synced
+          @performSync user
+          break
+    if not @current_sync_target?
+      @setStateSynced()
+    null
+
+  userLeft: (user)->
+    delete @connections[user]
+    @findNewSyncTarget()
+
+  userJoined: (user, role)->
+    if not role?
+      throw new Error "Internal: You must specify the role of the joined user! E.g. userJoined('uid:3939','slave')"
+    # a user joined the room
+    @connections[user] ?= {}
+    @connections[user].is_synced = false
+
+    if (not @is_synced) or @syncMethod is "syncAll"
+      if @syncMethod is "syncAll"
+        @performSync user
+      else if role is "master"
+        # TODO: What if there are two masters? Prevent sending everything two times!
+        @performSyncWithMaster user
+
+
+  #
+  # Execute a function _when_ we are connected. If not connected, wait until connected.
+  # @param f {Function} Will be executed on the PeerJs-Connector context.
+  #
+  whenSynced: (args)->
+    if args.constructore is Function
+      args = [args]
+    if @is_synced
+      args[0].apply this, args[1..]
+    else
+      @compute_when_synced ?= []
+      @compute_when_synced.push args
+
+  #
+  # Execute an function when a message is received.
+  # @param f {Function} Will be executed on the PeerJs-Connector context. f will be called with (sender_id, broadcast {true|false}, message).
+  #
+  onReceive: (f)->
+    @receive_handlers.push f
+
+  ###
+  # Broadcast a message to all connected peers.
+  # @param message {Object} The message to broadcast.
+  #
+  broadcast: (message)->
+    throw new Error "You must implement broadcast!"
+
+  #
+  # Send a message to a peer, or set of peers
+  #
+  send: (peer_s, message)->
+    throw new Error "You must implement send!"
+  ###
+
+  #
+  # perform a sync with a specific user.
+  #
+  performSync: (user)->
+    if not @current_sync_target?
+      @current_sync_target = user
+      @send user,
+        sync_step: "getHB"
+        send_again: "true"
+        data: [] # @getStateVector()
+      if not @sent_hb_to_all_users
+        @sent_hb_to_all_users = true
+
+        hb = @getHB([]).hb
+        _hb = []
+        for o in hb
+          _hb.push o
+          if _hb.length > 30
+            @broadcast
+              sync_step: "applyHB_"
+              data: _hb
+            _hb = []
+        @broadcast
+          sync_step: "applyHB"
+          data: _hb
+
+
+
+  #
+  # When a master node joined the room, perform this sync with him. It will ask the master for the HB,
+  # and will broadcast his own HB
+  #
+  performSyncWithMaster: (user)->
+    @current_sync_target = user
+    @send user,
+      sync_step: "getHB"
+      send_again: "true"
+      data: []
+    hb = @getHB([]).hb
+    _hb = []
+    for o in hb
+      _hb.push o
+      if _hb.length > 30
+        @broadcast
+          sync_step: "applyHB_"
+          data: _hb
+        _hb = []
+    @broadcast
+      sync_step: "applyHB"
+      data: _hb
+
+  #
+  # You are sure that all clients are synced, call this function.
+  #
+  setStateSynced: ()->
+    if not @is_synced
+      @is_synced = true
+      if @compute_when_synced?
+        for f in @compute_when_synced
+          f()
+        delete @compute_when_synced
+      null
+
+  #
+  # You received a raw message, and you know that it is intended for to Yjs. Then call this function.
+  #
+  receiveMessage: (sender, res)->
+    if not res.sync_step?
+      for f in @receive_handlers
+        f sender, res
+    else
+      if sender is @user_id
+        return
+      if res.sync_step is "getHB"
+        data = @getHB(res.data)
+        hb = data.hb
+        _hb = []
+        # always broadcast, when not synced.
+        # This reduces errors, when the clients goes offline prematurely.
+        # When this client only syncs to one other clients, but looses connectors,
+        # before syncing to the other clients, the online clients have different states.
+        # Since we do not want to perform regular syncs, this is a good alternative
+        if @is_synced
+          sendApplyHB = (m)=>
+            @send sender, m
+        else
+          sendApplyHB = (m)=>
+            @broadcast m
+
+        for o in hb
+          _hb.push o
+          if _hb.length > 30
+            sendApplyHB
+              sync_step: "applyHB_"
+              data: _hb
+            _hb = []
+
+        sendApplyHB
+          sync_step : "applyHB"
+          data: _hb
+
+        if res.send_again? and @perform_send_again
+          send_again = do (sv = data.state_vector)=>
+            ()=>
+              hb = @getHB(sv).hb
+              @send sender,
+                sync_step: "applyHB",
+                data: hb
+                sent_again: "true"
+          setTimeout send_again, 3000
+      else if res.sync_step is "applyHB"
+        @applyHB(res.data, sender is @current_sync_target)
+
+        if (@syncMethod is "syncAll" or res.sent_again?) and (not @is_synced) and ((@current_sync_target is sender) or (not @current_sync_target?))
+          @connections[sender].is_synced = true
+          @findNewSyncTarget()
+
+      else if res.sync_step is "applyHB_"
+        @applyHB(res.data, sender is @current_sync_target)
+
+
+  # Currently, the HB encodes operations as JSON. For the moment I want to keep it
+  # that way. Maybe we support encoding in the HB as XML in the future, but for now I don't want
+  # too much overhead. Y is very likely to get changed a lot in the future
+  #
+  # Because we don't want to encode JSON as string (with character escaping, wich makes it pretty much unreadable)
+  # we encode the JSON as XML.
+  #
+  # When the HB support encoding as XML, the format should look pretty much like this.
+
+  # does not support primitive values as array elements
+  # expects an ltx (less than xml) object
+  parseMessageFromXml: (m)->
+    parse_array = (node)->
+      for n in node.children
+        if n.getAttribute("isArray") is "true"
+          parse_array n
+        else
+          parse_object n
+
+    parse_object = (node)->
+      json = {}
+      for name, value  of node.attrs
+        int = parseInt(value)
+        if isNaN(int) or (""+int) isnt value
+          json[name] = value
+        else
+          json[name] = int
+      for n in node.children
+        name = n.name
+        if n.getAttribute("isArray") is "true"
+          json[name] = parse_array n
+        else
+          json[name] = parse_object n
+      json
+    parse_object m
+
+  # encode message in xml
+  # we use string because Strophe only accepts an "xml-string"..
+  # So {a:4,b:{c:5}} will look like
+  # <y a="4">
+  #   <b c="5"></b>
+  # </y>
+  # m - ltx element
+  # json - guess it ;)
+  #
+  encodeMessageToXml: (m, json)->
+    # attributes is optional
+    encode_object = (m, json)->
+      for name,value of json
+        if not value?
+          # nop
+        else if value.constructor is Object
+          encode_object m.c(name), value
+        else if value.constructor is Array
+          encode_array m.c(name), value
+        else
+          m.setAttribute(name,value)
+      m
+    encode_array = (m, array)->
+      m.setAttribute("isArray","true")
+      for e in array
+        if e.constructor is Object
+          encode_object m.c("array-element"), e
+        else
+          encode_array m.c("array-element"), e
+      m
+    if json.constructor is Object
+      encode_object m.c("y",{xmlns:"http://y.ninja/connector-stanza"}), json
+    else if json.constructor is Array
+      encode_array m.c("y",{xmlns:"http://y.ninja/connector-stanza"}), json
+    else
+      throw new Error "I can't encode this json!"
+
+  setIsBoundToY: ()->
+    @on_bound_to_y?()
+    delete @when_bound_to_y
+    @is_bound_to_y = true

lib/Engine.coffee

@@ -61,10 +61,12 @@ class Engine
   # TODO: make this more efficient!!
   # - operations may only executed in order by creator, order them in object of arrays (key by creator)
   # - you can probably make something like dependencies (creator1 waits for creator2)
-  applyOp: (op_json_array)->
+  applyOp: (op_json_array, fromHB = false)->
     if op_json_array.constructor isnt Array
       op_json_array = [op_json_array]
     for op_json in op_json_array
+      if fromHB
+        op_json.fromHB = "true" # execute immediately, if 
       # $parse_and_execute will return false if $o_json was parsed and executed, otherwise the parsed operadion
       o = @parseOperation op_json
       if op_json.fromHB?

lib/HistoryBuffer.coffee

@@ -26,14 +26,17 @@ class HistoryBuffer
     own = @buffer[@user_id]
     if own?
       for o_name,o of own
-        o.uid.creator = id
+        if o.uid.creator?
+          o.uid.creator = id
+        if o.uid.alt?
+          o.uid.alt.creator = id
       if @buffer[id]?
         throw new Error "You are re-assigning an old user id - this is not (yet) possible!"
       @buffer[id] = own
       delete @buffer[@user_id]
-
-    @operation_counter[id] = @operation_counter[@user_id]
-    delete @operation_counter[@user_id]
+    if @operation_counter[@user_id]?
+      @operation_counter[id] = @operation_counter[@user_id]
+      delete @operation_counter[@user_id]
     @user_id = id
 
   emptyGarbage: ()=>
@@ -114,7 +117,7 @@ class HistoryBuffer
     for u_name,user of @buffer
       # TODO next, if @state_vector[user] <= state_vector[user]
       for o_number,o of user
-        if o.uid.doSync and unknown(u_name, o_number)
+        if (not o.uid.noOperation?) and o.uid.doSync and unknown(u_name, o_number)
           # its necessary to send it, and not known in state_vector
           o_json = o._encode()
           if o.next_cl? # applies for all ops but the most right delimiter!
@@ -196,7 +199,7 @@ class HistoryBuffer
   # you renew your own state_vector to the state_vector of the other user
   renewStateVector: (state_vector)->
     for user,state of state_vector
-      if (not @operation_counter[user]?) or (@operation_counter[user] < state_vector[user])
+      if ((not @operation_counter[user]?) or (@operation_counter[user] < state_vector[user])) and state_vector[user]?
         @operation_counter[user] = state_vector[user]
 
   #

lib/Types/BasicTypes.coffee

@@ -111,7 +111,13 @@ module.exports = (HB)->
       if not @uid.noOperation?
         @uid
       else
-        @uid.alt # could be (safely) undefined
+        if @uid.alt? # could be (safely) undefined
+          map_uid = @uid.alt.cloneUid()
+          map_uid.sub = @uid.sub
+          map_uid.doSync = false
+          map_uid
+        else
+          undefined
 
     cloneUid: ()->
       uid = {}

lib/Types/StructuredTypes.coffee

@@ -56,11 +56,10 @@ module.exports = (HB)->
         event_properties =
           name: property_name
         event_this = @
-        map_uid = @cloneUid()
-        map_uid.sub = property_name
         rm_uid =
           noOperation: true
-          alt: map_uid
+          sub: property_name
+          alt: @
         rm = new types.ReplaceManager event_properties, event_this, rm_uid # this operation shall not be saved in the HB
         @map[property_name] = rm
         rm.setParent @, property_name
@@ -132,7 +131,7 @@ module.exports = (HB)->
           # for the current array. Therefore we reach a Delimiter.
           # Then, we'll just return the last character.
           o = o.prev_cl
-          while o.isDeleted() or not (o instanceof types.Delimiter)
+          while o.isDeleted() and o.prev_cl?
             o = o.prev_cl
           break
         if position <= 0 and not o.isDeleted()

lib/Types/TextTypes.coffee

@@ -75,7 +75,7 @@ module.exports = (HB)->
       if @content?.getUid?
         json['content'] = @content.getUid()
       else
-        json['content'] = @content
+        json['content'] = JSON.stringify @content
       json
 
   types.TextInsert.parse = (json)->
@@ -87,6 +87,8 @@ module.exports = (HB)->
       'origin' : origin
       'parent' : parent
     } = json
+    if typeof content is "string"
+      content = JSON.parse(content)
     new types.TextInsert content, uid, prev, next, origin, parent
 
 
@@ -315,18 +317,21 @@ module.exports = (HB)->
           textfield.value = content
       else
         createRange = (fix)->
+          range = {}
           s = dom_root.getSelection()
           clength = textfield.textContent.length
-          left = Math.min s.anchorOffset, clength
-          right = Math.min s.focusOffset, clength
+          range.left = Math.min s.anchorOffset, clength
+          range.right = Math.min s.focusOffset, clength
           if fix?
-            left = fix left
-            right = fix right
-          {
-            left: left
-            right: right
-            isReal: true
-          }
+            range.left = fix range.left
+            range.right = fix range.right
+
+          edited_element = s.focusNode
+          if edited_element is textfield or edited_element is textfield.childNodes[0]
+            range.isReal = true
+          else
+            range.isReal = false
+          range
 
         writeRange = (range)->
           writeContent word.val()
@@ -345,12 +350,12 @@ module.exports = (HB)->
             s.removeAllRanges()
             s.addRange(r)
         writeContent = (content)->
-          append = ""
-          if content[content.length - 1] is " "
-            content = content.slice(0,content.length-1)
-            append = ' '
-          textfield.textContent = content
-          textfield.innerHTML += append
+          content_array = content.replace(new RegExp("\n",'g')," ").split(" ")
+          textfield.innerText = ""
+          for c, i in content_array
+            textfield.innerText += c
+            if i isnt content_array.length-1
+              textfield.innerHTML += ' '
 
       writeContent this.val()
 
@@ -387,11 +392,11 @@ module.exports = (HB)->
           return true
         creator_token = true
         char = null
-        if event.key?
+        if event.keyCode is 13
+          char = '\n'
+        else if event.key?
           if event.charCode is 32
             char = " "
-          else if event.keyCode is 13
-            char = '\n'
           else
             char = event.key
         else

lib/y.coffee

@@ -6,11 +6,11 @@ adaptConnector = require "./ConnectorAdapter"
 
 createY = (connector)->
   user_id = null
-  if connector.id?
-    user_id = connector.id # TODO: change to getUniqueId()
+  if connector.user_id?
+    user_id = connector.user_id # TODO: change to getUniqueId()
   else
     user_id = "_temp"
-    connector.onUserIdSet (id)->
+    connector.on_user_id_set = (id)->
       user_id = id
       HB.resetUserId id
   HB = new HistoryBuffer user_id

package.json

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

test/Json_test.coffee

@@ -7,7 +7,7 @@ _         = require("underscore")
 
 chai.use(sinonChai)
 
-Connector = require "../../y-connectors/lib/y-test/y-test.coffee"
+Connector = require "../../y-test/lib/y-test.coffee"
 Y = require "../lib/y.coffee"
 
 Test = require "./TestSuite"

test/TestSuite.coffee

@@ -7,7 +7,7 @@ _         = require("underscore")
 
 chai.use(sinonChai)
 
-Connector = require "../../y-connectors/lib/y-test/y-test.coffee"
+Connector = require "../../y-test/lib/y-test.coffee"
 
 module.exports = class Test
   constructor: (@name_suffix = "")->

test/Text_test.coffee

@@ -8,7 +8,7 @@ _         = require("underscore")
 chai.use(sinonChai)
 
 Y = require "../lib/y"
-Connector = require "../../y-connectors/lib/y-test/y-test.coffee"
+Connector = require "../../y-test/lib/y-test.coffee"
 
 Test = require "./TestSuite"
 class TextTest extends Test

test/Xml_test_browser.coffee

@@ -11,7 +11,7 @@ require 'coffee-errors'
 chai.use(sinonChai)
 
 Y = require "../lib/index"
-Connector = require "../../Yatta-Connectors/lib/test-connector/test-connector.coffee"
+Connector = require "../../y-test/lib/y-test.coffee"
 
 Test = require "./TestSuite"
 class XmlTest extends Test

y-object.html

@@ -1,8 +1,7 @@
 
-
 <polymer-element name="y-object" hidden attributes="val connector y">
 </polymer-element>
 <polymer-element name="y-property" hidden attributes="val name y">
 </polymer-element>
 
-<script src="./build/browser/y-object.js"></script>
+<script src="./y-object.js"></script>