braid-text 0.2.53 → 0.2.55

package/editor.html

@@ -16,11 +16,15 @@
       texty.disabled = true
       texty.style.background = '#fee'
       texty.style.border = '4px solid red'
-    }
+    },
+    on_ack: () => texty.style.caretColor = ''
   });
 
   texty.value = "";
-  texty.oninput = (e) => simpleton.changed();
+  texty.oninput = (e) => {
+    texty.style.caretColor = 'red'
+    simpleton.changed();
+  }
 
   function diff(before, after) {
     let diff = diff_main(before, after);

package/markdown-editor.html

@@ -39,7 +39,9 @@ var simpleton = simpleton_client(location.pathname, {
     t().disabled = true
     t().style.background = '#fee'
     t().style.border = '4px solid red'
-  }
+  },
+
+  on_ack: () => t().style.caretColor = ''
 });
 
 window.statebus_ready || (window.statebus_ready = []);
@@ -178,6 +180,7 @@ dom.WIKI = function() {
       }
       // Bail on edits that try to wipe us out
       state.source = e.target.value;
+      e.target.style.caretColor = 'red'
       simpleton.changed();
       return update_markdown_later();
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-text",
-  "version": "0.2.53",
+  "version": "0.2.55",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",

package/simpleton-client.js

@@ -45,7 +45,8 @@ function simpleton_client(url, {
     generate_local_diff_update, // DEPRECATED
     content_type,
     on_error,
-    on_res
+    on_res,
+    on_ack
 }) {
     var peer = Math.random().toString(36).substr(2)
     var current_version = []
@@ -115,8 +116,12 @@ function simpleton_client(url, {
                 if (update.extra_headers &&
                     update.extra_headers["repr-digest"] &&
                     update.extra_headers["repr-digest"].startsWith('sha-256=') &&
-                    update.extra_headers["repr-digest"] !== await get_digest(prev_state))
+                    update.extra_headers["repr-digest"] !== await get_digest(prev_state)) {
+                    console.log('repr-digest mismatch!')
+                    console.log('repr-digest: ' + update.extra_headers["repr-digest"])
+                    console.log('state: ' + prev_state)
                     throw new Error('repr-digest mismatch')
+                }
 
                 if (on_state) on_state(prev_state)
             }
@@ -190,6 +195,7 @@ function simpleton_client(url, {
                 throw e
             }
             outstanding_changes--
+            if (on_ack && !outstanding_changes) on_ack()
         }
       }
     }