merge

build/browser/Connectors/PeerJsConnector.min.js

@@ -1 +1 @@
-!function n(e,t,r){function o(u,s){if(!t[u]){if(!e[u]){var c="function"==typeof require&&require;if(!s&&c)return c(u,!0);if(i)return i(u,!0);throw new Error("Cannot find module '"+u+"'")}var a=t[u]={exports:{}};e[u][0].call(a.exports,function(n){var t=e[u][1][n];return o(t?t:n)},a,a.exports,n,e,t,r)}return t[u].exports}for(var i="function"==typeof require&&require,u=0;u<r.length;u++)o(r[u]);return o}({1:[function(n,e){var t;t=function(){var n,e,t;return t=null,2===arguments.length?(t=new Peer(arguments[0]),e=arguments[1]):(t=new Peer(arguments[0],arguments[1]),t.on("error",function(n){throw new Error("Peerjs connector: "+n)}),t.on("disconnected",function(){throw new Error("Peerjs connector disconnected from signalling server. Cannot accept new connections. Not fatal, but not so good either..")}),e=arguments[2]),n=function(){function n(n,e,r,o){var i,u;this.engine=n,this.HB=e,this.execution_listener=r,this.yatta=o,this.peer=t,this.connections={},this.peer.on("connection",function(n){return function(e){return n.addConnection(e)}}(this)),u=function(n){return function(){var e,t,r,o;r=n.connections,o=[];for(t in r)e=r[t],o.push(e.send({sync_state_vector:n.HB.getOperationCounter()}));return o}}(this),setInterval(u,4e3),i=function(n){return function(e){var t,r,o,i;if(e.uid.creator===n.HB.getUserId()&&"string"!=typeof e.uid.op_number){o=n.connections,i=[];for(r in o)t=o[r],i.push(t.send({op:e}));return i}}}(this),this.execution_listener.push(i)}return n.prototype.connectToPeer=function(n){return null==this.connections[n]&&n!==this.yatta.getUserId()?this.addConnection(t.connect(n)):void 0},n.prototype.getAllConnectionIds=function(){var n,e;e=[];for(n in this.connections)e.push(n);return e},n.prototype.addConnection=function(n){var e,t,r;return this.connections[n.peer]=n,t=!1,e=!1,n.on("data",function(r){return function(o){var i,u,s,c,a;if("empty_message"===o);else if(null!=o.HB){if(t=!0,r.engine.applyOpsCheckDouble(o.HB),!o.initialized)return n.send({conns:r.getAllConnectionIds()})}else{if(null!=o.op)return r.engine.applyOp(o.op);if(null!=o.conns){for(c=o.conns,a=[],u=0,s=c.length;s>u;u++)i=c[u],a.push(r.connectToPeer(i));return a}if(null!=o.sync_state_vector)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.sync_state_vector),initialized:!0});if(null==o.state_vector)throw new Error("Can't parse this operation: "+o);if(!e)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.state_vector),initialized:!1}),e=!0}}}(this)),r=function(e){return function(){return n.send({state_vector:e.HB.getOperationCounter()}),t?void 0:setTimeout(r,100)}}(this),r()},n}(),t.on("open",function(t){return e(n,t)})},e.exports=t,"undefined"!=typeof window&&null!==window&&(null==window.Y&&(window.Y={}),window.Y.createPeerJsConnector=t)},{}]},{},[1]);
+!function n(e,t,r){function o(s,u){if(!t[s]){if(!e[s]){var c="function"==typeof require&&require;if(!u&&c)return c(s,!0);if(i)return i(s,!0);throw new Error("Cannot find module '"+s+"'")}var a=t[s]={exports:{}};e[s][0].call(a.exports,function(n){var t=e[s][1][n];return o(t?t:n)},a,a.exports,n,e,t,r)}return t[s].exports}for(var i="function"==typeof require&&require,s=0;s<r.length;s++)o(r[s]);return o}({1:[function(n,e){var t;t=function(){var n,e,t;return t=null,2===arguments.length?(t=new Peer(arguments[0]),e=arguments[1]):(t=new Peer(arguments[0],arguments[1]),t.on("error",function(n){throw new Error("Peerjs connector: "+n)}),t.on("disconnected",function(){throw new Error("Peerjs connector disconnected from signalling server. Cannot accept new connections. Not fatal, but not so good either..")}),e=arguments[2]),n=function(){function n(n,e,r,o){var i,s;this.engine=n,this.HB=e,this.execution_listener=r,this.yatta=o,this.peer=t,this.connections={},this.new_connection_listeners=[],this.peer.on("connection",function(n){return function(e){return n.addConnection(e)}}(this)),s=function(n){return function(){var e,t,r,o;r=n.connections,o=[];for(t in r)e=r[t],o.push(e.send({sync_state_vector:n.HB.getOperationCounter()}));return o}}(this),setInterval(s,4e3),i=function(n){return function(e){var t,r,o,i;if(e.uid.creator===n.HB.getUserId()&&"string"!=typeof e.uid.op_number){o=n.connections,i=[];for(r in o)t=o[r],i.push(t.send({op:e}));return i}}}(this),this.execution_listener.push(i)}return n.prototype.connectToPeer=function(n){return null==this.connections[n]&&n!==this.yatta.getUserId()?this.addConnection(t.connect(n)):void 0},n.prototype.getAllConnectionIds=function(){var n,e;e=[];for(n in this.connections)e.push(n);return e},n.prototype.onNewConnection=function(n){return this.new_connection_listeners.push(n)},n.prototype.addConnection=function(n){var e,t,r;return this.connections[n.peer]=n,t=!1,e=!1,n.on("data",function(r){return function(o){var i,s,u,c,a;if("empty_message"===o);else if(null!=o.HB){if(t=!0,r.engine.applyOpsCheckDouble(o.HB),!o.initialized)return n.send({conns:r.getAllConnectionIds()}),r.new_connection_listeners.map(function(e){return e(n)})}else{if(null!=o.op)return r.engine.applyOp(o.op);if(null!=o.conns){for(c=o.conns,a=[],s=0,u=c.length;u>s;s++)i=c[s],a.push(r.connectToPeer(i));return a}if(null!=o.sync_state_vector)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.sync_state_vector),initialized:!0});if(null==o.state_vector)throw new Error("Can't parse this operation: "+o);if(!e)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.state_vector),initialized:!1}),e=!0}}}(this)),r=function(e){return function(){return n.send({state_vector:e.HB.getOperationCounter()}),t?void 0:setTimeout(r,100)}}(this),r()},n}(),t.on("open",function(t){return e(n,t)})},e.exports=t,"undefined"!=typeof window&&null!==window&&(null==window.Y&&(window.Y={}),window.Y.createPeerJsConnector=t)},{}]},{},[1]);

