Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch chat-markdown Excluding Merge-Ins
This is equivalent to a diff from 898b8f20 to 3ca1ec52
2021-09-21
| ||
13:25 | /chat now uses full-fledged markdown instead of its former special-case markup. Added a message preview option to support that. ... (check-in: 6c1ac839 user: stephan tags: trunk) | |
13:18 | In single-line edit mode, wrap the chat buttons if the screen is not "wide enough." Give the edit field a min-width of (experimentally) 24em. ... (Closed-Leaf check-in: 3ca1ec52 user: stephan tags: chat-markdown) | |
13:10 | Reduced side margin/padding on text input field to improve phone usability. ... (check-in: ac6e7ae9 user: stephan tags: chat-markdown) | |
10:08 | Merge fixes from trunk ... (check-in: 3f2365fe user: drh tags: chat-markdown) | |
09:47 | Fixed a comment to match the code, as reported on the forum. ... (check-in: 898b8f20 user: wyoung tags: trunk) | |
08:01 | Corrected th1 lappend to persist its result, as reported in forum post 97f8815dd3ddd7df. ... (check-in: cb531a54 user: stephan tags: trunk) | |
Changes to src/ajax.c.
︙ | ︙ | |||
262 263 264 265 266 267 268 | *zFn = PD("filename",P("fn")); if (*zFn) ++rc; } return rc; } /* | | | > > | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | *zFn = PD("filename",P("fn")); if (*zFn) ++rc; } return rc; } /* ** AJAX route /ajax/preview-text ** ** Required query parameters: ** ** filename=name of content, for use in determining the ** mimetype/render mode. ** ** content=text ** ** Optional query parameters: ** ** render_mode=integer (AJAX_RENDER_xxx) (default=AJAX_RENDER_GUESS) ** ** ln=0 or 1 to disable/enable line number mode in ** AJAX_RENDER_PLAIN_TEXT mode. |
︙ | ︙ | |||
363 364 365 366 367 368 369 | int cmp_ajax_route_name(const void *a, const void *b){ const AjaxRoute * rA = (const AjaxRoute*)a; const AjaxRoute * rB = (const AjaxRoute*)b; return fossil_strcmp(rA->zName, rB->zName); } /* | | | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | int cmp_ajax_route_name(const void *a, const void *b){ const AjaxRoute * rA = (const AjaxRoute*)a; const AjaxRoute * rB = (const AjaxRoute*)b; return fossil_strcmp(rA->zName, rB->zName); } /* ** WEBPAGE: ajax hidden ** ** The main dispatcher for shared ajax-served routes. Requires the ** 'name' parameter be the main route's name (as defined in a list in ** this function), noting that fossil automatically assigns all path ** parts after "ajax" to "name", e.g. /ajax/foo/bar assigns ** name=foo/bar. ** |
︙ | ︙ |
Changes to src/chat.c.
︙ | ︙ | |||
123 124 125 126 127 128 129 | ** For maximum efficiency, it is best to choose the longest delay that ** does not cause timeouts in intermediate proxies or web server. */ /* ** SETTING: chat-alert-sound width=10 ** ** This is the name of the builtin sound file to use for the alert tone. | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | ** For maximum efficiency, it is best to choose the longest delay that ** does not cause timeouts in intermediate proxies or web server. */ /* ** SETTING: chat-alert-sound width=10 ** ** This is the name of the builtin sound file to use for the alert tone. ** The value must be the name of a builtin WAV file. */ /* ** WEBPAGE: chat ** ** Start up a browser-based chat session. ** ** This is the main page that humans use to access the chatroom. Simply |
︙ | ︙ | |||
152 153 154 155 156 157 158 | zAlert = mprintf("%s/builtin/%s", g.zBaseURL, db_get("chat-alert-sound","alerts/plunk.wav")); zProjectName = db_get("project-name","Unnamed project"); style_set_current_feature("chat"); style_header("Chat"); @ <form accept-encoding="utf-8" id="chat-form" autocomplete="off"> @ <div id='chat-input-area'> | | | > | > | > | > > > | > > > > > | | > > | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 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 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 | zAlert = mprintf("%s/builtin/%s", g.zBaseURL, db_get("chat-alert-sound","alerts/plunk.wav")); zProjectName = db_get("project-name","Unnamed project"); style_set_current_feature("chat"); style_header("Chat"); @ <form accept-encoding="utf-8" id="chat-form" autocomplete="off"> @ <div id='chat-input-area'> @ <div id='chat-input-line' class='single-line'> @ <input type="text" name="msg" id="chat-input-single" \ @ placeholder="Type markdown-formatted message for %h(zProjectName)." \ @ autocomplete="off"> @ <textarea rows="8" id="chat-input-multi" \ @ placeholder="Type markdown-formatted message for %h(zProjectName). Ctrl-Enter sends it." \ @ class="hidden"></textarea> @ <div id='chat-edit-buttons'> @ <button id="chat-preview-button" \ @ title="Preview message">👁</button> @ <button id="chat-settings-button" \ @ title="Configure chat">⚙</button> @ <button id="chat-message-submit" \ @ title="Send message">📤</button> @ </div> @ </div> @ <div id='chat-input-file-area'> @ <div class='file-selection-wrapper'> @ <div class='help-buttonlet'> @ Select a file to upload, drag/drop a file into this spot, @ or paste an image from the clipboard if supported by @ your environment. @ </div> @ <input type="file" name="file" id="chat-input-file"> @ </div> @ <div id="chat-drop-details"></div> @ </div> @ </div> @ </form> @ <div id='chat-preview' class='hidden'> @ <header>Preview:</header> @ <div id='chat-preview-content' class='message-widget-content'></div> @ <div id='chat-preview-buttons'><button id='chat-preview-close'>Close Preview</button></div> @ </div> @ <div id='chat-config' class='hidden'> @ <div id='chat-config-options'></div> /* ^^^populated client-side */ @ <button>Close Settings</button> @ </div> @ <div id='chat-messages-wrapper'> /* New chat messages get inserted immediately after this element */ @ <span id='message-inject-point'></span> @ </div> fossil_free(zProjectName); builtin_fossil_js_bundle_or("popupwidget", "storage", "fetch", "pikchr", NULL); /* Always in-line the javascript for the chat page */ @ <script nonce="%h(style_nonce())">/* chat.c:%d(__LINE__) */ /* We need an onload handler to ensure that window.fossil is initialized before the chat init code runs. */ @ window.addEventListener('load', function(){ @ document.body.classList.add('chat') @ /*^^^for skins which add their own BODY tag */; @ window.fossil.config.chat = { @ fromcli: %h(PB("cli")?"true":"false"), @ alertSound: "%h(zAlert)", @ initSize: %d(db_get_int("chat-initial-history",50)), @ imagesInline: !!%d(db_get_boolean("chat-inline-images",1)) @ }; ajax_emit_js_preview_modes(0); chat_emit_alert_list(); cgi_append_content(builtin_text("chat.js"),-1); @ }, false); @ </script> style_finish_page(); } |
︙ | ︙ | |||
292 293 294 295 296 297 298 | }else{ CX("}"); } fossil_free(zTime); } /* | | | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | }else{ CX("}"); } fossil_free(zTime); } /* ** WEBPAGE: chat-send hidden ** ** This page receives (via XHR) a new chat-message and/or a new file ** to be entered into the chat history. ** ** On success it responds with an empty response: the new message ** should be fetched via /chat-poll. On error, e.g. login expiry, ** it emits a JSON response in the same form as described for |
︙ | ︙ | |||
345 346 347 348 349 350 351 | blob_reset(&b); } db_commit_transaction(); } /* ** This routine receives raw (user-entered) message text and transforms | | | < | < < < < < < < | < < < < < | < < < | < < < < < < | < < < < > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | blob_reset(&b); } db_commit_transaction(); } /* ** This routine receives raw (user-entered) message text and transforms ** it into HTML that is safe to insert using innerHTML. As of 2021-09-19, ** it does so by using markdown_to_html() to convert markdown-formatted ** zMsg to HTML. ** ** Space to hold the returned string is obtained from fossil_malloc() ** and must be freed by the caller. */ static char *chat_format_to_html(const char *zMsg){ Blob out; blob_init(&out, "", 0); if(*zMsg){ Blob bIn; blob_init(&bIn, zMsg, (int)strlen(zMsg)); markdown_to_html(&bIn, NULL, &out); } return blob_str(&out); } /* ** COMMAND: test-chat-formatter ** ** Usage: %fossil test-chat-formatter STRING ... |
︙ | ︙ | |||
440 441 442 443 444 445 446 | zOut = chat_format_to_html(g.argv[i]); fossil_print("[%d]: %s\n", i, zOut); fossil_free(zOut); } } /* | | | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | zOut = chat_format_to_html(g.argv[i]); fossil_print("[%d]: %s\n", i, zOut); fossil_free(zOut); } } /* ** WEBPAGE: chat-poll hidden ** ** The chat page generated by /chat using an XHR to this page to ** request new chat content. A typical invocation is: ** ** /chat-poll/N ** /chat-poll?name=N ** |
︙ | ︙ | |||
649 650 651 652 653 654 655 | db_finalize(&q1); blob_append(&json, "\n]}", 3); cgi_set_content(&json); return; } /* | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 | db_finalize(&q1); blob_append(&json, "\n]}", 3); cgi_set_content(&json); return; } /* ** WEBPAGE: chat-fetch-one hidden ** ** /chat-fetch-one/N ** ** Fetches a single message with the given ID, if available. ** ** Options: ** ** raw = the xmsg field will be returned unparsed. ** ** Response is either a single object in the format returned by ** /chat-poll (without the wrapper array) or a JSON-format error ** response, as documented for ajax_route_error(). */ void chat_fetch_one(void){ Blob json = empty_blob; /* The json to be constructed and returned */ const int fRaw = PD("raw",0)!=0; const int msgid = atoi(PD("name","0")); Stmt q; login_check_credentials(); if( !g.perm.Chat ) { chat_emit_permissions_error(0); return; } chat_create_tables(); cgi_set_content_type("application/json"); db_prepare(&q, "SELECT datetime(mtime), xfrom, xmsg, length(file)," " fname, fmime, lmtime" " FROM chat WHERE msgid=%d AND mdel IS NULL", msgid); if(SQLITE_ROW==db_step(&q)){ const char *zDate = db_column_text(&q, 0); const char *zFrom = db_column_text(&q, 1); const char *zRawMsg = db_column_text(&q, 2); const int nByte = db_column_int(&q, 3); const char *zFName = db_column_text(&q, 4); const char *zFMime = db_column_text(&q, 5); const char *zLMtime = db_column_text(&q, 7); blob_appendf(&json,"{\"msgid\": %d,", msgid); blob_appendf(&json, "\"mtime\":\"%.10sT%sZ\",", zDate, zDate+11); if( zLMtime && zLMtime[0] ){ blob_appendf(&json, "\"lmtime\":%!j,", zLMtime); } blob_append(&json, "\"xfrom\":", -1); if(zFrom){ blob_appendf(&json, "%!j,", zFrom); }else{ /* see https://fossil-scm.org/forum/forumpost/e0be0eeb4c */ blob_appendf(&json, "null,"); } blob_appendf(&json, "\"uclr\":%!j,", user_color(zFrom ? zFrom : "nobody")); blob_append(&json,"\"xmsg\":", 7); if(fRaw){ blob_appendf(&json, "%!j,", zRawMsg); }else{ char * zMsg = chat_format_to_html(zRawMsg ? zRawMsg : ""); blob_appendf(&json, "%!j,", zMsg); fossil_free(zMsg); } if( nByte==0 ){ blob_appendf(&json, "\"fsize\":0"); }else{ blob_appendf(&json, "\"fsize\":%d,\"fname\":%!j,\"fmime\":%!j", nByte, zFName, zFMime); } blob_append(&json,"}",1); cgi_set_content(&json); }else{ ajax_route_error(404,"Chat message #%d not found.", msgid); } db_finalize(&q); } /* ** WEBPAGE: chat-download hidden ** ** Download the CHAT.FILE attachment associated with a single chat ** entry. The "name" query parameter begins with an integer that ** identifies the particular chat message. The integer may be followed ** by a / and a filename, which will indicate to the browser to use ** the indicated name when saving the file. */ |
︙ | ︙ | |||
682 683 684 685 686 687 688 | db_blob(&r, "SELECT file FROM chat WHERE msgid=%d", msgid); cgi_set_content_type(zMime); cgi_set_content(&r); } /* | | | 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | db_blob(&r, "SELECT file FROM chat WHERE msgid=%d", msgid); cgi_set_content_type(zMime); cgi_set_content(&r); } /* ** WEBPAGE: chat-delete hidden ** ** Delete the chat entry identified by the name query parameter. ** Invoking fetch("chat-delete/"+msgid) from javascript in the client ** will delete a chat entry from the CHAT table. ** ** This routine both deletes the identified chat entry and also inserts ** a new entry with the current timestamp and with: |
︙ | ︙ |
Changes to src/chat.js.
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | 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"), fileSelectWrapper: E1('#chat-input-file-area'), messagesWrapper: E1('#chat-messages-wrapper'), inputForm: E1('#chat-form'), btnSubmit: E1('#chat-message-submit'), inputSingle: E1('#chat-input-single'), inputMulti: E1('#chat-input-multi'), inputCurrent: undefined/*one of inputSingle or inputMulti*/, inputFile: E1('#chat-input-file'), contentDiv: E1('div.content'), | > | > > > | 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 | 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"), inputLine: E1('#chat-input-line'), fileSelectWrapper: E1('#chat-input-file-area'), messagesWrapper: E1('#chat-messages-wrapper'), inputForm: E1('#chat-form'), btnSubmit: E1('#chat-message-submit'), inputSingle: E1('#chat-input-single'), inputMulti: E1('#chat-input-multi'), inputCurrent: undefined/*one of inputSingle or inputMulti*/, inputFile: E1('#chat-input-file'), contentDiv: E1('div.content'), configArea: E1('#chat-config'), previewArea: E1('#chat-preview'), previewContent: E1('#chat-preview-content'), btnPreview: E1('#chat-preview-button') }, me: F.user.name, mxMsg: F.config.chat.initSize ? -F.config.chat.initSize : -50, mnMsg: undefined/*lowest message ID we've seen so far (for history loading)*/, pageIsActive: 'visible'===document.visibilityState, changesSincePageHidden: 0, notificationBubbleColor: 'white', |
︙ | ︙ | |||
145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | return this.e.inputCurrent; }, /** Toggles between single- and multi-line edit modes. Returns this. */ inputToggleSingleMulti: function(){ const old = this.e.inputCurrent; if(this.e.inputCurrent === this.e.inputSingle){ this.e.inputCurrent = this.e.inputMulti; }else{ this.e.inputCurrent = this.e.inputSingle; } const m = this.e.messagesWrapper, sTop = m.scrollTop, mh1 = m.clientHeight; D.addClass(old, 'hidden'); D.removeClass(this.e.inputCurrent, 'hidden'); const mh2 = m.clientHeight; | > > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | return this.e.inputCurrent; }, /** Toggles between single- and multi-line edit modes. Returns this. */ inputToggleSingleMulti: function(){ const old = this.e.inputCurrent; if(this.e.inputCurrent === this.e.inputSingle){ this.e.inputCurrent = this.e.inputMulti; this.e.inputLine.classList.remove('single-line'); }else{ this.e.inputCurrent = this.e.inputSingle; this.e.inputLine.classList.add('single-line'); } const m = this.e.messagesWrapper, sTop = m.scrollTop, mh1 = m.clientHeight; D.addClass(old, 'hidden'); D.removeClass(this.e.inputCurrent, 'hidden'); const mh2 = m.clientHeight; |
︙ | ︙ | |||
483 484 485 486 487 488 489 490 491 492 493 494 495 496 | this.fetchLastMessageElem(); } F.toast.message("Deleted message "+id+"."); } return !!e; }; /** Given a .message-row element, this function returns whethe the current user may, at least hypothetically, delete the message globally. A user may always delete a local copy of a post. The server may trump this, e.g. if the login has been cancelled after this page was loaded. */ cs.userMayDelete = function(eMsg){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 | this.fetchLastMessageElem(); } F.toast.message("Deleted message "+id+"."); } return !!e; }; /** Toggles the given message between its parsed and plain-text representations. It requires a server round-trip to collect the plain-text form but caches it for subsequent toggles. Expects the ID of a currently-loaded message or a message-widget DOM elment from which it can extract an id. This is an aync operation the first time it's passed a given message and synchronous on subsequent calls for that message. It is a no-op if id does not resolve to a loaded message. */ cs.toggleTextMode = function(id){ var e; if(id instanceof HTMLElement){ e = id; id = e.dataset.msgid; }else{ e = this.getMessageElemById(id); } if(!e || !id) return false; else if(e.$isToggling) return; e.$isToggling = true; const content = e.querySelector('.message-widget-content'); if(!content.$elems){ content.$elems = [ content.firstElementChild, // parsed elem undefined // plaintext elem ]; }else if(content.$elems[1]){ // We have both content types. Simply toggle them. const child = ( content.firstElementChild===content.$elems[0] ? content.$elems[1] : content.$elems[0] ); delete e.$isToggling; D.append(D.clearElement(content), child); return; } // We need to fetch the plain-text version... const self = this; F.fetch('chat-fetch-one',{ urlParams:{ name: id, raw: true}, responseType: 'json', onload: function(msg){ content.$elems[1] = D.append(D.pre(),msg.xmsg); self.toggleTextMode(e); }, aftersend:function(){ delete e.$isToggling; Chat.ajaxEnd(); } }); return true; }; /** Given a .message-row element, this function returns whethe the current user may, at least hypothetically, delete the message globally. A user may always delete a local copy of a post. The server may trump this, e.g. if the login has been cancelled after this page was loaded. */ cs.userMayDelete = function(eMsg){ |
︙ | ︙ | |||
679 680 681 682 683 684 685 686 687 688 689 690 691 692 | // Hence, even though innerHTML is normally frowned upon, it is // perfectly safe to use in this context. if(m.xmsg instanceof Array){ // Used by Chat.reportErrorAsMessage() D.append(contentTarget, m.xmsg); }else{ contentTarget.innerHTML = m.xmsg; } } this.e.tab.addEventListener('click', this._handleLegendClicked, false); if(eXFrom){ eXFrom.addEventListener('click', ()=>this.e.tab.click(), false); } return this; | > > > | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 | // Hence, even though innerHTML is normally frowned upon, it is // perfectly safe to use in this context. if(m.xmsg instanceof Array){ // Used by Chat.reportErrorAsMessage() D.append(contentTarget, m.xmsg); }else{ contentTarget.innerHTML = m.xmsg; if(F.pikchr){ F.pikchr.addSrcView(contentTarget.querySelectorAll('svg.pikchr')); } } } this.e.tab.addEventListener('click', this._handleLegendClicked, false); if(eXFrom){ eXFrom.addEventListener('click', ()=>this.e.tab.click(), false); } return this; |
︙ | ︙ | |||
737 738 739 740 741 742 743 | const btnDeleteGlobal = D.button("Delete globally"); D.append(toolbar, btnDeleteGlobal); btnDeleteGlobal.addEventListener('click', function(){ self.hide(); Chat.deleteMessage(eMsg); }); } | < < | | > > > > > > > > | 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 | const btnDeleteGlobal = D.button("Delete globally"); D.append(toolbar, btnDeleteGlobal); btnDeleteGlobal.addEventListener('click', function(){ self.hide(); Chat.deleteMessage(eMsg); }); } const toolbar2 = D.addClass(D.div(), 'toolbar'); D.append(this.e, toolbar2); const btnToggleText = D.button("Toggle text mode"); btnToggleText.addEventListener('click', function(){ self.hide(); Chat.toggleTextMode(eMsg); }); D.append(toolbar2, btnToggleText); if(eMsg.dataset.xfrom){ /* Add a link to the /timeline filtered on this user. */ const timelineLink = D.attr( D.a(F.repoUrl('timeline',{ u: eMsg.dataset.xfrom, y: 'a' }), "User's Timeline"), 'target', '_blank' ); |
︙ | ︙ | |||
879 880 881 882 883 884 885 886 887 888 889 890 891 892 | and/or the file attachment field to the server. If both are empty, this is a no-op. */ Chat.submitMessage = function f(){ if(!f.spaces){ f.spaces = /\s+$/; } const fd = new FormData(this.e.inputForm) /* ^^^^ we don't really want/need the FORM element, but when FormData() is default-constructed here then the server segfaults, and i have no clue why! */; var msg = this.inputValue().trim(); if(msg && (msg.indexOf('\n')>0 || f.spaces.test(msg))){ /* Cosmetic: trim whitespace from the ends of lines to try to | > | 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 | and/or the file attachment field to the server. If both are empty, this is a no-op. */ Chat.submitMessage = function f(){ if(!f.spaces){ f.spaces = /\s+$/; } this.revealPreview(false); const fd = new FormData(this.e.inputForm) /* ^^^^ we don't really want/need the FORM element, but when FormData() is default-constructed here then the server segfaults, and i have no clue why! */; var msg = this.inputValue().trim(); if(msg && (msg.indexOf('\n')>0 || f.spaces.test(msg))){ /* Cosmetic: trim whitespace from the ends of lines to try to |
︙ | ︙ | |||
950 951 952 953 954 955 956 | return d.toISOString() .replace('T',' ').replace(/\.\d+/,'').replace('Z', ' zulu'); }; (function(){/*Set up #chat-settings-button */ const settingsButton = document.querySelector('#chat-settings-button'); const optionsMenu = E1('#chat-config-options'); | | > > > > | > > > > > | 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 | return d.toISOString() .replace('T',' ').replace(/\.\d+/,'').replace('Z', ' zulu'); }; (function(){/*Set up #chat-settings-button */ const settingsButton = document.querySelector('#chat-settings-button'); const optionsMenu = E1('#chat-config-options'); const cbToggle = function(ev){ ev.preventDefault(); ev.stopPropagation(); if(Chat.e.configArea.classList.contains('hidden')){ D.removeClass(Chat.e.configArea, 'hidden'); D.addClass([Chat.e.messagesWrapper, Chat.e.previewArea], 'hidden'); }else{ D.addClass(Chat.e.configArea, 'hidden'); D.removeClass(Chat.e.messagesWrapper, 'hidden'); } return false; }; D.attr(settingsButton, 'role', 'button').addEventListener('click', cbToggle, false); Chat.e.configArea.querySelector('button').addEventListener('click', cbToggle, false); /* Settings menu entries... */ const settingsOps = [{ label: "Multi-line input", boolValue: ()=>Chat.inputElement()===Chat.e.inputMulti, |
︙ | ︙ | |||
993 994 995 996 997 998 999 | callback: function(){ const v = Chat.settings.toggle('images-inline'); F.toast.message("Image mode set to "+(v ? "inline" : "hyperlink")+"."); } }]; /** Set up selection list of notification sounds. */ | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 | callback: function(){ const v = Chat.settings.toggle('images-inline'); F.toast.message("Image mode set to "+(v ? "inline" : "hyperlink")+"."); } }]; /** Set up selection list of notification sounds. */ if(1){ settingsOps.push({ label: "Audible alerts", boolValue: ()=>Chat.settings.getBool('audible-alert'), callback: function(){ const v = Chat.settings.toggle('audible-alert'); Chat.setNewMessageSound(v ? F.config.chat.alertSound : false); if(v) setTimeout(()=>Chat.playNewMessageSound(), 50); F.toast.message("Audio notifications "+(v ? "enabled" : "disabled")+"."); } }); Chat.setNewMessageSound( Chat.settings.getBool('audible-alert') ? F.config.chat.alertSound : false ); }/*audio notification config*/ /** Build list of options... */ settingsOps.forEach(function f(op){ const line = D.addClass(D.div(), 'menu-entry'); const btn = D.append( |
︙ | ︙ | |||
1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 | D.append(optionsMenu, line); }); if(settingsOps.selectSound){ D.append(optionsMenu, settingsOps.selectSound); } //settingsButton.click()/*for for development*/; })()/*#chat-settings-button setup*/; /** Callback for poll() to inject new content into the page. jx == the response from /chat-poll. If atEnd is true, the message is appended to the end of the chat list (for loading older messages), else the beginning (the default). */ const newcontent = function f(jx,atEnd){ if(!f.processPost){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | D.append(optionsMenu, line); }); if(settingsOps.selectSound){ D.append(optionsMenu, settingsOps.selectSound); } //settingsButton.click()/*for for development*/; })()/*#chat-settings-button setup*/; (function(){/*set up message preview*/ const btnPreview = Chat.e.btnPreview; Chat.setPreviewText = function(t){ this.revealPreview(true).e.previewContent.innerHTML = t; }; /** Reveals preview area if showIt is true, else hides it. This also shows/hides other elements, "as appropriate." */ Chat.revealPreview = function(showIt){ if(showIt){ D.removeClass(Chat.e.previewArea, 'hidden'); D.addClass([Chat.e.messagesWrapper, Chat.e.configArea], 'hidden'); }else{ D.addClass(Chat.e.previewArea, 'hidden'); D.removeClass(Chat.e.messagesWrapper, 'hidden'); } return this; }; Chat.e.previewArea.querySelector('#chat-preview-close'). addEventListener('click', ()=>Chat.revealPreview(false), false); let previewPending = false; const elemsToEnable = [ btnPreview, Chat.e.btnSubmit, Chat.e.inputSingle, Chat.e.inputMulti]; Chat.disableDuringAjax.push(btnPreview); const submit = function(ev){ ev.preventDefault(); ev.stopPropagation(); if(previewPending) return false; const txt = Chat.e.inputCurrent.value; if(!txt){ Chat.setPreviewText(''); previewPending = false; return false; } const fd = new FormData(); fd.append('content', txt); fd.append('filename','chat.md' /*filename needed for mimetype determination*/); fd.append('render_mode',F.page.previewModes.wiki); F.fetch('ajax/preview-text',{ payload: fd, onload: (html)=>Chat.setPreviewText(html), onerror: function(e){ F.fetch.onerror(e); Chat.setPreviewText("ERROR: "+( e.message || 'Unknown error fetching preview!' )); }, beforesend: function(){ D.disable(elemsToEnable); Chat.ajaxStart(); previewPending = true; Chat.setPreviewText("Loading preview..."); }, aftersend:function(){ previewPending = false; D.enable(elemsToEnable); Chat.ajaxEnd(); } }); return false; }; btnPreview.addEventListener('click', submit, false); })()/*message preview setup*/; /** Callback for poll() to inject new content into the page. jx == the response from /chat-poll. If atEnd is true, the message is appended to the end of the chat list (for loading older messages), else the beginning (the default). */ const newcontent = function f(jx,atEnd){ if(!f.processPost){ |
︙ | ︙ |
Changes to src/default.css.
︙ | ︙ | |||
1594 1595 1596 1597 1598 1599 1600 | /* Hide image when sources are being shown. */ position: absolute !important; opacity: 0 !important; pointer-events: none !important; display: none !important; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 | /* Hide image when sources are being shown. */ position: absolute !important; opacity: 0 !important; pointer-events: none !important; display: none !important; } /* An icon element intended for use as a button/menu for accessing app-specific settings. */ .settings-icon { /* Icon source: https://de.wikipedia.org/wiki/Datei:OOjs_UI_icon_settings.svg MIT License. */ background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg \ |
︙ | ︙ | |||
1732 1733 1734 1735 1736 1737 1738 | } .settings-icon:hover { border: 1px outset rgba(127,127,127,1); } body.fossil-dark-style .settings-icon { filter: invert(100%); } | < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 | } .settings-icon:hover { border: 1px outset rgba(127,127,127,1); } body.fossil-dark-style .settings-icon { filter: invert(100%); } input[type="checkbox"].diff-toggle { float: right; } body.branch .brlist > table > tbody > tr:hover:not(.selected), body.branch .brlist > table > tbody > tr.selected { background-color: #ffc; |
︙ | ︙ |
Changes to src/main.mk.
︙ | ︙ | |||
263 264 265 266 267 268 269 270 271 272 273 274 275 276 | $(SRCDIR)/sounds/a.wav \ $(SRCDIR)/sounds/b.wav \ $(SRCDIR)/sounds/c.wav \ $(SRCDIR)/sounds/d.wav \ $(SRCDIR)/sounds/e.wav \ $(SRCDIR)/sounds/f.wav \ $(SRCDIR)/style.admin_log.css \ $(SRCDIR)/style.fileedit.css \ $(SRCDIR)/style.wikiedit.css \ $(SRCDIR)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ | > | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 | $(SRCDIR)/sounds/a.wav \ $(SRCDIR)/sounds/b.wav \ $(SRCDIR)/sounds/c.wav \ $(SRCDIR)/sounds/d.wav \ $(SRCDIR)/sounds/e.wav \ $(SRCDIR)/sounds/f.wav \ $(SRCDIR)/style.admin_log.css \ $(SRCDIR)/style.chat.css \ $(SRCDIR)/style.fileedit.css \ $(SRCDIR)/style.wikiedit.css \ $(SRCDIR)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ |
︙ | ︙ |
Changes to src/markdown.c.
︙ | ︙ | |||
1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 | int level = 0; size_t i, end, skip, span_beg, span_size; if( !size || data[0]!='#' ) return 0; while( level<size && level<6 && data[level]=='#' ){ level++; } for(i=level; i<size && (data[i]==' ' || data[i]=='\t'); i++); span_beg = i; for(end=i; end<size && data[end]!='\n'; end++); skip = end; if( end<=i ) return parse_paragraph(ob, rndr, data, size); while( end && data[end-1]=='#' ){ end--; } while( end && (data[end-1]==' ' || data[end-1]=='\t') ){ end--; } | > | 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 | int level = 0; size_t i, end, skip, span_beg, span_size; if( !size || data[0]!='#' ) return 0; while( level<size && level<6 && data[level]=='#' ){ level++; } for(i=level; i<size && (data[i]==' ' || data[i]=='\t'); i++); if ( i == level ) return parse_paragraph(ob, rndr, data, size); span_beg = i; for(end=i; end<size && data[end]!='\n'; end++); skip = end; if( end<=i ) return parse_paragraph(ob, rndr, data, size); while( end && data[end-1]=='#' ){ end--; } while( end && (data[end-1]==' ' || data[end-1]=='\t') ){ end--; } |
︙ | ︙ |
Added src/style.chat.css.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 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 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 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 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 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 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 347 348 | /* Chat-related */ body.chat span.at-name { /* for @USERNAME references */ text-decoration: underline; font-weight: bold; } /* A wrapper for a single single chat message (one row of the UI) */ body.chat .message-widget { margin-bottom: 0.75em; border: none; display: flex; flex-direction: column; border: none; align-items: flex-start; } body.chat.my-messages-right .message-widget.mine { /* Right-aligns a user's own chat messages, similar to how most mobile messaging apps do it. */ align-items: flex-end; } body.chat.my-messages-right .message-widget.notification { /* Center-aligns a system-level notification message. */ align-items: center; } /* The content area of a message. */ body.chat .message-widget-content { display: inline-block; border-radius: 0.25em; border: 1px solid rgba(0,0,0,0.2); box-shadow: 0.2em 0.2em 0.2em rgba(0, 0, 0, 0.29); 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 textarea, body.chat.monospace-messages input[type=text]{ font-family: monospace; } body.chat .message-widget-content > * { margin: 0; padding: 0; } body.chat .message-widget-content > pre { white-space: pre-wrap; } body.chat .message-widget-content > .markdown > *:first-child { margin-top: 0; } body.chat .message-widget-content > .markdown > *:last-child { margin-bottom: 0; } /* User name and timestamp (a LEGEND-like element) */ body.chat .message-widget .message-widget-tab { border-radius: 0.25em 0.25em 0 0; margin: 0 0.25em 0em 0.15em; padding: 0 0.5em 0.15em 0.5em; cursor: pointer; white-space: nowrap; } body.chat .fossil-tooltip.help-buttonlet-content { font-size: 80%; } body.chat .message-widget .message-widget-tab .xfrom { /* Element which holds the "this message is from user X" part of the message banner. */ font-style: italic; font-weight: bold; } /* The popup element for displaying message timestamps and deletion controls. */ body.chat .chat-message-popup { font-family: monospace; font-size: 0.8em; text-align: left; display: flex; flex-direction: column; align-items: stretch; padding: 0.25em; z-index: 200; } /* Full message timestamps. */ body.chat .chat-message-popup > span { white-space: nowrap; } /* Container for the message deletion buttons. */ body.chat .chat-message-popup > .toolbar { padding: 0; margin: 0; border: 2px inset rgba(0,0,0,0.3); border-radius: 0.25em; display: flex; flex-direction: row; justify-content: stretch; flex-wrap: wrap; align-items: center; } body.chat .chat-message-popup > .toolbar > * { margin: 0.35em; } body.chat .chat-message-popup > .toolbar > button { flex: 1 1 auto; } /* The widget for loading more/older chat messages. */ body.chat #load-msg-toolbar { border-radius: 0.25em; padding: 0.1em 0.2em; margin-bottom: 1em; } /* .all-done is set when chat has loaded all of the available historical messages */ body.chat #load-msg-toolbar.all-done { opacity: 0.5; } body.chat #load-msg-toolbar > div { display: flex; flex-direction: row; justify-content: stretch; flex-wrap: wrap; } body.chat #load-msg-toolbar > div > button { flex: 1 1 auto; } /* "Chat-only mode" hides the site header/footer, showing only the chat app. */ body.chat.chat-only-mode{} body.chat #chat-settings-button {} /** Popup widget for the /chat settings. */ body.chat .chat-settings-popup { font-size: 0.8em; text-align: left; display: flex; flex-direction: column; align-items: stretch; padding: 0.25em; z-index: 200; } body.chat .chat-settings-popup > span { vertical-align: middle; } body.chat .chat-settings-popup > span.menu-entry{ white-space: nowrap; cursor: pointer; border: 1px solid; border-radius: 0.25em; padding: 0.25em 0.5em; display: flex; flex-direction: row; align-items: center; justify-content: space-between; } body.chat .chat-settings-popup > span.menu-entry:hover { } body.chat .chat-settings-popup > span.menu-entry > .help-buttonlet { vertical-align: middle; } body.chat .chat-settings-popup > span.menu-entry > span.button { margin: 0.25em 0.2em; padding: 0.25em; flex: 1 1 auto/*eliminates dead no-click zones on the right*/; } body.chat .chat-settings-popup > span.menu-entry > input[type=checkbox] { cursor: inherit; } body.chat .chat-settings-popup > select.menu-entry { flex: 1 1 auto; padding: 0; cursor: pointer; min-height: 2.5em; border-radius: 0.25em; } body.chat .chat-settings-popup > select.menu-entry > option { /*Recall that many browsers don't allow styling of OPTION elements, or allow only very limited styling.*/ } /** Container for the list of /chat messages. */ body.chat #chat-messages-wrapper { overflow: auto; flex: 2 1 auto; padding: 0 0.25em; } body.chat #chat-messages-wrapper.loading > * { /* An attempt at reducing flicker when loading lots of messages. */ visibility: hidden; } body.chat div.content { margin: 0; padding: 0; display: flex; flex-direction: column-reverse; /* ^^^^ In order to get good automatic scrolling of new messages on the BOTTOM in bottom-up chat mode, such that they scroll up instead of down, we have to use column-reverse layout, which changes #chat-messages-wrapper's "gravity" for purposes of scrolling! If we instead use flex-direction:column then each new message pushes #chat-input-area down further off the screen! */ align-items: stretch; } /* Wrapper for /chat user input controls */ body.chat #chat-input-area { display: flex; flex-direction: column; padding: 0.5em 0 0 0; border-bottom: none; border-top: 1px solid black; margin: 0.5em 0; position: initial /*sticky currently disabled due to scrolling-related issues*/; bottom: 0; } 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; } /* Widget holding the chat message input field, send button, and settings button. */ body.chat #chat-input-line { display: flex; flex-direction: row; margin-bottom: 0.25em; align-items: stretch; } body.chat #chat-input-line.single-line { flex-wrap: wrap; } body.chat #chat-edit-buttons { display: flex; flex-direction: column; justify-content: space-between; } body.chat #chat-input-line.single-line #chat-edit-buttons { flex-direction: row; } body.chat #chat-edit-buttons > * { /*flex: 1 5 auto;*/ max-width: 6em; margin: 0 0.25em; } body.chat #chat-input-line > button { max-width: 4em; } body.chat #chat-input-line > #chat-settings-button{ margin: 0 0 0 0.25em; max-width: 2em; } body.chat #chat-input-line > input[type=text], body.chat #chat-input-line > textarea { flex: 5 1 auto; max-width: revert; min-width: 24em; } /* Widget holding the file selection control and preview */ body.chat #chat-input-file-area { display: flex; flex-direction: row; align-items: center; flex-wrap: wrap; } body.chat #chat-input-file-area > .file-selection-wrapper { align-self: flex-start; margin-right: 0.5em; flex: 0 1 auto; padding: 0.25em 0.25em 0.25em 0; white-space: nowrap; } body.chat #chat-input-file-area .file-selection-wrapper > * { vertical-align: middle; margin: 0; } body.chat #chat-input-file { border:1px solid rgba(0,0,0,0);/*avoid UI shift during drop-targeting*/ border-radius: 0.25em; padding: 0.25em; } body.chat #chat-input-file > input { flex: 1 0 auto; } /* Indicator when a drag/drop is in progress */ body.chat #chat-input-file.dragover { border: 1px dashed green; } /* Widget holding the details of a selected/dropped file/image. */ body.chat #chat-drop-details { flex: 0 1 auto; padding: 0.5em 1em; margin-left: 0.5em; white-space: pre; font-family: monospace; } body.chat #chat-drop-details img { max-width: 45%; max-height: 45%; } body.chat #chat-config, body.chat #chat-preview { /* /chat configuration widget */ display: flex; flex-direction: column; overflow: auto; flex: 2 1 auto; padding: 0; margin: 0; align-items: stretch; min-height: 6em; } 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; align-items: center; flex-direction: row; flex-wrap: wrap; padding: 1em; } body.chat #chat-config #chat-config-options .menu-entry > *:first-child { margin-right: 1em; } body.chat #chat-preview #chat-preview-content { overflow: auto; flex: 1 1 auto; padding: 0.5em; border: 1px dotted; } body.chat #chat-preview #chat-preview-content > * { margin: 0; padding: 0; } body.chat #chat-preview #chat-preview-buttons { flex: 0 1 auto; display: flex; flex-direction: column; } body.chat #chat-config > button, body.chat #chat-preview #chat-preview-buttons > button { padding: 0.5em; flex: 0 1 auto; margin: 0.25em 0; } |
Changes to win/Makefile.mingw.
︙ | ︙ | |||
672 673 674 675 676 677 678 679 680 681 682 683 684 685 | $(SRCDIR)/sounds/a.wav \ $(SRCDIR)/sounds/b.wav \ $(SRCDIR)/sounds/c.wav \ $(SRCDIR)/sounds/d.wav \ $(SRCDIR)/sounds/e.wav \ $(SRCDIR)/sounds/f.wav \ $(SRCDIR)/style.admin_log.css \ $(SRCDIR)/style.fileedit.css \ $(SRCDIR)/style.wikiedit.css \ $(SRCDIR)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ | > | 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 | $(SRCDIR)/sounds/a.wav \ $(SRCDIR)/sounds/b.wav \ $(SRCDIR)/sounds/c.wav \ $(SRCDIR)/sounds/d.wav \ $(SRCDIR)/sounds/e.wav \ $(SRCDIR)/sounds/f.wav \ $(SRCDIR)/style.admin_log.css \ $(SRCDIR)/style.chat.css \ $(SRCDIR)/style.fileedit.css \ $(SRCDIR)/style.wikiedit.css \ $(SRCDIR)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ |
︙ | ︙ |
Changes to win/Makefile.msc.
︙ | ︙ | |||
614 615 616 617 618 619 620 621 622 623 624 625 626 627 | "$(SRCDIR)\sounds\a.wav" \ "$(SRCDIR)\sounds\b.wav" \ "$(SRCDIR)\sounds\c.wav" \ "$(SRCDIR)\sounds\d.wav" \ "$(SRCDIR)\sounds\e.wav" \ "$(SRCDIR)\sounds\f.wav" \ "$(SRCDIR)\style.admin_log.css" \ "$(SRCDIR)\style.fileedit.css" \ "$(SRCDIR)\style.wikiedit.css" \ "$(SRCDIR)\tree.js" \ "$(SRCDIR)\useredit.js" \ "$(SRCDIR)\wiki.wiki" OBJ = "$(OX)\add$O" \ | > | 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 | "$(SRCDIR)\sounds\a.wav" \ "$(SRCDIR)\sounds\b.wav" \ "$(SRCDIR)\sounds\c.wav" \ "$(SRCDIR)\sounds\d.wav" \ "$(SRCDIR)\sounds\e.wav" \ "$(SRCDIR)\sounds\f.wav" \ "$(SRCDIR)\style.admin_log.css" \ "$(SRCDIR)\style.chat.css" \ "$(SRCDIR)\style.fileedit.css" \ "$(SRCDIR)\style.wikiedit.css" \ "$(SRCDIR)\tree.js" \ "$(SRCDIR)\useredit.js" \ "$(SRCDIR)\wiki.wiki" OBJ = "$(OX)\add$O" \ |
︙ | ︙ | |||
1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 | echo "$(SRCDIR)\sounds/a.wav" >> $@ echo "$(SRCDIR)\sounds/b.wav" >> $@ echo "$(SRCDIR)\sounds/c.wav" >> $@ echo "$(SRCDIR)\sounds/d.wav" >> $@ echo "$(SRCDIR)\sounds/e.wav" >> $@ echo "$(SRCDIR)\sounds/f.wav" >> $@ echo "$(SRCDIR)\style.admin_log.css" >> $@ echo "$(SRCDIR)\style.fileedit.css" >> $@ echo "$(SRCDIR)\style.wikiedit.css" >> $@ echo "$(SRCDIR)\tree.js" >> $@ echo "$(SRCDIR)\useredit.js" >> $@ echo "$(SRCDIR)\wiki.wiki" >> $@ "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" | > | 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 | echo "$(SRCDIR)\sounds/a.wav" >> $@ echo "$(SRCDIR)\sounds/b.wav" >> $@ echo "$(SRCDIR)\sounds/c.wav" >> $@ echo "$(SRCDIR)\sounds/d.wav" >> $@ echo "$(SRCDIR)\sounds/e.wav" >> $@ echo "$(SRCDIR)\sounds/f.wav" >> $@ echo "$(SRCDIR)\style.admin_log.css" >> $@ echo "$(SRCDIR)\style.chat.css" >> $@ echo "$(SRCDIR)\style.fileedit.css" >> $@ echo "$(SRCDIR)\style.wikiedit.css" >> $@ echo "$(SRCDIR)\tree.js" >> $@ echo "$(SRCDIR)\useredit.js" >> $@ echo "$(SRCDIR)\wiki.wiki" >> $@ "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" |
︙ | ︙ |
Changes to www/changes.wiki.
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | pages by default. Use the new <tt>--all</tt> option to include deleted pages in the output. * The [/help?cmd=all|fossil all git status] command only shows reports for the subset of repositories that have a configured Git export. * Enhanced the [/help?cmd=/chat|/chat page] configuration and added the ability for a repository administrator to [./chat.md#notifications|extend the selection of notification sounds via unversioned files]. <h2 id='v2_16'>Changes for Version 2.16 (2021-07-02)</h2> * <b>Security:</b> Fix the client-side TLS so that it verifies that the server hostname matches its certificate. * The default "ssh" command on Windows is changed to "ssh" instead of the legacy "plink", as ssh is now generally available on Windows systems. Installations that still need to use the legacy "plink" can make that | > > > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | pages by default. Use the new <tt>--all</tt> option to include deleted pages in the output. * The [/help?cmd=all|fossil all git status] command only shows reports for the subset of repositories that have a configured Git export. * Enhanced the [/help?cmd=/chat|/chat page] configuration and added the ability for a repository administrator to [./chat.md#notifications|extend the selection of notification sounds via unversioned files]. * The [/help?cmd=/chat|/chat] messages now use fossil's full complement of markdown features, instead of the prior small subset of markup it previously supported. This retroactively applies to all chat messages, as they are markdown-processed when they are sent instead of when they are saved. See [./chat.md#usage|the chat docs] for more details. <h2 id='v2_16'>Changes for Version 2.16 (2021-07-02)</h2> * <b>Security:</b> Fix the client-side TLS so that it verifies that the server hostname matches its certificate. * The default "ssh" command on Windows is changed to "ssh" instead of the legacy "plink", as ssh is now generally available on Windows systems. Installations that still need to use the legacy "plink" can make that |
︙ | ︙ |
Changes to www/chat.md.
1 2 3 4 5 6 7 8 | # Fossil Chat ## Introduction As of version 2.14, Fossil supports a developer chatroom feature. The chatroom provides an ephemeral discussion venue for insiders. Design goals include: | | > | | < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # Fossil Chat ## Introduction As of version 2.14, Fossil supports a developer chatroom feature. The chatroom provides an ephemeral discussion venue for insiders. Design goals include: * **Simple but functional** → Fossil chat is designed to provide a convenient real-time communication mechanism for geographically dispersed developers. Fossil chat is *not* intended as a replacement or competitor for IRC, Slack, Discord, Telegram, Google Hangouts, etc. * **Low administration** → You can activate the chatroom in seconds without having to mess with configuration files or install new software. In an existing [server setup](./server/), simply enable the [C capability](/setup_ucap_list) for users whom you want to give access to the chatroom. |
︙ | ︙ | |||
51 52 53 54 55 56 57 | There are also some settings under /Admin/Chat that control the behavior of chat, though the default settings are reasonable so in most cases those settings can be ignored. The settings control things like the amount of time that chat messages are retained before being purged from the repository database. | | | < | < < | < < < < < < | < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | There are also some settings under /Admin/Chat that control the behavior of chat, though the default settings are reasonable so in most cases those settings can be ignored. The settings control things like the amount of time that chat messages are retained before being purged from the repository database. ## <a id="usage"></a>Usage For users with appropriate permissions, simply browse to the [/chat](/help?cmd=/chat) to start up a chat session. The default skin includes a "Chat" entry on the menu bar on wide screens for people with chat privilege. There is also a "Chat" option on the [Sitemap page](/sitemap), which means that chat will appear as an option under the hamburger menu for many [skins](./customskin.md). As of version 2.17, chat messages are subject to [fossil's full range of markdown processing](/md_rules). Because chat messages are stored as-is when they arrive from a client, this change applies retroactively to messages stored by previous fossil versions. Files may be sent via chat using the file selection element at the bottom of the page. If the desktop environment system supports it, files may be dragged and dropped onto that element. Files are not automatically sent - selection of a file can be cancelled using the Cancel button which appears only when a file is selected. When the Send button is pressed, any pending text is submitted along with the |
︙ | ︙ |