more xml

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(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]);

build/node/Connectors/PeerJsConnector.js

@@ -122,7 +122,7 @@
                 return initialized_him = true;
               }
             } else {
-              throw new Error("Can't parse this operation " + data);
+              throw new Error("Can't parse this operation: " + data);
             }
           };
         })(this));

build/node/Frameworks/JsonFramework.js

@@ -51,8 +51,9 @@
       return this.getSharedObject().toJson();
     };
 
-    JsonFramework.prototype.val = function(name, content, mutable) {
-      return this.getSharedObject().val(name, content, mutable);
+    JsonFramework.prototype.val = function() {
+      var _ref;
+      return (_ref = this.getSharedObject()).val.apply(_ref, arguments);
     };
 
     JsonFramework.prototype.on = function() {

build/node/Types/JsonTypes.js

@@ -142,7 +142,7 @@
           HB.addOperation(json).execute();
           this.replace_manager.replace(json);
           return this;
-        } else if ((name != null) && ((content != null) || content === null)) {
+        } else if ((name != null) && arguments.length > 1) {
           if (mutable != null) {
             if (mutable === true || mutable === 'mutable') {
               mutable = true;
@@ -154,7 +154,7 @@
           }
           if (typeof content === 'function') {
             return this;
-          } else if (content === null || (((!mutable) || typeof content === 'number') && content.constructor !== Object)) {
+          } else if ((content == null) || (((!mutable) || typeof content === 'number') && content.constructor !== Object)) {
             obj = HB.addOperation(new types.ImmutableObject(void 0, content)).execute();
             return JsonType.__super__.val.call(this, name, obj);
           } else {

build/node/Types/TextTypes.js

@@ -25,7 +25,11 @@
       __extends(TextInsert, _super);
 
       function TextInsert(content, uid, prev, next, origin) {
-        this.content = content;
+        if ((content != null ? content.creator : void 0) != null) {
+          this.saveOperation('content', content);
+        } else {
+          this.content = content;
+        }
         if (!((prev != null) && (next != null))) {
           throw new Error("You must define prev, and next for TextInsert-types!");
         }
@@ -56,14 +60,18 @@
       };
 
       TextInsert.prototype._encode = function() {
-        var json;
+        var json, _ref;
         json = {
           'type': "TextInsert",
-          'content': this.content,
           'uid': this.getUid(),
           'prev': this.prev_cl.getUid(),
           'next': this.next_cl.getUid()
         };
+        if (((_ref = this.content) != null ? _ref.getUid : void 0) != null) {
+          json['content'] = this.content.getUid();
+        } else {
+          json['content'] = this.content;
+        }
         if (this.origin !== this.prev_cl) {
           json["origin"] = this.origin.getUid();
         }

build/node/Types/XmlTypes.js

@@ -1,21 +1,27 @@
 (function() {
-  var json_types_uninitialized,
+  var json_types_uninitialized, proxy_token,
     __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; };
 
   json_types_uninitialized = require("./JsonTypes");
 
+  proxy_token = false;
+
   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() {
-          f.apply(this, arguments);
-          return old_f.apply(this, arguments);
+          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);
+          }
         };
-      } else {
-        return this[f_name] = f;
       }
     };
   }
@@ -95,8 +101,10 @@
       };
 
       XmlType.prototype.setXmlProxy = function() {
+        var insertBefore, that;
         this.xml._yatta = this;
-        return this.xml._proxy('insertBefore', function(insertedNode, adjacentNode) {
+        that = this;
+        insertBefore = function(insertedNode, adjacentNode) {
           var element, next, prev;
           next = adjacentNode != null ? adjacentNode._yatta : void 0;
           prev = null;
@@ -105,10 +113,16 @@
           } else {
             prev = this._yatta.elements.end.prev_cl;
           }
-          element = new XmlType(void 0, void 0, void 0, void 0);
+          element = new XmlType(void 0, void 0, void 0, void 0, insertedNode);
           HB.addOperation(element).execute();
-          return this.elements.insertAfter(prev, element);
+          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) {});
       };
 
       XmlType.prototype.val = function(enforce) {
@@ -122,9 +136,11 @@
             attr = this.attributes.val();
             for (attr_name in attr) {
               value = attr[attr_name];
-              a = document.createAttribute(attr_name);
-              a.value = value;
-              this.xml.setAttributeNode(a);
+              if (value != null) {
+                a = document.createAttribute(attr_name);
+                a.value = value;
+                this.xml.setAttributeNode(a);
+              }
             }
             e = this.elements.beginning.next_cl;
             while (e.type !== "Delimiter") {

build/test/index.html

@@ -6,7 +6,7 @@
 </head>
 <body>
   <div id="mocha"></div>
-  <div id="test_dom"><p>This is a test object for <b>XmlFramework</b></p></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>
   <script src="../../node_modules/mocha/mocha.js" class="awesome"></script>
   <script>
     mocha.setup('bdd');