solid-ui 2.4.31-13dc2247 → 2.4.31-26d24f44

package/lib/chat/thread.js

@@ -53,7 +53,8 @@ function thread(dom, kb, subject, messageStore, options) {
 
   var div = dom.createElement('div');
   // eslint-disable-next-line prefer-const
-  var messageTable;
+  var messageTable; // Shared by initial build and addMessageFromBindings
+
   var me;
   var updater = _solidLogic.store.updater;
   var anchor = function anchor(text, term) {
@@ -99,66 +100,34 @@ function thread(dom, kb, subject, messageStore, options) {
     form.appendChild(rhs);
     form.AJAR_date = '9999-01-01T00:00:00Z'; // ISO format for field sort
 
-    var sendMessage = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var _yield$appendMsg, message, dateStamp, sts, sendComplete;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // titlefield.setAttribute('class','pendingedit')
-              // titlefield.disabled = true
-              field.setAttribute('class', 'pendingedit');
-              field.disabled = true;
-              _context2.next = 4;
-              return appendMsg(field.value);
-            case 4:
-              _yield$appendMsg = _context2.sent;
-              message = _yield$appendMsg.message;
-              dateStamp = _yield$appendMsg.dateStamp;
-              sts = _yield$appendMsg.sts;
-              sendComplete = /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(uri, success, body) {
-                  var bindings;
-                  return _regenerator["default"].wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        if (!success) {
-                          form.appendChild(UI.widgets.errorMessageBlock(dom, 'Error writing message: ' + body));
-                        } else {
-                          bindings = {
-                            '?msg': message,
-                            '?content': _solidLogic.store.literal(field.value),
-                            '?date': dateStamp,
-                            '?creator': me
-                          };
-                          renderMessage(bindings, false); // not green
+    var sendMessage = function sendMessage() {
+      // titlefield.setAttribute('class','pendingedit')
+      // titlefield.disabled = true
+      field.setAttribute('class', 'pendingedit');
+      field.disabled = true;
+      var _appendMsg = appendMsg(field.value),
+        message = _appendMsg.message,
+        dateStamp = _appendMsg.dateStamp,
+        sts = _appendMsg.sts;
+      var sendComplete = function sendComplete(uri, success, body) {
+        if (!success) {
+          form.appendChild(UI.widgets.errorMessageBlock(dom, 'Error writing message: ' + body));
+        } else {
+          var bindings = {
+            '?msg': message,
+            '?content': _solidLogic.store.literal(field.value),
+            '?date': dateStamp,
+            '?creator': me
+          };
+          renderMessage(bindings, false); // not green
 
-                          field.value = ''; // clear from out for reuse
-                          field.setAttribute('class', '');
-                          field.disabled = false;
-                        }
-                      case 1:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function sendComplete(_x, _x2, _x3) {
-                  return _ref2.apply(this, arguments);
-                };
-              }();
-              _context2.next = 11;
-              return updater.updateMany([], sts, sendComplete);
-            case 11:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function sendMessage() {
-        return _ref.apply(this, arguments);
+          field.value = ''; // clear from out for reuse
+          field.setAttribute('class', '');
+          field.disabled = false;
+        }
       };
-    }();
+      updater.update([], sts, sendComplete);
+    };
     form.appendChild(dom.createElement('br'));
     var field, sendButton;
     var turnOnInput = function turnOnInput() {
@@ -169,31 +138,15 @@ function thread(dom, kb, subject, messageStore, options) {
       field.rows = 3;
       // field.cols = 40
       field.setAttribute('style', messageBodyStyle + 'background-color: #eef;');
-      field.addEventListener('keyup', /*#__PURE__*/function () {
-        var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(e) {
-          return _regenerator["default"].wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
-              case 0:
-                if (!(e.keyCode === 13)) {
-                  _context3.next = 4;
-                  break;
-                }
-                if (e.altKey) {
-                  _context3.next = 4;
-                  break;
-                }
-                _context3.next = 4;
-                return sendMessage();
-              case 4:
-              case "end":
-                return _context3.stop();
-            }
-          }, _callee3);
-        }));
-        return function (_x4) {
-          return _ref3.apply(this, arguments);
-        };
-      }(), false);
+      field.addEventListener('keyup', function (e) {
+        // User preference?
+        if (e.keyCode === 13) {
+          if (!e.altKey) {
+            // Alt-Enter just adds a new line
+            sendMessage();
+          }
+        }
+      }, false);
       rhs.innerHTML = '';
       sendButton = UI.widgets.button(dom, UI.icons.iconBase + 'noun_383448.svg', 'Send');
       sendButton.setAttribute('style', UI.style.buttonStyle + 'float: right;');
