Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch chat-input-revisited Excluding Merge-Ins
This is equivalent to a diff from f48180f2 to 891d79de
2021-10-10
| ||
06:33 | Reworked /chat input options for better cross-browser portability. Made /chat config friendlier for right-handed and mobile use. ... (check-in: db54f4b7 user: stephan tags: trunk) | |
06:31 | More /chat config cosmetics. Started 2.18 change notes. ... (Closed-Leaf check-in: 891d79de user: stephan tags: chat-input-revisited) | |
06:09 | Updated date on 2.17 release in changes.wiki. ... (check-in: c3177ea9 user: stephan tags: trunk) | |
05:53 | /chat: added option to toggle between text and contenteditable widget, defaulting to the former. Prettied up the config view a bit and made it more right-handed friendly. ... (check-in: 5d7c98ef user: stephan tags: chat-input-revisited) | |
04:13 | /chat input field rework, as discussed in forum post 9e85f44f864eb1f5. Part 1: revert to plain text input fields, with compact-mode toggle swapping between them. ... (check-in: 136d95b6 user: stephan tags: chat-input-revisited) | |
2021-10-09
| ||
20:13 | Merge in trunk (release 2.17) ... (check-in: c1868b9f user: george tags: search-terms-highlighting) | |
20:05 | Merge in trunk (release 2.17) ... (check-in: a33f616e user: george tags: rptview-submenu-paralink) | |
19:50 | Merge in trunk (release 2.17) ... (check-in: 315351f4 user: george tags: wcontent-subsets) | |
19:31 | Merge in trunk (release 2.17) ... (check-in: 56e2d3ad user: george tags: th1-doc-vars) | |
14:43 | Version 2.17 ... (check-in: f48180f2 user: drh tags: trunk, release, version-2.17) | |
09:20 | Typo fix in diff context loader XHR error handler, with thanks to Florian. ... (check-in: a7547610 user: stephan tags: trunk) | |
Changes to src/chat.c.
︙ | ︙ | |||
172 173 174 175 176 177 178 | db_get("chat-alert-sound","alerts/plunk.wav")); zProjectName = db_get("project-name","Unnamed project"); zInputPlaceholder0 = mprintf("Type markdown-formatted message for %h.", zProjectName); style_set_current_feature("chat"); style_header("Chat"); @ <div id='chat-input-area'> | | > > > > > > > > | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | db_get("chat-alert-sound","alerts/plunk.wav")); zProjectName = db_get("project-name","Unnamed project"); zInputPlaceholder0 = mprintf("Type markdown-formatted message for %h.", zProjectName); style_set_current_feature("chat"); style_header("Chat"); @ <div id='chat-input-area'> @ <div id='chat-input-line-wrapper' class='compact'> @ <input type="text" id="chat-input-field-single" \ @ data-placeholder0="%h(zInputPlaceholder0)" \ @ data-placeholder="%h(zInputPlaceholder0)" \ @ class="chat-input-field"></input> @ <textarea id="chat-input-field-multi" \ @ data-placeholder0="%h(zInputPlaceholder0)" \ @ data-placeholder="%h(zInputPlaceholder0)" \ @ class="chat-input-field hidden"></textarea> @ <div contenteditable id="chat-input-field-x" \ @ data-placeholder0="%h(zInputPlaceholder0)" \ @ data-placeholder="%h(zInputPlaceholder0)" \ @ class="chat-input-field hidden"></div> @ <div id='chat-buttons-wrapper'> @ <span class='cbutton' id="chat-button-preview" \ @ title="Preview message (Shift-Enter)">👁</span> @ <span class='cbutton' id="chat-button-attach" \ @ title="Attach file to message">%s(zPaperclip)</span> @ <span class='cbutton' id="chat-button-settings" \ @ title="Configure chat">⚙</span> |
︙ | ︙ |
Changes to src/fossil.page.chat.js.
︙ | ︙ | |||
92 93 94 95 96 97 98 | var extra = 0; if(com){ ht = wh; }else{ elemsToCount.forEach((e)=>e ? extra += D.effectiveHeight(e) : false); ht = wh - extra; } | | | | | > > | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | var extra = 0; if(com){ ht = wh; }else{ elemsToCount.forEach((e)=>e ? extra += D.effectiveHeight(e) : false); ht = wh - extra; } f.chat.e.inputX.style.maxHeight = (ht/2)+"px"; /* ^^^^ this is a middle ground between having no size cap on the input field and having a fixed arbitrary cap. */; contentArea.style.height = contentArea.style.maxHeight = [ "calc(", (ht>=100 ? ht : 100), "px", " - 0.75em"/*fudge value*/,")" /* ^^^^ hypothetically not needed, but both Chrome/FF on Linux will force scrollbars on the body if this value is too small (<0.75em in my tests). */ ].join(''); if(false){ console.debug("resized.",wh, extra, ht, window.getComputedStyle(contentArea).maxHeight, contentArea); console.debug("Set input max height to: ", f.chat.e.inputX.style.maxHeight); } }; var doit; window.addEventListener('resize',function(ev){ clearTimeout(doit); doit = setTimeout(resized, 100); }, false); return resized; })(); ForceResizeKludge.$disabled = true/*gets deleted when setup is finished*/; fossil.FRK = ForceResizeKludge/*for debugging*/; const Chat = ForceResizeKludge.chat = (function(){ const cs = { verboseErrors: false /* if true then certain, mostly extraneous, error messages may be sent to the console. */, e:{/*map of certain DOM elements.*/ messageInjectPoint: E1('#message-inject-point'), pageTitle: E1('head title'), loadOlderToolbar: undefined /* the load-posts toolbar (dynamically created) */, inputWrapper: E1("#chat-input-area"), inputElementWrapper: E1('#chat-input-line-wrapper'), fileSelectWrapper: E1('#chat-input-file-area'), viewMessages: E1('#chat-messages-wrapper'), btnSubmit: E1('#chat-button-submit'), btnAttach: E1('#chat-button-attach'), inputX: E1('#chat-input-field-x'), input1: E1('#chat-input-field-single'), inputM: E1('#chat-input-field-multi'), inputFile: E1('#chat-input-file'), contentDiv: E1('div.content'), viewConfig: E1('#chat-config'), viewPreview: E1('#chat-preview'), previewContent: E1('#chat-preview-content'), btnPreview: E1('#chat-button-preview'), views: document.querySelectorAll('.chat-view'), |
︙ | ︙ | |||
174 175 176 177 178 179 180 | }, /** Gets (no args) or sets (1 arg) the current input text field value, taking into account single- vs multi-line input. The getter returns a string and the setter returns this object. */ inputValue: function(){ const e = this.inputElement(); if(arguments.length){ | > | | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | }, /** Gets (no args) or sets (1 arg) the current input text field value, taking into account single- vs multi-line input. The getter returns a string and the setter returns this object. */ inputValue: function(){ const e = this.inputElement(); if(arguments.length){ if(e.isContentEditable) e.innerText = arguments[0]; else e.value = arguments[0]; return this; } return e.isContentEditable ? e.innerText : e.value; }, /** Asks the current user input field to take focus. Returns this. */ inputFocus: function(){ this.inputElement().focus(); return this; }, /** Returns the current message input element. */ inputElement: function(){ return this.e.inputFields[this.e.inputFields.$currentIndex]; }, /** Enables (if yes is truthy) or disables all elements in * this.disableDuringAjax. */ enableAjaxComponents: function(yes){ D[yes ? 'enable' : 'disable'](this.disableDuringAjax); return this; }, |
︙ | ︙ | |||
415 416 417 418 419 420 421 | "active-user-list": false, /* When on, the [active-user-list] setting includes the timestamp of each user's most recent message. */ "active-user-list-timestamps": false, /* When on, the [audible-alert] is played for one's own messages, else it is only played for other users' messages. */ | | > > > > > > | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 | "active-user-list": false, /* When on, the [active-user-list] setting includes the timestamp of each user's most recent message. */ "active-user-list-timestamps": false, /* When on, the [audible-alert] is played for one's own messages, else it is only played for other users' messages. */ "alert-own-messages": false, /* "Experimental mode" input: use a contenteditable field for input. This is generally more comfortable to use, and more modern, than plain text input fields, but the list of browser-specific quirks and bugs is... not short. */ "edit-widget-x": false } }, /** Plays a new-message notification sound IF the audible-alert setting is true, else this is a no-op. Returns this. */ playNewMessageSound: function f(){ if(f.uri){ |
︙ | ︙ | |||
577 578 579 580 581 582 583 | animate: function f(e,a,cb){ if(!f.$disabled){ D.addClassBriefly(e, a, 0, cb); } return this; } }; | > > > > > > | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 | animate: function f(e,a,cb){ if(!f.$disabled){ D.addClassBriefly(e, a, 0, cb); } return this; } }; cs.e.inputFields = [ cs.e.input1, cs.e.inputM, cs.e.inputX ]; cs.e.inputFields.$currentIndex = 0; cs.e.inputFields.forEach(function(e,ndx){ if(ndx===cs.e.inputFields.$currentIndex) D.removeClass(e,'hidden'); else D.addClass(e,'hidden'); }); if(D.attr(cs.e.inputX,'contenteditable','plaintext-only').isContentEditable){ cs.$browserHasPlaintextOnly = true; }else{ /* Only the Chrome family supports contenteditable=plaintext-only */ cs.$browserHasPlaintextOnly = false; D.attr(cs.e.inputX,'contenteditable','true'); } cs.animate.$disabled = true; F.fetch.beforesend = ()=>cs.ajaxStart(); F.fetch.aftersend = ()=>cs.ajaxEnd(); cs.pageTitleOrig = cs.e.pageTitle.innerText; const qs = (e)=>document.querySelector(e); const argsToArray = function(args){ |
︙ | ︙ | |||
1159 1160 1161 1162 1163 1164 1165 | document.addEventListener('paste', pasteListener, true); if(window.Selection && window.Range && !Chat.$browserHasPlaintextOnly){ /* Acrobatics to keep *some* installations of Firefox from pasting formatting into contenteditable fields. This also works on Chrome, but chrome has the contenteditable=plaintext-only property which does this for us. */ | | | 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 | document.addEventListener('paste', pasteListener, true); if(window.Selection && window.Range && !Chat.$browserHasPlaintextOnly){ /* Acrobatics to keep *some* installations of Firefox from pasting formatting into contenteditable fields. This also works on Chrome, but chrome has the contenteditable=plaintext-only property which does this for us. */ Chat.e.inputX.addEventListener( 'paste', function(ev){ if (ev.clipboardData && ev.clipboardData.getData) { const pastedText = ev.clipboardData.getData('text/plain'); const selection = window.getSelection(); if (!selection.rangeCount) return false; selection.deleteFromDocument(/*remove selected content*/); |
︙ | ︙ | |||
1183 1184 1185 1186 1187 1188 1189 | which is not compatible with how we use it, so... */ ev.dataTransfer.effectAllowed = 'none'; ev.dataTransfer.dropEffect = 'none'; ev.preventDefault(); ev.stopPropagation(); return false; }; | < < | < | 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 | which is not compatible with how we use it, so... */ ev.dataTransfer.effectAllowed = 'none'; ev.dataTransfer.dropEffect = 'none'; ev.preventDefault(); ev.stopPropagation(); return false; }; ['drop','dragenter','dragleave','dragend'].forEach( (k)=>Chat.e.inputX.addEventListener(k, noDragDropEvents, false) ); return bxs; })()/*drag/drop/paste*/; const tzOffsetToString = function(off){ const hours = Math.round(off/60), min = Math.round(off % 30); return ''+(hours + (min ? '.5' : '')); |
︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 | /* Ship it! */ ev.preventDefault(); ev.stopPropagation(); Chat.submitMessage(); return false; } }; | > | > | 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 | /* Ship it! */ ev.preventDefault(); ev.stopPropagation(); Chat.submitMessage(); return false; } }; Chat.e.inputFields.forEach( (e)=>e.addEventListener('keydown', inputWidgetKeydown, false) ); Chat.e.btnSubmit.addEventListener('click',(e)=>{ e.preventDefault(); Chat.submitMessage(); return false; }); Chat.e.btnAttach.addEventListener( 'click', ()=>Chat.e.inputFile.click(), false); |
︙ | ︙ | |||
1381 1382 1383 1384 1385 1386 1387 | /* Settings menu entries... the most frequently-needed ones "should" (arguably) be closer to the start of this list. */ /** Settings ops structure: label: string for the UI | | > | > > > > > > > > > > > > > > > > | | > | > > > > > > > > | < | | | > > | | | | | < < < < | | | > | > > > | > | 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 | /* Settings menu entries... the most frequently-needed ones "should" (arguably) be closer to the start of this list. */ /** Settings ops structure: label: string for the UI boolValue: string (name of Chat.settings setting) or a function which returns true or false. If it is a string, it gets replaced by a function which returns Chat.settings.getBool(thatString) and the string gets assigned to the persistentSetting property of this object. select: SELECT element (instead of boolValue) callback: optional handler to call after setting is modified. Its "this" is the options object. If this object has a boolValue string or a persistentSetting property, the argument passed to the callback is a settings object in the form {key:K, value:V}. If this object does not have boolValue string or persistentSetting then the callback is passed an event object in response to the config option's UI widget being activated, normally a 'change' event. children: [array of settings objects]. These get listed under this element and indented slightly for visual grouping. Only one level of indention is supported. Elements which only have a label and maybe a hint and children can be used as headings. If a setting has a boolValue set, that gets rendered as a checkbox which toggles the given persistent setting (if boolValue is a string) AND listens for changes to that setting fired via Chat.settings.set() so that the checkbox can stay in sync with external changes to that setting. Various Chat UI elements stay in sync with the config UI via those settings events. The checkbox element gets added to the options object so that the callback() can reference it via this.checkbox. */ const settingsOps = [{ label: "Chat Configuration Options", hint: "Most of these settings are persistent via window.localStorage." },{ label: "Chat-only mode", hint: "Toggle the page between normal fossil view and chat-only view.", boolValue: 'chat-only-mode' },{ label: "Ctrl-enter to Send", hint: [ "When on, only Ctrl-Enter will send messages and Enter adds ", "blank lines. When off, both Enter and Ctrl-Enter send. ", "When the input field has focus, is empty, and preview ", "mode is NOT active then Ctrl-Enter toggles this setting." ].join(''), boolValue: 'edit-ctrl-send' },{ label: "Compact mode", hint: [ "Toggle between a space-saving or more spacious writing area. ", "When the input field has focus, is empty, and preview mode ", "is NOT active then Shift-Enter toggles this setting."].join(''), boolValue: 'edit-compact-mode' },{ label: "Left-align my posts", hint: "Default alignment of your own messages is selected " + "based window width/height relationship.", boolValue: ()=>!document.body.classList.contains('my-messages-right'), callback: function f(){ document.body.classList[ this.checkbox.checked ? 'remove' : 'add' ]('my-messages-right'); } },{ label: "Monospace message font", hint: "Use monospace font for message and input text.", boolValue: 'monospace-messages', callback: function(setting){ document.body.classList[ setting.value ? 'add' : 'remove' ]('monospace-messages'); } },{ label: "Show images inline", hint: "Show attached images inline or as a download link.", boolValue: 'images-inline' },{ label: "Use 'contenteditable' editing mode.", boolValue: 'edit-widget-x', hint: [ "When enabled, chat input uses a so-called 'contenteditable' ", "field. Though generally more comfortable and modern than ", "plain-text input fields, browser-specific quirks and bugs ", "may lead to frustration." ].join('') }]; /** Set up selection list of notification sounds. */ if(1){ const selectSound = D.select(); D.option(selectSound, "", "(no audio)"); const firstSoundIndex = selectSound.options.length; |
︙ | ︙ | |||
1463 1464 1465 1466 1467 1468 1469 | /* Missing file - removed after this setting was applied. Fall back to the first sound in the list. */ selectSound.selectedIndex = firstSoundIndex; } } Chat.setNewMessageSound(selectSound.value); settingsOps.push({ | > | > > | | | | | | | | < < | | | | | > > > > > > > > > > > > > > > > | > < > > | | > | > | > | | 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 | /* Missing file - removed after this setting was applied. Fall back to the first sound in the list. */ selectSound.selectedIndex = firstSoundIndex; } } Chat.setNewMessageSound(selectSound.value); settingsOps.push({ label: "Sound Options...", hint: "How to enable audio playback is browser-specific!", children:[{ hint: "Audio alert", select: selectSound, callback: function(ev){ const v = ev.target.value; Chat.setNewMessageSound(v); F.toast.message("Audio notifications "+(v ? "enabled" : "disabled")+"."); if(v) setTimeout(()=>Chat.playNewMessageSound(), 0); } },{ label: "Play notification for your own messages.", hint: "When enabled, the audio notification will be played for all messages, "+ "including your own. When disabled only messages from other users "+ "will trigger a notification.", boolValue: 'alert-own-messages' }] }); }/*audio notification config*/ settingsOps.push({ label: "Active User List", hint: [ "/chat cannot track active connections, but it can tell ", "you who has posted recently..."].join(''), children:[ namedOptions.activeUsers,{ label: "Timestamps in active users list", indent: true, hint: "Show most recent message timestamps in the active user list.", boolValue: 'active-user-list-timestamps' } ] }); /** Build UI for config options... */ settingsOps.forEach(function f(op,indentOrIndex){ const line = D.addClass(D.div(), 'menu-entry'); if(true===indentOrIndex) D.addClass(line, 'indent'); const label = op.label ? D.append(D.label(),op.label) : undefined; const labelWrapper = D.addClass(D.div(), 'label-wrapper'); var hint; if(op.hint){ hint = D.append(D.addClass(D.span(),'hint'),op.hint); } if(op.hasOwnProperty('select')){ const col0 = D.addClass(D.span(/*empty, but for spacing*/), 'toggle-wrapper'); D.append(line, labelWrapper, col0); D.append(labelWrapper, op.select); if(hint) D.append(labelWrapper, hint); if(label) D.append(label); if(op.callback){ op.select.addEventListener('change', (ev)=>op.callback(ev), false); } }else if(op.hasOwnProperty('boolValue')){ if(undefined === f.$id) f.$id = 0; ++f.$id; if('string' ===typeof op.boolValue){ const key = op.boolValue; op.boolValue = ()=>Chat.settings.getBool(key); op.persistentSetting = key; } const check = op.checkbox = D.attr(D.checkbox(1, op.boolValue()), 'aria-label', op.label); const id = 'cfgopt'+f.$id; const col0 = D.addClass(D.span(), 'toggle-wrapper'); check.checked = op.boolValue(); op.checkbox = check; D.attr(check, 'id', id); D.append(line, labelWrapper, col0); D.append(col0, check); if(label){ D.attr(label, 'for', id); D.append(labelWrapper, label); } if(hint) D.append(labelWrapper, hint); }else{ if(op.callback){ line.addEventListener('click', (ev)=>op.callback(ev)); } D.append(line, labelWrapper); if(label) D.append(labelWrapper, label); if(hint) D.append(labelWrapper, hint); } D.append(optionsMenu, line); if(op.persistentSetting){ Chat.settings.addListener( op.persistentSetting, |
︙ | ︙ | |||
1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 | 'change', function(){ Chat.settings.set(op.persistentSetting, op.checkbox.checked) }, false); } }else if(op.callback && op.checkbox){ op.checkbox.addEventListener('change', (ev)=>op.callback(ev), false); } }); })()/*#chat-button-settings setup*/; (function(){ /* Install default settings... must come after chat-button-settings setup so that the listeners which that installs are notified via the properties getting initialized here. */ Chat.settings.addListener('monospace-messages',function(s){ document.body.classList[s.value ? 'add' : 'remove']('monospace-messages'); }) Chat.settings.addListener('active-user-list',function(s){ Chat.showActiveUserList(s.value); }); Chat.settings.addListener('active-user-list-timestamps',function(s){ Chat.showActiveUserTimestamps(s.value); }); Chat.settings.addListener('chat-only-mode',function(s){ Chat.chatOnlyMode(s.value); }); Chat.settings.addListener('edit-compact-mode',function(s){ | > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > | | > > > | 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 | 'change', function(){ Chat.settings.set(op.persistentSetting, op.checkbox.checked) }, false); } }else if(op.callback && op.checkbox){ op.checkbox.addEventListener('change', (ev)=>op.callback(ev), false); } if(op.children) op.children.forEach((x)=>f(x,true)); }); })()/*#chat-button-settings setup*/; (function(){ /* Install default settings... must come after chat-button-settings setup so that the listeners which that installs are notified via the properties getting initialized here. */ Chat.settings.addListener('monospace-messages',function(s){ document.body.classList[s.value ? 'add' : 'remove']('monospace-messages'); }) Chat.settings.addListener('active-user-list',function(s){ Chat.showActiveUserList(s.value); }); Chat.settings.addListener('active-user-list-timestamps',function(s){ Chat.showActiveUserTimestamps(s.value); }); Chat.settings.addListener('chat-only-mode',function(s){ Chat.chatOnlyMode(s.value); }); Chat.settings.addListener('edit-widget-x',function(s){ let eSelected; if(s.value){ if(Chat.e.inputX===Chat.inputElement()) return; eSelected = Chat.e.inputX; }else{ eSelected = Chat.settings.getBool('edit-compact-mode') ? Chat.e.input1 : Chat.e.inputM; } const v = Chat.inputValue(); Chat.inputValue(''); Chat.e.inputFields.forEach(function(e,ndx){ if(eSelected===e){ Chat.e.inputFields.$currentIndex = ndx; D.removeClass(e, 'hidden'); } else D.addClass(e,'hidden'); }); Chat.inputValue(v); eSelected.focus(); }); Chat.settings.addListener('edit-compact-mode',function(s){ if(Chat.e.inputX!==Chat.inputElement()){ /* Text field/textarea mode: swap them if needed. Compact mode of inputX is toggled via CSS. */ const a = s.value ? [Chat.e.input1, Chat.e.inputM, 0] : [Chat.e.inputM, Chat.e.input1, 1]; const v = Chat.inputValue(); Chat.inputValue(''); Chat.e.inputFields.$currentIndex = a[2]; Chat.inputValue(v); D.removeClass(a[0], 'hidden'); D.addClass(a[1], 'hidden'); } Chat.e.inputElementWrapper.classList[ s.value ? 'add' : 'remove' ]('compact'); Chat.e.inputFields[Chat.e.inputFields.$currentIndex].focus(); }); Chat.settings.addListener('edit-ctrl-send',function(s){ const label = (s.value ? "Ctrl-" : "")+"Enter submits messages."; Chat.e.inputFields.forEach((e)=>{ const v = e.dataset.placeholder0 + " " +label; if(e.isContentEditable) e.dataset.placeholder = v; else D.attr(e,'placeholder',v); }); Chat.e.btnSubmit.title = label; }); const valueKludges = { /* Convert certain string-format values to other types... */ "false": false, "true": true }; |
︙ | ︙ | |||
1605 1606 1607 1608 1609 1610 1611 | this.e.previewContent.innerHTML = t; this.e.viewPreview.querySelectorAll('a').forEach(addAnchorTargetBlank); this.inputFocus(); }; Chat.e.viewPreview.querySelector('#chat-preview-close'). addEventListener('click', ()=>Chat.setCurrentView(Chat.e.viewMessages), false); let previewPending = false; | | | 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 | this.e.previewContent.innerHTML = t; this.e.viewPreview.querySelectorAll('a').forEach(addAnchorTargetBlank); this.inputFocus(); }; Chat.e.viewPreview.querySelector('#chat-preview-close'). addEventListener('click', ()=>Chat.setCurrentView(Chat.e.viewMessages), false); let previewPending = false; const elemsToEnable = [btnPreview, Chat.e.btnSubmit, Chat.e.inputFields]; const submit = function(ev){ ev.preventDefault(); ev.stopPropagation(); if(previewPending) return false; const txt = Chat.inputValue(); if(!txt){ Chat.setPreviewText(''); |
︙ | ︙ |
Changes to src/style.chat.css.
︙ | ︙ | |||
38 39 40 41 42 43 44 | padding: 0.25em 0.5em; margin-top: 0; min-width: 9em /*avoid unsightly "underlap" with the neighboring .message-widget-tab element*/; white-space: normal; } body.chat.monospace-messages .message-widget-content, | < < | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | padding: 0.25em 0.5em; margin-top: 0; min-width: 9em /*avoid unsightly "underlap" with the neighboring .message-widget-tab element*/; white-space: normal; } body.chat.monospace-messages .message-widget-content, body.chat.monospace-messages .chat-input-field{ font-family: monospace; } body.chat .message-widget-content > * { margin: 0; padding: 0; } body.chat .message-widget-content > pre { |
︙ | ︙ | |||
179 180 181 182 183 184 185 | } body.chat:not(.chat-only-mode) #chat-input-area{ /* Safari user reports that 2em is necessary to keep the file selection widget from overlapping the page footer, whereas a margin of 0 is fine for FF/Chrome (and 2em is a *huge* waste of space for those). */ margin-bottom: 0; } | | < < > > | > > > > > > | | | | | | | | | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | } body.chat:not(.chat-only-mode) #chat-input-area{ /* Safari user reports that 2em is necessary to keep the file selection widget from overlapping the page footer, whereas a margin of 0 is fine for FF/Chrome (and 2em is a *huge* waste of space for those). */ margin-bottom: 0; } .chat-input-field { flex: 10 1 auto; margin: 0; } #chat-input-field-x, #chat-input-field-multi { overflow: auto; resize: vertical; } #chat-input-field-x { display: inline-block/*supposed workaround for Chrome weirdness*/; padding: 0.2em; background-color: rgba(156,156,156,0.3); white-space: pre-wrap; /* ^^^ Firefox, when pasting plain text into a contenteditable field, loses all newlines unless we explicitly set this. Chrome does not. */ cursor: text; /* ^^^ In some browsers the cursor may not change for a contenteditable element until it has focus, causing potential confusion. */ } #chat-input-field-x:empty::before { content: attr(data-placeholder); opacity: 0.6; } .chat-input-field:not(:focus){ border-width: 1px; border-style: solid; border-radius: 0.25em; } .chat-input-field:focus{ /* This transparent border helps avoid the text shifting around when the contenteditable attribute causes a border (which we apparently cannot style) to be added. */ border-width: 1px; border-style: solid; border-color: transparent; border-radius: 0.25em; } /* Widget holding the chat message input field, send button, and settings button. */ body.chat #chat-input-line-wrapper { display: flex; flex-direction: row; align-items: stretch; flex-wrap: nowrap; } /*body.chat #chat-input-line-wrapper:not(.compact) { flex-wrap: nowrap; }*/ body.chat #chat-input-line-wrapper.compact { /* "The problem" with wrapping, together with a contenteditable input field, is that the latter grows as the user types, so causes wrapping to happen while they type, then to unwrap as soon as the input field is cleared (when the message is sent). When we stay wrapped in compact mode, the wrapped buttons simply take up too much space. */ /*flex-wrap: wrap; justify-content: flex-end;*/ flex-direction: column; /** We "really do" need column orientation here because it's the only way to eliminate the possibility that (A) the buttons get truncated in very narrow windows and (B) that they keep stable positions. */ } body.chat #chat-input-line-wrapper.compact #chat-input-field-x { } body.chat #chat-buttons-wrapper { flex: 0 1 auto; display: flex; flex-direction: column; align-items: center; min-width: 4em; min-height: 1.5em; align-self: flex-end /*keep buttons stable at bottom/right even when input field resizes */; } body.chat #chat-input-line-wrapper.compact #chat-buttons-wrapper { flex-direction: row; flex: 1 1 auto; align-self: stretch; justify-content: flex-end; /*flex-wrap: wrap;*/ /* Wrapping would be ideal except that the edit widget grows in width as the user types, moving the buttons |
︙ | ︙ | |||
283 284 285 286 287 288 289 | align-items: center; cursor: pointer; font-size: 130%; } body.chat #chat-buttons-wrapper > .cbutton:hover { background-color: rgba(200,200,200,0.3); } | | | | < | > | | < | | | | | | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 | align-items: center; cursor: pointer; font-size: 130%; } body.chat #chat-buttons-wrapper > .cbutton:hover { background-color: rgba(200,200,200,0.3); } body.chat #chat-input-line-wrapper.compact #chat-buttons-wrapper > .cbutton { margin: 2px 0.125em 0 0.125em; min-width: 6ex; max-width: 6ex; min-height: 2.3ex; max-height: 2.3ex; font-size: 120%; } body.chat #chat-input-line-wrapper.compact #chat-buttons-wrapper #chat-button-submit { min-width: 12ex; } .chat-input-field { font-family: inherit } body.chat #chat-input-line-wrapper:not(.compact) #chat-input-field-multi, body.chat #chat-input-line-wrapper:not(.compact) #chat-input-field-x { min-height: 4rem; /* Problems related to max-height: - If we do NOT set a max-height then pasting/typing a large amount of text can cause this element to grow without bounds, larger than the window, and there's no way to navigate it sensibly. In this case, manually resizing the element (desktop only - mobile doesn't offer that) will force it to stay at the selected size even if more content is added to it later. - If we DO set a max-height then its growth is bounded but it also cannot manually expanded by the user. The lesser of the two evils seems to be to rely on the browser feature that a manual resize of the element will pin its size. */ } body.chat #chat-input-line-wrapper > #chat-button-settings{ margin: 0 0 0 0.25em; max-width: 2em; } body.chat #chat-input-line-wrapper > input[type=text], body.chat #chat-input-line-wrapper > textarea { flex: 20 1 auto; max-width: revert; min-width: 20em; } body.chat #chat-input-line-wrapper.compact > input[type=text] { margin: 0 0 0.25em 0/* gap for if/when buttons wrap*/; } /* Widget holding the file selection control and preview */ body.chat #chat-input-file-area { display: flex; flex-direction: row; margin: 0; |
︙ | ︙ | |||
365 366 367 368 369 370 371 | body.chat #chat-drop-details { padding: 0 1em; white-space: pre; font-family: monospace; margin: auto; flex: 0; } | > > > | | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | body.chat #chat-drop-details { padding: 0 1em; white-space: pre; font-family: monospace; margin: auto; flex: 0; } body.chat #chat-drop-details:empty { padding: 0; margin: 0; } body.chat #chat-drop-details img { max-width: 45%; max-height: 45%; } body.chat .chat-view { flex: 20 1 auto /*ensure that these grow more than the non-.chat-view elements. |
︙ | ︙ | |||
393 394 395 396 397 398 399 400 401 402 | } body.chat #chat-config #chat-config-options { /* /chat config options go here */ flex: 1 1 auto; display: flex; flex-direction: column; overflow: auto; } body.chat #chat-config #chat-config-options .menu-entry { display: flex; | > | > > | > > > | | < > | | < > > | < | > > > | > | > > > > > > > > > > > > > > > | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 | } body.chat #chat-config #chat-config-options { /* /chat config options go here */ flex: 1 1 auto; display: flex; flex-direction: column; overflow: auto; align-items: stretch; } body.chat #chat-config #chat-config-options .menu-entry { display: flex; align-items: center; flex-direction: row; flex-wrap: nowrap; padding: 1em; flex: 1 1 auto; align-self: stretch; } body.chat #chat-config #chat-config-options .menu-entry.indent { padding-left: 2.5em; } body.chat #chat-config #chat-config-options .menu-entry:nth-of-type(even){ background-color: rgba(175,175,175,0.1); } body.chat #chat-config #chat-config-options .menu-entry:nth-of-type(odd){ background-color: rgba(175,175,175,0.25); } body.chat #chat-config #chat-config-options .menu-entry:first-child { /* Config list header */ } body.chat #chat-config #chat-config-options .menu-entry:first-child .label-wrapper { align-items: start; } body.chat #chat-config #chat-config-options .menu-entry > .toggle-wrapper { /* Holder for a checkbox, if any */ min-width: 1.5rem; margin-left: 1rem; } body.chat #chat-config #chat-config-options .menu-entry .label-wrapper { /* Wrapper for a LABEL and a .hint element. */ display: flex; flex-direction: column; align-self: baseline; flex: 1 1 auto; } body.chat #chat-config #chat-config-options .menu-entry label { /* Config option label. */ font-weight: bold; white-space: initial; } body.chat #chat-config #chat-config-options .menu-entry label[for] { cursor: pointer; } body.chat #chat-config #chat-config-options .menu-entry .hint { /* Config menu hint text */ font-size: 85%; white-space: pre-wrap; display: inline-block; opacity: 0.85; } body.chat #chat-config #chat-config-options .menu-entry select { } body.chat #chat-preview #chat-preview-content { overflow: auto; flex: 1 1 auto; padding: 0.5em; |
︙ | ︙ |
Changes to www/changes.wiki.
1 2 3 4 5 6 7 8 | <title>Change Log</title> <h2 id='v2_17'>Changes for version 2.17 (pending)</h2> * Major improvements to the "diff" subsystem, including: <ul> <li> Added new [/help?cmd=diff|formatting options]: --by, -b, --webpage, --json, --tcl. <li> Partial-line matching for unified diffs <li> Better partial-line matching for side-by-side diffs <li> Buttons on web-based diffs to show more context | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | <title>Change Log</title> <h2 id='v2_18'>Changes for version 2.18 (pending)</h2> * [/help?cmd=/chat|The /chat page] input options have been reworked again for better cross-browser portability. <h2 id='v2_17'>Changes for version 2.17 (pending)</h2> * Major improvements to the "diff" subsystem, including: <ul> <li> Added new [/help?cmd=diff|formatting options]: --by, -b, --webpage, --json, --tcl. <li> Partial-line matching for unified diffs <li> Better partial-line matching for side-by-side diffs <li> Buttons on web-based diffs to show more context |
︙ | ︙ |