build/node/Connectors/PeerJsConnector.js

@@ -26,6 +26,7 @@
         this.yatta = yatta;
         this.peer = peer;
         this.connections = {};
+        this.new_connection_listeners = [];
         this.peer.on('connection', (function(_this) {
           return function(conn) {
             return _this.addConnection(conn);
@@ -80,6 +81,10 @@
         return _results;
       };
 
+      PeerJsConnector.prototype.onNewConnection = function(f) {
+        return this.new_connection_listeners.push(f);
+      };
+
       PeerJsConnector.prototype.addConnection = function(conn) {
         var initialized_him, initialized_me, sendStateVector;
         this.connections[conn.peer] = conn;
@@ -94,9 +99,12 @@
               initialized_me = true;
               _this.engine.applyOpsCheckDouble(data.HB);
               if (!data.initialized) {
-                return conn.send({
+                conn.send({
                   conns: _this.getAllConnectionIds()
                 });
+                return _this.new_connection_listeners.map(function(f) {
+                  return f(conn);
+                });
               }
             } else if (data.op != null) {
               return _this.engine.applyOp(data.op);

build/node/Types/BasicTypes.js

@@ -218,12 +218,13 @@
       Insert.prototype.type = "Insert";
 
       Insert.prototype.applyDelete = function(o) {
-        var garbagecollect, _ref;
+        var callLater, garbagecollect, _ref;
         if (this.deleted_by == null) {
           this.deleted_by = [];
         }
+        callLater = false;
         if ((this.parent != null) && !this.isDeleted()) {
-          this.parent.callEvent("delete", this, o);
+          callLater = true;
         }
         if (o != null) {
           this.deleted_by.push(o);
@@ -233,6 +234,9 @@
           garbagecollect = true;
         }
         Insert.__super__.applyDelete.call(this, garbagecollect);
+        if (callLater) {
+          this.parent.callEvent("delete", this, o);
+        }
         if ((_ref = this.next_cl) != null ? _ref.isDeleted() : void 0) {
           return this.next_cl.applyDelete();
         }

build/node/Types/TextTypes.js

@@ -47,8 +47,22 @@
       };
 
       TextInsert.prototype.applyDelete = function() {
-        this.content = null;
-        return TextInsert.__super__.applyDelete.apply(this, arguments);
+        TextInsert.__super__.applyDelete.apply(this, arguments);
+        if (this.content instanceof types.Operation) {
+          this.content.applyDelete();
+        }
+        return this.content = null;
+      };
+
+      TextInsert.prototype.execute = function() {
+        if (!this.validateSavedOperations()) {
+          return false;
+        } else {
+          if (this.content instanceof types.Operation) {
+            this.content.insert_parent = this;
+          }
+          return TextInsert.__super__.execute.call(this);
+        }
       };
 
       TextInsert.prototype.val = function(current_position) {

build/node/Types/XmlTypes.js

@@ -1,5 +1,5 @@
 (function() {
-  var json_types_uninitialized, proxy_token,
+  var dont_proxy, json_types_uninitialized, proxy_token, _proxy,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
@@ -7,27 +7,45 @@
 
   proxy_token = false;
 
+  dont_proxy = function(f) {
+    var e;
+    proxy_token = true;
+    try {
+      f();
+    } catch (_error) {
+      e = _error;
+      proxy_token = false;
+      throw new Error(e);
+    }
+    return proxy_token = false;
+  };
+
+  _proxy = function(f_name, f) {
+    var old_f;
+    old_f = this[f_name];
+    if (old_f != null) {
+      return this[f_name] = function() {
+        var args, that, _ref;
+        if (!proxy_token && !((_ref = this._yatta) != null ? _ref.isDeleted() : void 0)) {
+          that = this;
+          args = arguments;
+          return dont_proxy(function() {
+            f.apply(that, args);
+            return old_f.apply(that, args);
+          });
+        } else {
+          return old_f.apply(this, arguments);
+        }
+      };
+    }
+  };
+
   if (typeof Element !== "undefined" && Element !== null) {
-    Element.prototype._proxy = function(f_name, f) {
-      var old_f;
-      old_f = this[f_name];
-      if (old_f != null) {
-        return this[f_name] = function() {
-          if (!proxy_token) {
-            proxy_token = true;
-            old_f.apply(this, arguments);
-            f.apply(this, arguments);
-            return proxy_token = false;
-          } else {
-            return old_f.apply(this, arguments);
-          }
-        };
-      }
-    };
+    Element.prototype._proxy = _proxy;
   }
 
   module.exports = function(HB) {
-    var XmlType, json_types, parser, types;
+    var TextNodeType, XmlType, json_types, parser, types;
     json_types = json_types_uninitialized(HB);
     types = json_types.types;
     parser = json_types.parser;
@@ -35,7 +53,7 @@
       __extends(XmlType, _super);
 
       function XmlType(uid, tagname, attributes, elements, xml) {
-        var attr, element, i, n, word, _i, _j, _len, _ref, _ref1;
+        var attr, d, element, i, n, word, _i, _j, _len, _ref, _ref1, _ref2;
         this.tagname = tagname;
         this.xml = xml;
 
@@ -48,12 +66,18 @@
             prev = prev.prev_cl
           next = prev.next_cl
          */
-        XmlType.__super__.constructor.call(this);
+        XmlType.__super__.constructor.call(this, uid);
+        if (((_ref = this.xml) != null ? _ref._yatta : void 0) != null) {
+          d = new types.Delete(void 0, this.xml._yatta);
+          HB.addOperation(d).execute();
+          this.xml._yatta = null;
+        }
         if ((attributes != null) && (elements != null)) {
           this.saveOperation('attributes', attributes);
           this.saveOperation('elements', elements);
         } else if ((attributes == null) && (elements == null)) {
           this.attributes = new types.JsonType();
+          this.attributes.setMutableDefault('immutable');
           HB.addOperation(this.attributes).execute();
           this.elements = new types.WordType();
           this.elements.parent = this;
@@ -63,17 +87,16 @@
         }
         if (this.xml != null) {
           this.tagname = this.xml.tagName;
-          for (i = _i = 0, _ref = this.xml.attributes.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+          for (i = _i = 0, _ref1 = this.xml.attributes.length; 0 <= _ref1 ? _i < _ref1 : _i > _ref1; i = 0 <= _ref1 ? ++_i : --_i) {
             attr = xml.attributes[i];
             this.attributes.val(attr.name, attr.value);
           }
-          _ref1 = this.xml.childNodes;
-          for (_j = 0, _len = _ref1.length; _j < _len; _j++) {
-            n = _ref1[_j];
+          _ref2 = this.xml.childNodes;
+          for (_j = 0, _len = _ref2.length; _j < _len; _j++) {
+            n = _ref2[_j];
             if (n.nodeType === n.TEXT_NODE) {
-              word = new types.WordType();
+              word = new TextNodeType(void 0, n);
               HB.addOperation(word).execute();
-              word.push(n.textContent);
               this.elements.push(word);
             } else if (n.nodeType === n.ELEMENT_NODE) {
               element = new XmlType(void 0, void 0, void 0, void 0, n);
@@ -90,10 +113,14 @@
 
       XmlType.prototype.type = "XmlType";
 
-      XmlType.prototype.applyDelete = function() {
-        this.attributes.applyDelete();
-        this.elements.applyDelete();
-        return XmlType.__super__.applyDelete.call(this);
+      XmlType.prototype.applyDelete = function(op) {
+        if ((this.insert_parent != null) && !this.insert_parent.isDeleted()) {
+          return this.insert_parent.applyDelete(op);
+        } else {
+          this.attributes.applyDelete();
+          this.elements.applyDelete();
+          return XmlType.__super__.applyDelete.apply(this, arguments);
+        }
       };
 
       XmlType.prototype.cleanup = function() {
@@ -101,28 +128,158 @@
       };
 
       XmlType.prototype.setXmlProxy = function() {
-        var insertBefore, that;
+        var findNode, insertBefore, removeChild, renewClassList, that;
         this.xml._yatta = this;
         that = this;
-        insertBefore = function(insertedNode, adjacentNode) {
-          var element, next, prev;
-          next = adjacentNode != null ? adjacentNode._yatta : void 0;
+        this.elements.on('insert', function(event, op) {
+          var newNode, right, rightNode;
+          if (op.creator !== HB.getUserId() && this === that.elements) {
+            newNode = op.content.val();
+            right = op.next_cl;
+            while ((right != null) && right.isDeleted()) {
+              right = right.next_cl;
+            }
+            rightNode = null;
+            if (right.type !== 'Delimiter') {
+              rightNode = right.val().val();
+            }
+            return dont_proxy(function() {
+              return that.xml.insertBefore(newNode, rightNode);
+            });
+          }
+        });
+        this.elements.on('delete', function(event, op) {
+          var del_op, deleted;
+          del_op = op.deleted_by[0];
+          if ((del_op != null) && del_op.creator !== HB.getUserId() && this === that.elements) {
+            deleted = op.content.val();
+            return dont_proxy(function() {
+              return that.xml.removeChild(deleted);
+            });
+          }
+        });
+        this.attributes.on(['addProperty', 'change'], function(event, property_name, op) {
+          if (op.creator !== HB.getUserId() && this === that.attributes) {
+            return dont_proxy(function() {
+              var newval;
+              newval = op.val().val();
+              if (newval != null) {
+                return that.xml.setAttribute(property_name, op.val().val());
+              } else {
+                return that.xml.removeAttribute(property_name);
+              }
+            });
+          }
+        });
+        findNode = function(child) {
+          var elem;
+          if (child == null) {
+            throw new Error("you must specify a parameter!");
+          }
+          child = child._yatta;
+          elem = that.elements.beginning.next_cl;
+          while (elem.type !== 'Delimiter' && elem.content !== child) {
+            elem = elem.next_cl;
+          }
+          if (elem.type === 'Delimiter') {
+            return false;
+          } else {
+            return elem;
+          }
+        };
+        insertBefore = function(insertedNode_s, adjacentNode) {
+          var child, element, inserted_nodes, next, prev, _results;
+          next = null;
+          if (adjacentNode != null) {
+            next = findNode(adjacentNode);
+          }
           prev = null;
-          if (next != null) {
+          if (next) {
             prev = next.prev_cl;
           } else {
             prev = this._yatta.elements.end.prev_cl;
+            while (prev.isDeleted()) {
+              prev = prev.prev_cl;
+            }
+          }
+          inserted_nodes = null;
+          if (insertedNode_s.nodeType === insertedNode_s.DOCUMENT_FRAGMENT_NODE) {
+            child = insertedNode_s.lastChild;
+            _results = [];
+            while (child != null) {
+              element = new XmlType(void 0, void 0, void 0, void 0, child);
+              HB.addOperation(element).execute();
+              that.elements.insertAfter(prev, element);
+              _results.push(child = child.previousSibling);
+            }
+            return _results;
+          } else {
+            element = new XmlType(void 0, void 0, void 0, void 0, insertedNode_s);
+            HB.addOperation(element).execute();
+            return that.elements.insertAfter(prev, element);
           }
-          element = new XmlType(void 0, void 0, void 0, void 0, insertedNode);
-          HB.addOperation(element).execute();
-          return that.elements.insertAfter(prev, element);
         };
         this.xml._proxy('insertBefore', insertBefore);
         this.xml._proxy('appendChild', insertBefore);
         this.xml._proxy('removeAttribute', function(name) {
           return that.attributes.val(name, void 0);
         });
-        return this.xml._proxy('removeChild', function(node) {});
+        this.xml._proxy('setAttribute', function(name, value) {
+          return that.attributes.val(name, value);
+        });
+        renewClassList = function(newclass) {
+          var dont_do_it, elem, value, _i, _len;
+          dont_do_it = false;
+          if (newclass != null) {
+            for (_i = 0, _len = this.length; _i < _len; _i++) {
+              elem = this[_i];
+              if (newclass === elem) {
+                dont_do_it = true;
+              }
+            }
+          }
+          value = Array.prototype.join.call(this, " ");
+          if ((newclass != null) && !dont_do_it) {
+            value += " " + newclass;
+          }
+          return that.attributes.val('class', value);
+        };
+        _proxy.call(this.xml.classList, 'add', renewClassList);
+        _proxy.call(this.xml.classList, 'remove', renewClassList);
+        this.xml.__defineSetter__('className', function(val) {
+          return this.setAttribute('class', val);
+        });
+        this.xml.__defineGetter__('className', function() {
+          return that.attributes.val('class');
+        });
+        this.xml.__defineSetter__('textContent', function(val) {
+          var elem, remove, text_node;
+          elem = that.xml.firstChild;
+          while (elem != null) {
+            remove = elem;
+            elem = elem.nextSibling;
+            that.xml.removeChild(remove);
+          }
+          if (val !== "") {
+            text_node = document.createTextNode(val);
+            return that.xml.appendChild(text_node);
+          }
+        });
+        removeChild = function(node) {
+          var d, elem;
+          elem = findNode(node);
+          if (!elem) {
+            throw new Error("You are only allowed to delete existing (direct) child elements!");
+          }
+          d = new types.Delete(void 0, elem);
+          HB.addOperation(d).execute();
+          return node._yatta = null;
+        };
+        this.xml._proxy('removeChild', removeChild);
+        return this.xml._proxy('replaceChild', function(insertedNode, replacedNode) {
+          insertBefore.call(this, insertedNode, replacedNode);
+          return removeChild.call(this, replacedNode);
+        });
       };
 
       XmlType.prototype.val = function(enforce) {
@@ -145,11 +302,11 @@
             e = this.elements.beginning.next_cl;
             while (e.type !== "Delimiter") {
               n = e.content;
-              if (!n.isDeleted()) {
+              if (!e.isDeleted() && (e.content != null)) {
                 if (n.type === "XmlType") {
                   this.xml.appendChild(n.val(enforce));
-                } else if (n.type === "WordType") {
-                  text_node = document.createTextNode(n.val());
+                } else if (n.type === "TextNodeType") {
+                  text_node = n.val();
                   this.xml.appendChild(text_node);
                 } else {
                   throw new Error("Internal structure cannot be transformed to dom");
@@ -164,7 +321,7 @@
       };
 
       XmlType.prototype.execute = function() {
-        return XmlType.__super__.execute.apply(this, arguments);
+        return XmlType.__super__.execute.call(this);
       };
 
 
@@ -200,6 +357,49 @@
       uid = json['uid'], attributes = json['attributes'], elements = json['elements'], tagname = json['tagname'];
       return new XmlType(uid, tagname, attributes, elements, void 0);
     };
+    TextNodeType = (function(_super) {
+      __extends(TextNodeType, _super);
+
+      function TextNodeType(uid, content) {
+        var d;
+        if (content._yatta != null) {
+          d = new types.Delete(void 0, content._yatta);
+          HB.addOperation(d).execute();
+          content._yatta = null;
+        }
+        content._yatta = this;
+        TextNodeType.__super__.constructor.call(this, uid, content);
+      }
+
+      TextNodeType.prototype.applyDelete = function(op) {
+        if ((this.insert_parent != null) && !this.insert_parent.isDeleted()) {
+          return this.insert_parent.applyDelete(op);
+        } else {
+          return TextNodeType.__super__.applyDelete.apply(this, arguments);
+        }
+      };
+
+      TextNodeType.prototype.type = "TextNodeType";
+
+      TextNodeType.prototype._encode = function() {
+        var json;
+        json = {
+          'type': this.type,
+          'uid': this.getUid(),
+          'content': this.content.textContent
+        };
+        return json;
+      };
+
+      return TextNodeType;
+
+    })(types.ImmutableObject);
+    parser['TextNodeType'] = function(json) {
+      var content, textnode, uid;
+      uid = json['uid'], content = json['content'];
+      textnode = document.createTextNode(content);
+      return new TextNodeType(uid, textnode);
+    };
     types['XmlType'] = XmlType;
     return json_types;
   };

build/test/index.html

@@ -6,7 +6,7 @@
 </head>
 <body>
   <div id="mocha"></div>
-  <div id="test_dom" test_attribute="the test"><p id="removeme">remove me</p><p>This is a test object for <b>XmlFramework</b></p></div>
+  <div id="test_dom" test_attribute="the test" class="stuffy" style="color: blue"><p id="replaceme">replace me</p><p id="removeme">remove me</p><p>This is a test object for <b>XmlFramework</b></p><span class="span_element"><p>span</p></span></div>
   <script src="../../node_modules/mocha/mocha.js" class="awesome"></script>
   <script>
     mocha.setup('bdd');