@@ -210,64 +163,94 @@ function thread(dom, kb, subject, messageStore, options) {
     });
     return form;
   };
-  var appendMsg = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])(function (fieldValue) {
-      var oldMsg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-      return /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var sts, now, timestamp, dateStamp, message, msgBody;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              // alain
-              sts = [];
-              now = new Date();
-              timestamp = '' + now.getTime();
-              dateStamp = $rdf.term(now); // http://www.w3schools.com/jsref/jsref_obj_date.asp
-              message = _solidLogic.store.sym(messageStore.uri + '#' + 'Msg' + timestamp);
-              if (!(options === 'edit' || options === 'delete')) {
-                _context4.next = 18;
-                break;
-              }
-              _context4.t0 = sts;
-              _context4.t1 = $rdf.Statement;
-              _context4.next = 10;
-              return mostRecentVersion(oldMsg);
-            case 10:
-              _context4.t2 = _context4.sent;
-              _context4.t3 = DCT('isReplacedBy');
-              _context4.t4 = message;
-              _context4.t5 = messageStore;
-              _context4.t6 = new _context4.t1(_context4.t2, _context4.t3, _context4.t4, _context4.t5);
-              _context4.t0.push.call(_context4.t0, _context4.t6);
-              _context4.next = 19;
-              break;
-            case 18:
-              sts.push(new $rdf.Statement(subject, ns.wf('message'), message, messageStore));
-            case 19:
-              // sts.push(new $rdf.Statement(message, ns.dc('title'), store.literal(titlefield.value), messageStore))
-              msgBody = options !== 'delete' ? fieldValue : "message deleted\nby ".concat(nick(me));
-              sts.push(new $rdf.Statement(message, ns.sioc('content'), _solidLogic.store.literal(msgBody), messageStore));
-              sts.push(new $rdf.Statement(message, DCT('created'), dateStamp, messageStore));
-              if (me) {
-                sts.push(new $rdf.Statement(message, ns.foaf('maker'), me, messageStore));
-              }
-              return _context4.abrupt("return", {
-                message: message,
-                dateStamp: dateStamp,
-                sts: sts
-              });
-            case 24:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      })();
-    });
-    return function appendMsg(_x5) {
-      return _ref4.apply(this, arguments);
+
+  /* const sendMessage = function (oldMsg, options) { // alain
+    // titlefield.setAttribute('class','pendingedit')
+    // titlefield.disabled = true
+    field.setAttribute('class', 'pendingedit')
+    field.disabled = true
+    const sts = []
+    const now = new Date()
+    const timestamp = '' + now.getTime()
+    const dateStamp = $rdf.term(now)
+    // http://www.w3schools.com/jsref/jsref_obj_date.asp
+    const message = store.sym(messageStore.uri + '#' + 'Msg' + timestamp)
+     if (options === 'edit' || options === 'delete') {
+      sts.push(
+        new $rdf.Statement(mostRecentVersion(oldMsg), DCT('isReplacedBy'), message, messageStore)
+      )
+    } else {
+      sts.push(
+        new $rdf.Statement(subject, ns.wf('message'), message, messageStore)
+      )
+    }
+    // sts.push(new $rdf.Statement(message, ns.dc('title'), store.literal(titlefield.value), messageStore))
+    const msgBody = options !== 'delete' ? field.value : `message deleted\nby ${nick(me)}`
+    sts.push(
+      new $rdf.Statement(
+        message,
+        ns.sioc('content'),
+        store.literal(msgBody),
+        messageStore
+      )
+    )
+    sts.push(
+      new $rdf.Statement(message, DCT('created'), dateStamp, messageStore)
+    )
+    if (me) {
+      sts.push(
+        new $rdf.Statement(message, ns.foaf('maker'), me, messageStore)
+      )
+    }
+     const sendComplete = function (uri, success, body) {
+      if (!success) {
+        form.appendChild(
+          UI.widgets.errorMessageBlock(dom, 'Error writing message: ' + body)
+        )
+      } else {
+        const bindings = {
+          '?msg': message,
+          '?content': store.literal(field.value),
+          '?date': dateStamp,
+          '?creator': me
+        }
+        renderMessage(bindings, false) // not green
+         field.value = '' // clear from out for reuse
+        field.setAttribute('class', '')
+        field.disabled = false
+      }
+    }
+    updater.update([], sts, sendComplete)
+  } */
+
+  var appendMsg = function appendMsg(fieldValue) {
+    var oldMsg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+    // alain
+    var sts = [];
+    var now = new Date();
+    var timestamp = '' + now.getTime();
+    var dateStamp = $rdf.term(now);
+    // http://www.w3schools.com/jsref/jsref_obj_date.asp
+    var message = _solidLogic.store.sym(messageStore.uri + '#' + 'Msg' + timestamp);
+    if (options === 'edit' || options === 'delete') {
+      sts.push(new $rdf.Statement(mostRecentVersion(oldMsg), DCT('isReplacedBy'), message, messageStore));
+    } else {
+      sts.push(new $rdf.Statement(subject, ns.wf('message'), message, messageStore));
+    }
+    // sts.push(new $rdf.Statement(message, ns.dc('title'), store.literal(titlefield.value), messageStore))
+    var msgBody = options !== 'delete' ? fieldValue : "message deleted\nby ".concat(nick(me));
+    sts.push(new $rdf.Statement(message, ns.sioc('content'), _solidLogic.store.literal(msgBody), messageStore));
+    sts.push(new $rdf.Statement(message, DCT('created'), dateStamp, messageStore));
+    if (me) {
+      sts.push(new $rdf.Statement(message, ns.foaf('maker'), me, messageStore));
+    }
+    return {
+      message: message,
+      dateStamp: dateStamp,
+      sts: sts
     };
-  }();
+  };
   function nick(person) {
     var s = _solidLogic.store.any(person, UI.ns.foaf('nick'));
     if (s) return '' + s.value;
@@ -316,186 +299,112 @@ function thread(dom, kb, subject, messageStore, options) {
     var msg = message;
     // const listMsg = []
     while (msg) {
-      message = msg;
       // listMsg.push(msg)
       msg = _solidLogic.store.statementsMatching(message, DCT('isReplacedBy'));
     }
-    return message;
+    return msg;
   };
   var _deleteMessage = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(message) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(message) {
       var deletions;
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context5.next = 2;
+            _context.next = 2;
             return _solidLogic.store.connectedStatements(message, messageStore);
           case 2:
-            deletions = _context5.sent;
-            _context5.next = 5;
-            return updater.updateMany(deletions, [], function (uri, ok, body) {
+            deletions = _context.sent;
+            updater.update(deletions, [], function (uri, ok, body) {
               if (!ok) {
                 announce.error('Cant delete messages:' + body);
               } else {
                 syncMessages(subject, messageTable);
               }
             });
-          case 5:
+          case 4:
           case "end":
-            return _context5.stop();
+            return _context.stop();
         }
-      }, _callee5);
+      }, _callee);
     }));
-    return function _deleteMessage(_x6) {
-      return _ref5.apply(this, arguments);
+    return function _deleteMessage(_x) {
+      return _ref.apply(this, arguments);
     };
   }();
-  var addMessage = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(message) {
-      var bindings;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            bindings = {
-              '?msg': message,
-              '?creator': _solidLogic.store.any(message, ns.foaf('maker')),
-              '?date': _solidLogic.store.any(message, DCT('created')),
-              '?content': _solidLogic.store.any(message, ns.sioc('content'))
-            };
-            _context6.next = 3;
-            return renderMessage(bindings, true);
-          case 3:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee6);
-    }));
-    return function addMessage(_x7) {
-      return _ref6.apply(this, arguments);
+  var addMessage = function addMessage(message) {
+    var bindings = {
+      '?msg': message,
+      '?creator': _solidLogic.store.any(message, ns.foaf('maker')),
+      '?date': _solidLogic.store.any(message, DCT('created')),
+      '?content': _solidLogic.store.any(message, ns.sioc('content'))
     };
-  }();
-  var renderMessage = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(bindings, fresh) {
-      var creator, message, date, content, dateString, tr, done, ele, td1, td2, pre, td3, delButton;
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            creator = bindings['?creator'];
-            message = bindings['?msg'];
-            date = bindings['?date'];
-            content = bindings['?content'];
-            dateString = date.value;
-            tr = dom.createElement('tr');
-            tr.AJAR_date = dateString;
-            tr.AJAR_subject = message;
-            done = false;
-            ele = messageTable.firstChild;
-          case 10:
-            if (ele) {
-              _context9.next = 12;
-              break;
-            }
-            return _context9.abrupt("break", 19);
-          case 12:
-            if (!(dateString > ele.AJAR_date && newestFirst || dateString < ele.AJAR_date && !newestFirst)) {
-              _context9.next = 16;
-              break;
-            }
-            messageTable.insertBefore(tr, ele);
-            done = true;
-            return _context9.abrupt("break", 19);
-          case 16:
-            ele = ele.nextSibling;
-            _context9.next = 10;
-            break;
-          case 19:
-            if (!done) {
-              messageTable.appendChild(tr);
-            }
-            td1 = dom.createElement('td');
-            tr.appendChild(td1);
-            creatorAndDate(td1, creator, UI.widgets.shortDate(dateString), message);
-            td2 = dom.createElement('td');
-            tr.appendChild(td2);
-            pre = dom.createElement('p');
-            pre.setAttribute('style', messageBodyStyle + (fresh ? 'background-color: #e8ffe8;' : 'background-color: #white;'));
-            td2.appendChild(pre);
-            pre.textContent = content.value;
-            td3 = dom.createElement('td');
-            tr.appendChild(td3);
-            delButton = dom.createElement('button');
-            td3.appendChild(delButton);
-            delButton.textContent = '-';
-            tr.setAttribute('class', 'hoverControl'); // See tabbedtab.css (sigh global CSS)
-            delButton.setAttribute('class', 'hoverControlHide');
-            delButton.setAttribute('style', 'color: red;');
-            delButton.addEventListener('click', /*#__PURE__*/function () {
-              var _ref8 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(_event) {
-                var cancelButton, sureButton;
-                return _regenerator["default"].wrap(function _callee8$(_context8) {
-                  while (1) switch (_context8.prev = _context8.next) {
-                    case 0:
-                      td3.removeChild(delButton); // Ask -- are you sure?
-                      cancelButton = dom.createElement('button');
-                      cancelButton.textContent = 'cancel';
-                      td3.appendChild(cancelButton).addEventListener('click', function (_event) {
-                        td3.removeChild(sureButton);
-                        td3.removeChild(cancelButton);
-                        td3.appendChild(delButton);
-                      }, false);
-                      sureButton = dom.createElement('button');
-                      sureButton.textContent = 'Delete message';
-                      td3.appendChild(sureButton).addEventListener('click', /*#__PURE__*/function () {
-                        var _ref9 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(_event) {
-                          var _yield$appendMsg2, sts;
-                          return _regenerator["default"].wrap(function _callee7$(_context7) {
-                            while (1) switch (_context7.prev = _context7.next) {
-                              case 0:
-                                // alain: test for delete or edit depending on me = maker
-                                td3.removeChild(sureButton);
-                                td3.removeChild(cancelButton);
-                                // deleteMessage(message) // alain or sendMessage(message, 'delete' or 'edit') //alain
-                                if (!(me.value === _solidLogic.store.any(message, ns.foaf('maker')).value)) {
-                                  _context7.next = 9;
-                                  break;
-                                }
-                                _context7.next = 5;
-                                return appendMsg();
-                              case 5:
-                                _yield$appendMsg2 = _context7.sent;
-                                sts = _yield$appendMsg2.sts;
-                                _context7.next = 9;
-                                return updater.updateMany([], sts);
-                              case 9:
-                              case "end":
-                                return _context7.stop();
-                            }
-                          }, _callee7);
-                        }));
-                        return function (_x11) {
-                          return _ref9.apply(this, arguments);
-                        };
-                      }(), false);
-                    case 7:
-                    case "end":
-                      return _context8.stop();
-                  }
-                }, _callee8);
-              }));
-              return function (_x10) {
-                return _ref8.apply(this, arguments);
-              };
-            }(), false);
-          case 38:
-          case "end":
-            return _context9.stop();
+    renderMessage(bindings, true); // fresh from elsewhere
+  };
+  var renderMessage = function renderMessage(bindings, fresh) {
+    var creator = bindings['?creator'];
+    var message = bindings['?msg'];
+    var date = bindings['?date'];
+    var content = bindings['?content'];
+    var dateString = date.value;
+    var tr = dom.createElement('tr');
+    tr.AJAR_date = dateString;
+    tr.AJAR_subject = message;
+    var done = false;
+    for (var ele = messageTable.firstChild;; ele = ele.nextSibling) {
+      if (!ele) {
+        // empty
+        break;
+      }
+      if (dateString > ele.AJAR_date && newestFirst || dateString < ele.AJAR_date && !newestFirst) {
+        messageTable.insertBefore(tr, ele);
+        done = true;
+        break;
+      }
+    }
+    if (!done) {
+      messageTable.appendChild(tr);
+    }
+    var td1 = dom.createElement('td');
+    tr.appendChild(td1);
+    creatorAndDate(td1, creator, UI.widgets.shortDate(dateString), message);
+    var td2 = dom.createElement('td');
+    tr.appendChild(td2);
+    var pre = dom.createElement('p');
+    pre.setAttribute('style', messageBodyStyle + (fresh ? 'background-color: #e8ffe8;' : 'background-color: #white;'));
+    td2.appendChild(pre);
+    pre.textContent = content.value;
+    var td3 = dom.createElement('td');
+    tr.appendChild(td3);
+    var delButton = dom.createElement('button');
+    td3.appendChild(delButton);
+    delButton.textContent = '-';
+    tr.setAttribute('class', 'hoverControl'); // See tabbedtab.css (sigh global CSS)
+    delButton.setAttribute('class', 'hoverControlHide');
+    delButton.setAttribute('style', 'color: red;');
+    delButton.addEventListener('click', function (_event) {
+      td3.removeChild(delButton); // Ask -- are you sure?
+      var cancelButton = dom.createElement('button');
+      cancelButton.textContent = 'cancel';
+      td3.appendChild(cancelButton).addEventListener('click', function (_event) {
+        td3.removeChild(sureButton);
+        td3.removeChild(cancelButton);
+        td3.appendChild(delButton);
+      }, false);
+      var sureButton = dom.createElement('button');
+      sureButton.textContent = 'Delete message';
+      td3.appendChild(sureButton).addEventListener('click', function (_event) {
+        // alain test for delete or edit depending on me = maker
+        td3.removeChild(sureButton);
+        td3.removeChild(cancelButton);
+        // deleteMessage(message) // alain or sendMessage(message, 'delete' or 'edit') //alain
+        if (me.value === _solidLogic.store.any(message, ns.foaf('maker')).value) {
+          var _appendMsg2 = appendMsg(),
+            sts = _appendMsg2.sts; // alain
+          updater.update([], sts);
         }
-      }, _callee9);
-    }));
-    return function renderMessage(_x8, _x9) {
-      return _ref7.apply(this, arguments);
-    };
-  }();
+      }, false);
+    }, false);
+  };
 
   // Messages with date, author etc