Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merged in the Ajax-based /wikiedit reimplementation. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
19f275352230d801df693e344e1a70dd |
User & Date: | stephan 2020-08-01 13:53:19 |
Context
2020-08-01
| ||
16:07 | Reworked how /wikiedit edit status is displayed, added history/attachment links to the new info bar, and remove attachment links from the Help tab. ... (check-in: fb77abd3 user: stephan tags: trunk) | |
13:53 | Merged in the Ajax-based /wikiedit reimplementation. ... (check-in: 19f27535 user: stephan tags: trunk) | |
13:23 | Minor help text additions for --jsmode. ... (Closed-Leaf check-in: cb2563de user: stephan tags: ajax-wiki-editor) | |
04:30 | Remove an unused variable in mkindex.c ... (check-in: bf198442 user: ashepilko tags: trunk) | |
Changes
Changes to src/ajax.c.
︙ | ︙ | |||
161 162 163 164 165 166 167 168 169 170 171 172 173 174 | }else if(DIFF_SIDEBYSIDE & diffFlags){ CX("%b",&out); }else{ CX("<pre class='udiff'>%b</pre>",&out); } blob_reset(&out); } /* ** Helper for /ajax routes. Clears the CGI content buffer, sets an ** HTTP error status code, and queues up a JSON response in the form ** of an object: ** ** {error: formatted message} | > > > > > > > > > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | }else if(DIFF_SIDEBYSIDE & diffFlags){ CX("%b",&out); }else{ CX("<pre class='udiff'>%b</pre>",&out); } blob_reset(&out); } /* ** Uses P(zKey) to fetch a CGI environment variable. If that var is ** NULL or starts with '0' or 'f' then this function returns false, ** else it returns true. */ int ajax_p_bool(char const *zKey){ const char * zVal = P(zKey); return (!zVal || '0'==*zVal || 'f'==*zVal) ? 0 : 1; } /* ** Helper for /ajax routes. Clears the CGI content buffer, sets an ** HTTP error status code, and queues up a JSON response in the form ** of an object: ** ** {error: formatted message} |
︙ | ︙ | |||
321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 | assert(!"cannot happen"); } if(zRenderMode!=0){ cgi_printf_header("x-ajax-render-mode: %s\r\n", zRenderMode); } } /* ** Internal mapping of ajax sub-route names to various metadata. */ struct AjaxRoute { const char *zName; /* Name part of the route after "ajax/" */ void (*xCallback)(); /* Impl function for the route. */ int bWriteMode; /* True if requires write mode */ int bPost; /* True if requires POST (i.e. CSRF ** verification) */ }; typedef struct AjaxRoute AjaxRoute; /* ** Comparison function for bsearch() for searching an AjaxRoute ** list for a matching name. */ | > > | | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | assert(!"cannot happen"); } if(zRenderMode!=0){ cgi_printf_header("x-ajax-render-mode: %s\r\n", zRenderMode); } } #if INTERFACE /* ** Internal mapping of ajax sub-route names to various metadata. */ struct AjaxRoute { const char *zName; /* Name part of the route after "ajax/" */ void (*xCallback)(); /* Impl function for the route. */ int bWriteMode; /* True if requires write mode */ int bPost; /* True if requires POST (i.e. CSRF ** verification) */ }; typedef struct AjaxRoute AjaxRoute; #endif /*INTERFACE*/ /* ** Comparison function for bsearch() for searching an AjaxRoute ** list for a matching name. */ 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 |
︙ | ︙ |
Changes to src/default.css.
︙ | ︙ | |||
917 918 919 920 921 922 923 | textarea { max-width: 95%; } img { max-width: 100%; height: auto; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 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 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 | textarea { max-width: 95%; } img { max-width: 100%; height: auto; } /** .tab-xxx: styles for fossil.tabs.js. */ .tab-container { width: 100%; display: flex; flex-direction: column; align-items: stretch; } .tab-container > #fossil-status-bar { margin-top: 0; } .tab-container > .tabs { padding: 0.25em; margin: 0; display: flex; flex-direction: column; border-width: 1px; border-style: outset; border-color: inherit; } .tab-container > .tabs > .tab-panel { align-self: stretch; flex: 10 1 auto; display: block; } .tab-container > .tab-bar { display: flex; flex-direction: row; flex: 1 10 auto; align-self: stretch; flex-wrap: wrap; } .tab-container > .tab-bar > .tab-button { display: inline-block; border-radius: 0.25em 0.25em 0 0; margin: 0 0.1em; padding: 0.25em 0.75em; align-self: baseline; border-color: inherit; border-width: 1px; border-bottom: none; border-top-style: inset; border-left-style: inset; border-right-style: inset; cursor: pointer; opacity: 0.6; } .tab-container > .tab-bar > .tab-button.selected { text-decoration: underline; opacity: 1.0; border-top-style: outset; border-left-style: outset; border-right-style: outset; } /** The flex-xxx classes can be used to create basic flexbox layouts through the application of classes to the containing/contained objects. */ .flex-container { display: flex; } .flex-container.flex-row { flex-direction: row; flex-wrap: wrap; justify-content: center; align-items: center; } .flex-container .flex-grow { flex-grow: 10; flex-shrink: 0; } .flex-container .flex-shrink { flex-grow: 0; flex-shrink: 10; } .flex-container.flex-row.stretch { flex-wrap: wrap; align-items: baseline; justify-content: stretch; margin: 0; } .flex-container.flex-column { flex-direction: column; flex-wrap: wrap; justify-content: center; align-items: center; } .flex-container.flex-column.stretch { align-items: stretch; margin: 0; } .flex-container.child-gap-small > * { margin: 0.25em; } #fossil-status-bar { display: block; font-family: monospace; border-width: 1px; border-style: inset; border-color: inherit; min-height: 1.5em; font-size: 1.2em; padding: 0.2em; margin: 0.25em 0; flex: 0 0 auto; } .font-size-100 { font-size: 100%; } .font-size-125 { font-size: 125%; } .font-size-150 { font-size: 150%; } .font-size-175 { font-size: 175%; } .font-size-200 { font-size: 200%; } /** .input-with-label is intended to be a wrapper element which contain both a LABEL tag and an INPUT or SELECT control. The wrapper is "necessary", as opposed to placing the INPUT in the LABEL, so that we can include multiple INPUT elements (e.g. a set of radio buttons). */ .input-with-label { border: 1px inset #808080; border-radius: 0.25em; padding: 0.25em 0.4em; margin: 0 0.5em; display: inline-block; cursor: default; } .input-with-label > * { vertical-align: middle; } .input-with-label > label { display: inline; /* some skins set label display to block! */ } .input-with-label > input { margin: 0; } .input-with-label > button { margin: 0; } .input-with-label > select { margin: 0; } .input-with-label > input[type=text] { margin: 0; } .input-with-label > textarea { margin: 0; } .input-with-label > input[type=checkbox] { vertical-align: sub; } .input-with-label > input[type=radio] { vertical-align: sub; } .input-with-label > label { font-weight: initial; margin: 0 0.25em 0 0.25em; vertical-align: middle; } |
Changes to src/fileedit.c.
︙ | ︙ | |||
1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 | "title='Status message area. Double-click to clear them.'>" "Status messages will go here.</div>\n" /* will be moved into the tab container via JS */); /* Main tab container... */ CX("<div id='fileedit-tabs' class='tab-container'></div>"); /***** File/version info tab *****/ { CX("<div id='fileedit-tab-fileselect' " "data-tab-parent='fileedit-tabs' " | > > > | > | > | 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 | "title='Status message area. Double-click to clear them.'>" "Status messages will go here.</div>\n" /* will be moved into the tab container via JS */); /* Main tab container... */ CX("<div id='fileedit-tabs' class='tab-container'></div>"); /* The .hidden class on the following tab elements is to help lessen the FOUC effect of the tabs before JS re-assembles them. */ /***** File/version info tab *****/ { CX("<div id='fileedit-tab-fileselect' " "data-tab-parent='fileedit-tabs' " "data-tab-label='File Info & Selection' " "class='hidden'" ">"); CX("<fieldset id='file-version-details'>" "<legend>File/Version</legend>" "<div>No file loaded.</div>" "</fieldset>"); CX("<h1>Select a file to edit:</h1>"); CX("<div id='fileedit-file-selector'></div>"); CX("</div>"/*#fileedit-tab-fileselect*/); } /******* Content tab *******/ { CX("<div id='fileedit-tab-content' " "data-tab-parent='fileedit-tabs' " "data-tab-label='File Content' " "class='hidden'" ">"); CX("<div class='flex-container flex-row child-gap-small'>"); CX("<button class='fileedit-content-reload confirmer' " "title='Reload the file from the server, discarding " "any local edits. To help avoid accidental loss of " "edits, it requires confirmation (a second click) within " "a few seconds or it will not reload.'" |
︙ | ︙ | |||
1677 1678 1679 1680 1681 1682 1683 | CX("</div>"/*#tab-file-content*/); } /****** Preview tab ******/ { CX("<div id='fileedit-tab-preview' " "data-tab-parent='fileedit-tabs' " | | > | 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 | CX("</div>"/*#tab-file-content*/); } /****** Preview tab ******/ { CX("<div id='fileedit-tab-preview' " "data-tab-parent='fileedit-tabs' " "data-tab-label='Preview' " "class='hidden'" ">"); CX("<div class='fileedit-options flex-container flex-row'>"); CX("<button id='btn-preview-refresh' " "data-f-preview-from='fileContent' " /* ^^^ fossil.page[methodName]() OR text source elem ID, ** but we need a method in order to support clients swapping out ** the text editor with their own. */ |
︙ | ︙ | |||
1739 1740 1741 1742 1743 1744 1745 | CX("</div>"/*#fileedit-tab-preview*/); } /****** Diff tab ******/ { CX("<div id='fileedit-tab-diff' " "data-tab-parent='fileedit-tabs' " | | > | 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 | CX("</div>"/*#fileedit-tab-preview*/); } /****** Diff tab ******/ { CX("<div id='fileedit-tab-diff' " "data-tab-parent='fileedit-tabs' " "data-tab-label='Diff' " "class='hidden'" ">"); CX("<div class='fileedit-options flex-container flex-row' " "id='fileedit-tab-diff-buttons'>"); CX("<button class='sbs'>Side-by-side</button>" "<button class='unified'>Unified</button>"); if(0){ |
︙ | ︙ | |||
1771 1772 1773 1774 1775 1776 1777 | "</div>"); CX("</div>"/*#fileedit-tab-diff*/); } /****** Commit ******/ CX("<div id='fileedit-tab-commit' " "data-tab-parent='fileedit-tabs' " | | > | 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 | "</div>"); CX("</div>"/*#fileedit-tab-diff*/); } /****** Commit ******/ CX("<div id='fileedit-tab-commit' " "data-tab-parent='fileedit-tabs' " "data-tab-label='Commit' " "class='hidden'" ">"); { /******* Commit flags/options *******/ CX("<div class='fileedit-options flex-container flex-row'>"); style_labeled_checkbox("cb-dry-run", "dry_run", "Dry-run?", "1", 0, |
︙ | ︙ | |||
1892 1893 1894 1895 1896 1897 1898 | /* Manifest gets rendered here after a commit. */); } CX("</div>"/*#fileedit-tab-commit*/); /****** Help/Tips ******/ CX("<div id='fileedit-tab-help' " "data-tab-parent='fileedit-tabs' " | | > | 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 | /* Manifest gets rendered here after a commit. */); } CX("</div>"/*#fileedit-tab-commit*/); /****** Help/Tips ******/ CX("<div id='fileedit-tab-help' " "data-tab-parent='fileedit-tabs' " "data-tab-label='Help' " "class='hidden'" ">"); { CX("<h1>Help & Tips</h1>"); CX("<ul>"); CX("<li><strong>Only files matching the <code>fileedit-glob</code> " "repository setting</strong> can be edited online. That setting " "must be a comma- or newline-delimited list of glob patterns " |
︙ | ︙ | |||
1947 1948 1949 1950 1951 1952 1953 | blob_appendf(&endScript,"}"); } blob_appendf(&endScript,");\n"); } blob_reset(&err); CheckinMiniInfo_cleanup(&cimi); | | < < | < | | | > | > | < < > | 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 | blob_appendf(&endScript,"}"); } blob_appendf(&endScript,");\n"); } blob_reset(&err); CheckinMiniInfo_cleanup(&cimi); builtin_request_js("sbsdiff.js"); style_emit_fossil_js_apis(0, "fetch", "dom", "tabs", "confirmer", "storage", 0); builtin_fulfill_js_requests(); /* ** Set up a JS-side mapping of the AJAX_RENDER_xyz values. This is ** used for dynamically toggling certain UI components on and off. ** Must come after window.fossil has been intialized and before ** fossil.page.fileedit.js. Potential TODO: move this into the ** window.fossil bootstrapping so that we don't have to "fulfill" ** the JS multiple times. */ ajax_emit_js_preview_modes(1); builtin_request_js("fossil.page.fileedit.js"); builtin_fulfill_js_requests(); if(blob_size(&endScript)>0){ style_emit_script_tag(0,0); CX("\n(function(){\n"); CX("try{\n%b}\n" "catch(e){" "fossil.error(e); console.error('Exception:',e);" "}\n", |
︙ | ︙ |
Changes to src/forum.c.
︙ | ︙ | |||
747 748 749 750 751 752 753 | @ </div> } forumthread_delete(pThread); return target; } /* | < < < < | | > < | 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 | @ </div> } forumthread_delete(pThread); return target; } /* ** Emits all JS code required by /forumpost. */ static void forumpost_emit_page_js(){ static int once = 0; if(0==once){ once = 1; style_emit_script_fossil_bootstrap(1); builtin_request_js("forum.js"); builtin_request_js("fossil.dom.js"); builtin_request_js("fossil.page.forumpost.js"); } } /* ** WEBPAGE: forumpost |
︙ | ︙ | |||
892 893 894 895 896 897 898 | style_submenu_element("Complete Thread", "%R/%s/%s?t=a", g.zPath, zName); forum_display_history(froot, fpid, 1); }else{ style_submenu_element("Chronological", "%R/%s/%s?t=c", g.zPath, zName); style_submenu_element("Unformatted", "%R/%s/%s?t=r", g.zPath, zName); forum_display_hierarchical(froot, fpid); } | | | 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 | style_submenu_element("Complete Thread", "%R/%s/%s?t=a", g.zPath, zName); forum_display_history(froot, fpid, 1); }else{ style_submenu_element("Chronological", "%R/%s/%s?t=c", g.zPath, zName); style_submenu_element("Unformatted", "%R/%s/%s?t=r", g.zPath, zName); forum_display_hierarchical(froot, fpid); } forumpost_emit_page_js(); style_footer(); } /* ** Return true if a forum post should be moderated. */ static int forum_need_moderation(void){ |
︙ | ︙ |
Changes to src/forum.js.
︙ | ︙ | |||
12 13 14 15 16 17 18 | if(x[0]){ var w = window.innerHeight; var h = x[0].scrollHeight; var y = absoluteY(x[0]); if( w>h ) y = y + (h-w)/2; if( y>0 ) window.scrollTo(0, y); } | | | 12 13 14 15 16 17 18 19 | if(x[0]){ var w = window.innerHeight; var h = x[0].scrollHeight; var y = absoluteY(x[0]); if( w>h ) y = y + (h-w)/2; if( y>0 ) window.scrollTo(0, y); } })(); |
Changes to src/fossil.page.fileedit.js.
︙ | ︙ | |||
119 120 121 122 123 124 125 | those files' contents because otherwise we would be required to JSONize/de-JSONize the file content when stashing/restoring it, and that would be horribly inefficient (meaning "battery-consuming" on mobile devices). */ const $stash = { keys: { | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | those files' contents because otherwise we would be required to JSONize/de-JSONize the file content when stashing/restoring it, and that would be horribly inefficient (meaning "battery-consuming" on mobile devices). */ const $stash = { keys: { index: F.page.name+'.index' }, /** index: { "CHECKIN_HASH:FILENAME": {file info w/o content} ... } |
︙ | ︙ | |||
147 148 149 150 151 152 153 | by prepending P.name to suffix. */ contentKey: function(suffix){return P.name+'/'+suffix}, /** Returns the index object, fetching it from the stash or creating it anew on the first call. */ getIndex: function(){ if(!this.index){ this.index = F.storage.getJSON( | | < < < < < < < < < < < < < < < | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | by prepending P.name to suffix. */ contentKey: function(suffix){return P.name+'/'+suffix}, /** Returns the index object, fetching it from the stash or creating it anew on the first call. */ getIndex: function(){ if(!this.index){ this.index = F.storage.getJSON( this.keys.index, {} ); } return this.index; }, _fireStashEvent: function(){ if(this._disableNextEvent) delete this._disableNextEvent; else F.page.dispatchEvent('fileedit-stash-updated', this); }, |
︙ | ︙ |
Added src/fossil.page.wikiedit.js.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 349 350 351 352 353 354 355 356 357 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 387 388 389 390 391 392 393 394 395 396 397 398 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 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 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 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 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 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 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 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 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 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 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 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 | (function(F/*the fossil object*/){ "use strict"; /** Client-side implementation of the /wikiedit app. Requires that the fossil JS bootstrapping is complete and that several fossil JS APIs have been installed: fossil.fetch, fossil.dom, fossil.tabs, fossil.storage, fossil.confirmer. Custom events which can be listened for via fossil.page.addEventListener(): - Event 'wiki-page-loaded': passes on information when it loads a wiki (whether from the network or its internal local-edit cache), in the form of an "winfo" object: { name: string, mimetype: mimetype string, type: "normal" | "tag" | "checkin" | "branch" | "sandbox", version: UUID string or null for a sandbox page or new page, parent: parent UUID string or null if no parent, content: string } The internal docs and code frequently use the term "winfo", and such references refer to an object with that form. The fossil.page.wikiContent() method gets or sets the current file content for the page. - Event 'wiki-saved': is fired when a commit completes, passing on the same info as fileedit-file-loaded. - Event 'wiki-content-replaced': when the editor's content is replaced, as opposed to it being edited via user interaction. This normally happens via selecting a file to load. The event detail is the fossil.page object, not the current file content. - Event 'wiki-preview-updated': when the preview is refreshed from the server, this event passes on information about the preview change in the form of an object: { element: the DOM element which contains the content preview. mimetype: the page's mimetype. } Here's an example which can be used with the highlightjs code highlighter to update the highlighting when the preview is refreshed in "wiki" mode (which includes fossil-native wiki and markdown): fossil.page.addEventListener( 'wiki-preview-updated', (ev)=>{ if(ev.detail.mimetype!=='text/plain'){ ev.detail.element.querySelectorAll( 'code[class^=language-]' ).forEach((e)=>hljs.highlightBlock(e)); } } ); */ const E = (s)=>document.querySelector(s), D = F.dom, P = F.page; P.config = { /* Symbolic markers to denote certain edit state. Note that the symbols themselves are *actually* defined in CSS, so if they're changed there they also need to be changed here.*/ editStateMarkers: { isNew: '[+]', isModified: '[*]' } }; /** $stash is an internal-use-only object for managing "stashed" local edits, to help avoid that users accidentally lose content by switching tabs or following links or some such. The basic theory of operation is... All "stashed" state is stored using fossil.storage. - When the current wiki content is modified by the user, the current state of the page is stashed. - When saving, the stashed entry for the previous version is removed from the stash. - When "loading", we use any stashed state for the given checkin/file combination. When forcing a re-load of content, any stashed entry for that combination is removed from the stash. - Every time P.stashContentChange() updates the stash, it is pruned to $stash.prune.defaultMaxCount most-recently-updated entries. - This API often refers to "winfo objects." Those are objects with a minimum of {page,mimetype} properties (which must be valid), and the page name is used as basis for the stash keys for any given page. The structure of the stash is a bit convoluted for efficiency's sake: we store a map of file info (winfo) objects separately from those files' contents because otherwise we would be required to JSONize/de-JSONize the file content when stashing/restoring it, and that would be horribly inefficient (meaning "battery-consuming" on mobile devices). */ const $stash = { keys: { index: F.page.name+'.index' }, /** index: { "PAGE_NAME": {wiki page info w/o content} ... } In F.storage we... - Store this.index under the key this.keys.index. - Store each page's content under the key (P.name+'/PAGE_NAME'). These are stored separately from the index entries to avoid having to JSONize/de-JSONize the content. The assumption/hope is that the browser can store those records "directly," without any intermediary encoding/decoding going on. */ indexKey: function(winfo){return winfo.name}, /** Returns the key for storing content for the given key suffix, by prepending P.name to suffix. */ contentKey: function(suffix){return P.name+'/'+suffix}, /** Returns the index object, fetching it from the stash or creating it anew on the first call. */ getIndex: function(){ if(!this.index){ this.index = F.storage.getJSON( this.keys.index, {} ); } return this.index; }, _fireStashEvent: function(){ if(this._disableNextEvent) delete this._disableNextEvent; else F.page.dispatchEvent('wiki-stash-updated', this); }, /** Returns the stashed version, if any, for the given winfo object. */ getWinfo: function(winfo){ const ndx = this.getIndex(); return ndx[this.indexKey(winfo)]; }, /** Serializes this object's index to F.storage. Returns this. */ storeIndex: function(){ if(this.index) F.storage.setJSON(this.keys.index,this.index); return this; }, /** Updates the stash record for the given winfo and (optionally) content. If passed 1 arg, only the winfo stash is updated, else both the winfo and its contents are (re-)stashed. Returns this. */ updateWinfo: function(winfo,content){ const ndx = this.getIndex(), key = this.indexKey(winfo), old = ndx[key]; const record = old || (ndx[key]={ name: winfo.name }); record.mimetype = winfo.mimetype; record.type = winfo.type; record.parent = winfo.parent; record.version = winfo.version; record.stashTime = new Date().getTime(); this.storeIndex(); if(arguments.length>1){ F.storage.set(this.contentKey(key), content); } this._fireStashEvent(); return this; }, /** Returns the stashed content, if any, for the given winfo object. */ stashedContent: function(winfo){ return F.storage.get(this.contentKey(this.indexKey(winfo))); }, /** Returns true if we have stashed content for the given winfo record or page name. */ hasStashedContent: function(winfo){ if('string'===typeof winfo) winfo = {name: winfo}; return F.storage.contains(this.contentKey(this.indexKey(winfo))); }, /** Unstashes the given winfo record and its content. Returns this. */ unstash: function(winfo){ const ndx = this.getIndex(), key = this.indexKey(winfo); delete winfo.stashTime; delete ndx[key]; F.storage.remove(this.contentKey(key)); this.storeIndex(); this._fireStashEvent(); return this; }, /** Clears all $stash entries from F.storage. Returns this. */ clear: function(){ const ndx = this.getIndex(), self = this; let count = 0; Object.keys(ndx).forEach(function(k){ ++count; const e = ndx[k]; delete ndx[k]; F.storage.remove(self.contentKey(k)); }); F.storage.remove(this.keys.index); delete this.index; if(count) this._fireStashEvent(); return this; }, /** Removes all but the maxCount most-recently-updated stash entries, where maxCount defaults to this.prune.defaultMaxCount. */ prune: function f(maxCount){ const ndx = this.getIndex(); const li = []; if(!maxCount || maxCount<0) maxCount = f.defaultMaxCount; Object.keys(ndx).forEach((k)=>li.push(ndx[k])); li.sort((l,r)=>l.stashTime - r.stashTime); let n = 0; while(li.length>maxCount){ ++n; const e = li.shift(); this._disableNextEvent = true; this.unstash(e); console.warn("Pruned oldest local file edit entry:",e); } if(n) this._fireStashEvent(); } }; $stash.prune.defaultMaxCount = P.config.defaultMaxStashSize || 10; P.$stash = $stash /* we have to expose this for the new-page case :/ */; /** Internal workaround to select the current preview mode and fire a change event if the value actually changes or if forceEvent is truthy. */ P.selectMimetype = function(modeValue, forceEvent){ const s = this.e.selectMimetype; if(!modeValue) modeValue = s.value; else if(s.value != modeValue){ s.value = modeValue; forceEvent = true; } if(forceEvent){ // Force UI update s.dispatchEvent(new Event('change',{target:s})); } }; /** Sets up and maintains the widgets for the list of wiki pages. */ const WikiList = { e: { filterCheckboxes: { /*map of wiki page type to checkbox for list filtering purposes, except for "sandbox" type, which is assumed to be covered by the "normal" type filter. */}, }, cache: { names: { /* Map of page names to "something." We don't map to their winfo bits because those regularly get swapped out via de/serialization. We need this map to support the add-new-page feature, to give us a way to check for dupes without asking the server or walking through the whole selection list. */} }, /** Updates OPTION elements to reflect whether the page has local changes or is new/unsaved. */ refreshStashMarks: function(){ this.cache.names = {/*must reset it to acount for local page removals*/}; const select = this.e.select, self = this; Object.keys(select.options).forEach(function(key){ const opt = select.options[key]; const stashed = $stash.getWinfo({name:opt.value}); if(stashed){ const isNew = 'sandbox'===stashed.type ? false : !stashed.version; D.addClass(opt, isNew ? 'stashed-new' :'stashed'); }else{ D.removeClass(opt, 'stashed', 'stashed-new'); } self.cache.names[opt.value] = true; }); }, /** Removes the given wiki page entry from the page selection list, if it's in the list. */ removeEntry: function(name){ const sel = this.e.select; var ndx = sel.selectedIndex; sel.value = name; if(sel.selectedIndex>-1){ if(ndx === sel.selectedIndex) ndx = -1; sel.options.remove(sel.selectedIndex); } sel.selectedIndex = ndx; }, /** Rebuilds the selection list. Necessary when it's loaded from the server or we locally create a new page. */ _rebuildList: function callee(){ /* Jump through some hoops to integrate new/unsaved pages into the list of existing pages... We use a map as an intermediary in order to filter out any local-stash dupes from server-side copies. */ const list = this.cache.pageList; if(!list) return; if(!callee.sorticase){ callee.sorticase = function(l,r){ if(l===r) return 0; l = l.toLowerCase(); r = r.toLowerCase(); return l<=r ? -1 : 1; }; } const map = {}, ndx = $stash.getIndex(), sel = this.e.select; D.clearElement(sel); list.forEach((winfo)=>map[winfo.name] = winfo); Object.keys(ndx).forEach(function(key){ const winfo = ndx[key]; if(!winfo.version/*new page*/) map[winfo.name] = winfo; }); const self = this; Object.keys(map) .sort(callee.sorticase) .forEach(function(name){ const winfo = map[name]; const opt = D.option(sel, winfo.name); const wtype = opt.dataset.wtype = winfo.type==='sandbox' ? 'normal' : (winfo.type||'normal'); const cb = self.e.filterCheckboxes[wtype]; if(cb && !cb.checked) D.addClass(opt, 'hidden'); }); D.enable(sel); if(P.winfo) sel.value = P.winfo.name; this.refreshStashMarks(); }, /** Loads the page list and populates the selection list. */ loadList: function callee(){ delete this.pageMap; if(!callee.onload){ const self = this; callee.onload = function(list){ self.cache.pageList = list; self._rebuildList(); F.message("Loaded page list."); }; } F.fetch('wikiajax/list',{ urlParams:{verbose:true}, responseType: 'json', onload: callee.onload }); return this; }, /** Returns true if the given name appears to be a valid wiki page name, noting that the final arbitrator is the server. On validation error it emits a message via fossil.error() and returns false. */ validatePageName: function(name){ var err; if(!name){ err = "may not be empty"; }else if(this.cache.names.hasOwnProperty(name)){ err = "page already exists: "+name; }else if(name.length>100){ err = "too long (limit is 100)"; }else if(/\s{2,}/.test(name)){ err = "multiple consecutive spaces"; }else if(/[\t\r\n]/.test(name)){ err = "contains control character(s)"; }else{ let i = 0, n = name.length, c; for( ; i < n; ++i ){ if(name.charCodeAt(i)<0x20){ err = "contains control character(s)"; break; } } } if(err){ F.error("Invalid name:",err); } return !err; }, /** If the given name is valid, a new page with that (trimmed) name is added to the local stash. */ addNewPage: function(name){ name = name.trim(); if(!this.validatePageName(name)) return false; var wtype = 'normal'; if(0===name.indexOf('checkin/')) wtype = 'checkin'; else if(0===name.indexOf('branch/')) wtype = 'branch'; else if(0===name.indexOf('tag/')) wtype = 'tag'; /* ^^^ note that we're not validating that, e.g., checkin/XYZ has a full artifact ID after "checkin/". */ const winfo = { name: name, type: wtype, mimetype: 'text/x-fossil-wiki', version: null, parent: null }; $stash.updateWinfo(winfo, ''); this._rebuildList(); P.loadPage(winfo.name); return true; }, /** Installs a wiki page selection list into the given parent DOM element and loads the page list from the server. */ init: function(parentElem){ const sel = D.select(), btn = D.addClass(D.button("Reload page list"), 'save'); this.e.select = sel; D.addClass(parentElem, 'WikiList'); D.clearElement(parentElem); D.append( parentElem, D.append(D.fieldset("Select a page to edit"), sel) ); D.attr(sel, 'size', 15); D.option(D.disable(D.clearElement(sel)), "Loading..."); /** Set up filter checkboxes for the various types of wiki pages... */ const fsFilter = D.fieldset("Wiki page types"), fsFilterBody = D.div(), filters = ['normal', 'branch', 'checkin', 'tag'] ; D.append(fsFilter, fsFilterBody); D.addClass(fsFilterBody, 'flex-container', 'flex-column', 'stretch'); const filterSelection = function(wtype, show){ sel.querySelectorAll('option[data-wtype='+wtype+']').forEach(function(opt){ if(show) opt.classList.remove('hidden'); else opt.classList.add('hidden'); }); }; const self = this; filters.forEach(function(wtype){ const cbId = 'wtype-filter-'+wtype, lbl = D.attr(D.append(D.label(),wtype), 'for', cbId), cb = D.attr(D.input('checkbox'), 'id', cbId), span = D.append(D.span(), cb, lbl); self.e.filterCheckboxes[wtype] = cb; cb.checked = true; filterSelection(wtype, cb.checked); cb.addEventListener( 'change', function(ev){filterSelection(wtype, ev.target.checked)}, false ); D.append(fsFilterBody, span); }); /* A legend of the meanings of the symbols we use in the OPTION elements to denote certain state. */ const fsLegend = D.fieldset("Edit status"), fsLegendBody = D.div(); D.append(fsLegend, fsLegendBody); D.addClass(fsLegendBody, 'flex-container', 'flex-column', 'stretch'); D.append( fsLegendBody, D.append(D.span(), P.config.editStateMarkers.isModified, " = page has local edits"), D.append(D.span(), P.config.editStateMarkers.isNew, " = page is new/unsaved") ); const fsNewPage = D.fieldset("Create new page"), fsNewPageBody = D.div(), newPageName = D.input('text'), newPageBtn = D.button("Add page locally") ; D.append(parentElem, fsNewPage); D.append(fsNewPage, fsNewPageBody); D.addClass(fsNewPageBody, 'flex-container', 'flex-column', 'new-page'); D.append( fsNewPageBody, newPageName, newPageBtn, D.append(D.addClass(D.span(), 'mini-tip'), "New pages exist only in this browser until they are saved.") ); newPageBtn.addEventListener('click', function(){ if(self.addNewPage(newPageName.value)){ newPageName.value = ''; } }, false); D.append( parentElem, D.append(D.addClass(D.div(), 'fieldset-wrapper'), fsFilter, fsNewPage, fsLegend) ); D.append(parentElem, btn); btn.addEventListener('click', ()=>this.loadList(), false); this.loadList(); const onSelect = (e)=>P.loadPage(e.target.value); sel.addEventListener('change', onSelect, false); sel.addEventListener('dblclick', onSelect, false); F.page.addEventListener('wiki-stash-updated', ()=>this.refreshStashMarks()); delete this.init; } }; /** Keep track of how many in-flight AJAX requests there are so we can disable input elements while any are pending. For simplicity's sake we simply disable ALL OF IT while any AJAX is pending, rather than disabling operation-specific UI elements, which would be a huge maintenance hassle. Noting, however, that this global on/off is not *quite* pedantically correct. Pedantically speaking. If an element is disabled before an XHR starts, this code "should" notice that and not include it in the to-re-enable list. That would be annoying to do, and becomes impossible to do properly once multiple XHRs are in transit and an element is disabled seprately between two of those in-transit requests (that would be an unlikely, but possible, corner case). */ const ajaxState = { count: 0 /* in-flight F.fetch() requests */, toDisable: undefined /* elements to disable during ajax activity */ }; F.fetch.beforesend = function f(){ if(!ajaxState.toDisable){ ajaxState.toDisable = document.querySelectorAll( ['button:not([disabled])', 'input:not([disabled])', 'select:not([disabled])', 'textarea:not([disabled])' ].join(',') ); } if(1===++ajaxState.count){ D.addClass(document.body, 'waiting'); D.disable(ajaxState.toDisable); } }; F.fetch.aftersend = function(){ if(0===--ajaxState.count){ D.removeClass(document.body, 'waiting'); D.enable(ajaxState.toDisable); delete ajaxState.toDisable /* required to avoid enable/disable race condition with the save button */; } }; F.onPageLoad(function() { document.body.classList.add('wikiedit'); P.base = {tag: E('base'), wikiUrl: F.repoUrl('wiki')}; P.base.originalHref = P.base.tag.href; P.e = { /* various DOM elements we work with... */ taEditor: E('#wikiedit-content-editor'), btnReload: E("#wikiedit-tab-content button.wikiedit-content-reload"), btnSave: E("button.wikiedit-save"), selectMimetype: E('select[name=mimetype]'), selectFontSizeWrap: E('#select-font-size'), // selectDiffWS: E('select[name=diff_ws]'), cbAutoPreview: E('#cb-preview-autoupdate > input[type=checkbox]'), previewTarget: E('#wikiedit-tab-preview-wrapper'), diffTarget: E('#wikiedit-tab-diff-wrapper'), attachmentWrapper: E("#wikiedit-attachments"), tabContainer: E('#wikiedit-tabs'), tabs:{ pageList: E('#wikiedit-tab-pages'), content: E('#wikiedit-tab-content'), preview: E('#wikiedit-tab-preview'), diff: E('#wikiedit-tab-diff'), misc: E('#wikiedit-tab-misc') //commit: E('#wikiedit-tab-commit') } }; P.tabs = new fossil.TabManager(D.clearElement(P.e.tabContainer)); P.tabs.e.container.insertBefore( /* Move the status bar between the tab buttons and tab panels. Seems to be the best fit in terms of functionality and visibility. */ E('#fossil-status-bar'), P.tabs.e.tabs ); P.tabs.addEventListener( /* Set up some before-switch-to tab event tasks... */ 'before-switch-to', function(ev){ const theTab = ev.detail, btnSlot = theTab.querySelector('.save-button-slot'); if(btnSlot){ /* Several places make sense for a save button, so we'll move that button around to those tabs where it makes sense. */ btnSlot.parentNode.insertBefore( P.e.btnSave, btnSlot ); P.updateSaveButton(); } if(theTab===P.e.tabs.preview){ P.baseHrefForWiki(); if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview(); }else if(theTab===P.e.tabs.diff){ /* Work around a weird bug where the page gets wider than the window when the diff tab is NOT in view and the current SBS diff widget is wider than the window. When the diff IS in view then CSS overflow magically reduces the page size again. Weird. Maybe FF-specific. Note that this weirdness happens even though P.e.diffTarget's parent is hidden (and therefore P.e.diffTarget is also hidden). */ D.removeClass(P.e.diffTarget, 'hidden'); }else if(theTab===P.e.tabs.misc){ P.updateAttachmentView(); } } ); P.tabs.addEventListener( /* Set up auto-refresh of the preview tab... */ 'before-switch-from', function(ev){ const theTab = ev.detail; if(theTab===P.e.tabs.preview){ P.baseHrefRestore(); }else if(theTab===P.e.tabs.diff){ /* See notes in the before-switch-to handler. */ D.addClass(P.e.diffTarget, 'hidden'); } } ); F.connectPagePreviewers( P.e.tabs.preview.querySelector( '#btn-preview-refresh' ) ); const diffButtons = E('#wikiedit-tab-diff-buttons'); diffButtons.querySelector('button.sbs').addEventListener( "click",(e)=>P.diff(true), false ); diffButtons.querySelector('button.unified').addEventListener( "click",(e)=>P.diff(false), false ); if(0) P.e.btnCommit.addEventListener( "click",(e)=>P.commit(), false ); F.confirmer(P.e.btnReload, { confirmText: "Really reload, losing edits?", onconfirm: function(e){ const w = P.winfo; if(!w){ F.error("No page loaded."); return; } if(!w.version/* new/unsaved page */ && w.type!=='sandbox' && P.wikiContent()){ F.error("This new/unsaved page has content.", "To really discard this page,", "first clear its content", "then use the Discard button."); return; } P.unstashContent() if(w.version || w.type==='sandbox'){ P.loadPage(); }else{ WikiList.removeEntry(w.name); P.updatePageTitle(); delete P.winfo; F.message("Discarded new page ["+w.name+"]."); } }, ticks: 3 }); F.confirmer(P.e.btnSave, { confirmText: "Really save changes?", onconfirm: function(e){ const w = P.winfo; if(!w){ F.error("No page loaded."); return; } P.save(); }, ticks: 3 }); P.e.taEditor.addEventListener( 'change', ()=>P.stashContentChange(), false ); P.selectMimetype(false, true); P.e.selectMimetype.addEventListener( 'change', function(e){ if(P.winfo){ P.winfo.mimetype = e.target.value; P.stashContentChange(true); } }, false ); const selectFontSize = E('select[name=editor_font_size]'); if(selectFontSize){ selectFontSize.addEventListener( "change",function(e){ const ed = P.e.taEditor; ed.className = ed.className.replace( /\bfont-size-\d+/g, '' ); ed.classList.add('font-size-'+e.target.value); }, false ); selectFontSize.dispatchEvent( // Force UI update new Event('change',{target:selectFontSize}) ); } P.addEventListener( // Clear certain views when new content is loaded/set 'wiki-content-replaced', ()=>{ P.previewNeedsUpdate = true; D.clearElement(P.e.diffTarget, P.e.previewTarget); } ); P.addEventListener( // Clear certain views after a save 'wiki-saved', (e)=>{ D.clearElement(P.e.diffTarget, P.e.previewTarget); // TODO: replace preview with new content } ); WikiList.init( P.e.tabs.pageList.firstElementChild ); P.addEventListener( // Update various state on wiki page load 'wiki-page-loaded', function(ev){ delete P.winfo; const winfo = ev.detail; P.winfo = winfo; P.previewNeedsUpdate = true; P.e.selectMimetype.value = winfo.mimetype; P.tabs.switchToTab(P.e.tabs.content); P.wikiContent(winfo.content || ''); WikiList.e.select.value = winfo.name; if(!winfo.version && winfo.type!=='sandbox'){ F.error('You are editing a new, unsaved page:',winfo.name); } P.updatePageTitle(); }, false ); P.addEventListener('wiki-stash-updated', ()=>P.updateSaveButton()) .updatePageTitle().updateAttachmentView().updateSaveButton(); }/*F.onPageLoad()*/); /** Returns true if fossil.page.winfo is set, indicating that a page has been loaded, else it reports an error and returns false. If passed a truthy value any error message about not having a wiki page loaded is suppressed. */ const affirmPageLoaded = function(quiet){ if(!P.winfo && !quiet) F.error("No wiki page is loaded."); return !!P.winfo; }; /** Update the page title and header based on the state of this.winfo. A no-op if this.winfo is not set. Returns this. */ P.updatePageTitle = function f(){ if(!f.titleElement){ f.titleElement = document.head.querySelector('title'); f.pageTitleHeader = document.querySelector('#wikiedit-page-name > span'); } var title = []; const wi = P.winfo; if(wi){ if(!wi.version && 'sandbox'!==wi.type) title.push(P.config.editStateMarkers.isNew); else if($stash.getWinfo(wi)) title.push(P.config.editStateMarkers.isModified) title.push(wi.name); }else{ title.push('(no page loaded)'); } title = title.join(' '); f.pageTitleHeader.innerText = title; f.titleElement.innerText = 'Wiki Editor:' + title; return this; }; /** Change the save button depending on whether we have stuff to save or not. */ P.updateSaveButton = function(){ if(!this.winfo || !this.getStashedWinfo(this.winfo)){ D.disable(this.e.btnSave).innerText = "There are no changes to save"; }else{ D.enable(this.e.btnSave).innerText = "Save changes"; } return this; }; /** Updates attachment-related links and returns this. */ P.updateAttachmentView = function(){ const wrapper = P.e.attachmentWrapper; D.clearElement(wrapper); const ul = D.ul(); D.append(wrapper, ul); if(!P.winfo){ D.append(D.li(ul), "Load a page to get access to its attachment-related pages."); return this; }else if(!P.winfo.version){ D.append(D.li(ul), "A new/unsaved page cannot have attachments. Save it first."); return this; } const wi = P.winfo; D.append( D.li(ul), D.a(F.repoUrl('attachadd',{ page:wi.name, from: F.repoUrl('wikiedit',{ name: wi.name }) }), "Add attachments.") ); D.append( D.li(ul), D.a(F.repoUrl('attachlist',{page:wi.name}), "List attachments"), " (if any)." ); return this; }; /** Getter (if called with no args) or setter (if passed an arg) for the current file content. The setter form sets the content, dispatches a 'wiki-content-replaced' event, and returns this object. */ P.wikiContent = function f(){ if(0===arguments.length){ return f.get(); }else{ f.set(arguments[0] || ''); this.dispatchEvent('wiki-content-replaced', this); return this; } }; /* Default get/set impls for file content */ P.wikiContent.get = function(){return P.e.taEditor.value}; P.wikiContent.set = function(content){P.e.taEditor.value = content}; /** For use when installing a custom editor widget. Pass it the getter and setter callbacks to fetch resp. set the content of the custom widget. They will be triggered via P.wikiContent(). Returns this object. */ P.setContentMethods = function(getter, setter){ this.wikiContent.get = getter; this.wikiContent.set = setter; return this; }; /** Removes the default editor widget (and any dependent elements) from the DOM, adds the given element in its place, removes this method from this object, and returns this object. */ P.replaceEditorElement = function(newEditor){ P.e.taEditor.parentNode.insertBefore(newEditor, P.e.taEditor); P.e.taEditor.remove(); P.e.selectFontSizeWrap.remove(); delete this.replaceEditorElement; return P; }; /** Sets the current page's base.href to {g.zTop}/wiki. */ P.baseHrefForWiki = function f(){ this.base.tag.href = this.base.wikiUrl; return this; }; /** Sets the document's base.href value to its page-load-time setting. */ P.baseHrefRestore = function(){ this.base.tag.href = this.base.originalHref; }; /** loadPage() loads the given wiki page and updates the relevant UI elements to reflect the loaded state. If passed no arguments then it re-uses the values from the currently-loaded page, reloading it (emitting an error message if no file is loaded). Returns this object, noting that the load is async. After loading it triggers a 'wiki-page-loaded' event, passing it this.winfo. If a locally-edited copy of the given file/rev is found, that copy is used instead of one fetched from the server, but it is still treated as a load event. Alternate call forms: - no arguments: re-loads from this.winfo. - 1 non-string argument: assumed to be an winfo-style object. Must have at least the {name} property, but need not have other winfo state. */ P.loadPage = function(name){ if(0===arguments.length){ /* Reload from this.winfo */ if(!affirmPageLoaded()) return this; name = this.winfo.name; }else if(1===arguments.length && 'string' !== typeof name){ /* Assume winfo-like object */ const arg = arguments[0]; name = arg.name; } const onload = (r)=>this.dispatchEvent('wiki-page-loaded', r); const stashWinfo = this.getStashedWinfo({name: name}); if(stashWinfo){ // fake a response from the stash... F.message("Fetched from the local-edit storage:", stashWinfo.name); onload({ name: stashWinfo.name, mimetype: stashWinfo.mimetype, type: stashWinfo.type, version: stashWinfo.version, parent: stashWinfo.parent, content: $stash.stashedContent(stashWinfo) }); return this; } F.message( "Loading content..." ).fetch('wikiajax/fetch',{ urlParams: { page: name }, responseType: 'json', onload:(r)=>{ F.message('Loaded page ['+r.name+'].'); onload(r); } }); return this; }; /** Fetches the page preview based on the contents and settings of this page's input fields, and updates the UI with with the preview. Returns this object, noting that the operation is async. */ P.preview = function f(switchToTab){ if(!affirmPageLoaded()) return this; const target = this.e.previewTarget, self = this; const updateView = function(c){ D.clearElement(target); if('string'===typeof c) target.innerHTML = c; if(switchToTab) self.tabs.switchToTab(self.e.tabs.preview); }; return this._postPreview(this.wikiContent(), updateView); }; /** Callback for use with F.connectPagePreviewers() */ P._postPreview = function(content,callback){ if(!affirmPageLoaded()) return this; if(!content){ callback(content); return this; } const fd = new FormData(); const mimetype = this.e.selectMimetype.value; fd.append('page', this.winfo.name); fd.append('mimetype',mimetype); fd.append('content',content || ''); F.message( "Fetching preview..." ).fetch('wikiajax/preview',{ payload: fd, onload: (r,header)=>{ callback(r); F.message('Updated preview.'); P.previewNeedsUpdate = false; P.dispatchEvent('wiki-preview-updated',{ mimetype: mimetype, element: P.e.previewTarget }); }, onerror: (e)=>{ fossil.fetch.onerror(e); callback("Error fetching preview: "+e); } }); return this; }; /** Undo some of the SBS diff-rendering bits which hurt us more than they help... */ P.tweakSbsDiffs2 = function(){ if(1){ const dt = this.e.diffTarget; dt.querySelectorAll('.sbsdiffcols .difftxtcol').forEach( (dtc)=>{ const pre = dtc.querySelector('pre'); pre.style.width = 'initial'; //pre.removeAttribute('style'); //console.debug("pre width =",pre.style.width); } ); } this.tweakSbsDiffs(); }; /** Fetches the content diff based on the contents and settings of this page's input fields, and updates the UI with the diff view. Returns this object, noting that the operation is async. */ P.diff = function f(sbs){ if(!affirmPageLoaded()) return this; const content = this.wikiContent(), self = this, target = this.e.diffTarget; const fd = new FormData(); fd.append('page',this.winfo.name); fd.append('sbs', sbs ? 1 : 0); fd.append('content',content); if(this.e.selectDiffWS) fd.append('ws',this.e.selectDiffWS.value); F.message( "Fetching diff..." ).fetch('wikiajax/diff',{ payload: fd, onload: function(c){ target.innerHTML = [ "<div>Diff <code>[", self.winfo.name, "]</code> → Local Edits</div>", c||'No changes.' ].join(''); if(sbs) P.tweakSbsDiffs2(); F.message('Updated diff.'); self.tabs.switchToTab(self.e.tabs.diff); } }); return this; }; /** Saves the current wiki page and re-populates the editor with the saved state. */ P.save = function callee(){ if(!affirmPageLoaded()) return this; const self = this; const content = this.wikiContent(); if(!callee.onload){ callee.onload = function(w){ const oldWinfo = self.winfo; self.unstashContent(oldWinfo); self.winfo = w; self.updatePageTitle(); self.dispatchEvent('wiki-page-loaded', w); F.message("Saved page: ["+w.name+"]."); } } const fd = new FormData(), w = P.winfo; fd.append('page',w.name); fd.append('mimetype', w.mimetype); fd.append('isnew', w.version ? 0 : 1); fd.append('content', P.wikiContent()); F.message( "Saving page..." ).fetch('wikiajax/save',{ payload: fd, responseType: 'json', onload: callee.onload }); return this; }; /** Updates P.winfo for certain state and stashes P.winfo, with the current content fetched via P.wikiContent(). If passed truthy AND the stash already has stashed content for the current page, only the stashed winfo record is updated, else both the winfo and content are updated. */ P.stashContentChange = function(onlyWinfo){ if(affirmPageLoaded(true)){ const wi = this.winfo; wi.mimetype = P.e.selectMimetype.value; if(onlyWinfo && $stash.hasStashedContent(wi)){ $stash.updateWinfo(wi); }else{ $stash.updateWinfo(wi, P.wikiContent()); } F.message("Stashed change(s) to page ["+wi.name+"]."); P.updatePageTitle(); $stash.prune(); this.previewNeedsUpdate = true; } return this; }; /** Removes any stashed state for the current P.winfo (if set) from F.storage. Returns this. */ P.unstashContent = function(){ const winfo = arguments[0] || this.winfo; if(winfo){ this.previewNeedsUpdate = true; $stash.unstash(winfo); //console.debug("Unstashed",winfo); F.message("Unstashed page ["+winfo.name+"]."); } return this; }; /** Clears all stashed file state from F.storage. Returns this. */ P.clearStash = function(){ $stash.clear(); return this; }; /** If stashed content for P.winfo exists, it is returned, else undefined is returned. */ P.contentFromStash = function(){ return affirmPageLoaded(true) ? $stash.stashedContent(this.winfo) : undefined; }; /** If a stashed version of the given winfo object exists (same filename/checkin values), return it, else return undefined. */ P.getStashedWinfo = function(winfo){ return $stash.getWinfo(winfo); }; })(window.fossil); |
Changes to src/main.c.
︙ | ︙ | |||
2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 | ** ** redirect: REPO URL Extract the "name" query parameter and search ** REPO for a check-in or ticket that matches the ** value of "name", then redirect to URL. There ** can be multiple "redirect:" lines that are ** processed in order. If the REPO is "*", then ** an unconditional redirect to URL is taken. ** ** Most CGI files contain only a "repository:" line. It is uncommon to ** use any other option. ** ** See also: http, server, winsrv */ void cmd_cgi(void){ | > > > > | 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 | ** ** redirect: REPO URL Extract the "name" query parameter and search ** REPO for a check-in or ticket that matches the ** value of "name", then redirect to URL. There ** can be multiple "redirect:" lines that are ** processed in order. If the REPO is "*", then ** an unconditional redirect to URL is taken. ** ** jsmode: VALUE Specifies the delivery mode for JavaScript ** files. See the help text for the --jsmode ** flag of the http command. ** ** Most CGI files contain only a "repository:" line. It is uncommon to ** use any other option. ** ** See also: http, server, winsrv */ void cmd_cgi(void){ |
︙ | ︙ | |||
2272 2273 2274 2275 2276 2277 2278 | skin_use_alternative(blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "jsmode:") && blob_token(&line, &value) ){ /* jsmode: MODE ** | | | > > | 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 | skin_use_alternative(blob_str(&value)); blob_reset(&value); continue; } if( blob_eq(&key, "jsmode:") && blob_token(&line, &value) ){ /* jsmode: MODE ** ** Change how JavaScript resources are delivered with each HTML ** page. MODE is "inline" to put all JS inline, or "separate" to ** cause each JS file to be requested using a separate HTTP request, ** or "bundled" to have all JS files to be fetched with a single ** auxiliary HTTP request. Noting, however, that "single" might ** actually mean more than one, depending on the script-timing ** requirements of any given page. */ builtin_set_js_delivery_mode(blob_str(&value),0); blob_reset(&value); continue; } if( blob_eq(&key, "cgi-debug:") && blob_token(&line, &value) ){ /* cgi-debug: FILENAME |
︙ | ︙ | |||
2466 2467 2468 2469 2470 2471 2472 | ** --baseurl URL base URL (useful with reverse proxies) ** --extroot DIR document root for the /ext extension mechanism ** --files GLOB comma-separate glob patterns for static file to serve ** --host NAME specify hostname of the server ** --https signal a request coming in via https ** --in FILE Take input from FILE instead of standard input ** --ipaddr ADDR Assume the request comes from the given IP address | | | | | | | > > > > > | 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 | ** --baseurl URL base URL (useful with reverse proxies) ** --extroot DIR document root for the /ext extension mechanism ** --files GLOB comma-separate glob patterns for static file to serve ** --host NAME specify hostname of the server ** --https signal a request coming in via https ** --in FILE Take input from FILE instead of standard input ** --ipaddr ADDR Assume the request comes from the given IP address ** --jsmode MODE Determine how JavaScript is delivered with pages. ** Mode can be one of: ** inline All JavaScript is inserted inline at ** one or more points in the HTML file. ** separate Separate HTTP requests are made for ** each JavaScript file. ** bundled Groups JavaScript files into one or ** more bundled requests which ** concatenate scripts together. ** Depending on the needs of any given page, inline ** and bundled modes might result in a single ** amalgamated script or several, but both approaches ** result in fewer HTTP requests than the separate mode. ** --localauth enable automatic login for local connections ** --nocompress do not compress HTTP replies ** --nodelay omit backoffice processing if it would delay process exit ** --nojail drop root privilege but do not enter the chroot jail ** --nossl signal that no SSL connections are available ** --notfound URL use URL as "HTTP 404, object not found" page. ** --out FILE write results to FILE instead of to standard output |
︙ | ︙ | |||
2734 2735 2736 2737 2738 2739 2740 | ** --create Create a new REPOSITORY if it does not already exist ** --extroot DIR Document root for the /ext extension mechanism ** --files GLOBLIST Comma-separated list of glob patterns for static files ** --localauth enable automatic login for requests from localhost ** --localhost listen on 127.0.0.1 only (always true for "ui") ** --https Indicates that the input is coming through a reverse ** proxy that has already translated HTTPS into HTTP. | | | | | > > > > | 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 | ** --create Create a new REPOSITORY if it does not already exist ** --extroot DIR Document root for the /ext extension mechanism ** --files GLOBLIST Comma-separated list of glob patterns for static files ** --localauth enable automatic login for requests from localhost ** --localhost listen on 127.0.0.1 only (always true for "ui") ** --https Indicates that the input is coming through a reverse ** proxy that has already translated HTTPS into HTTP. ** --jsmode MODE Determine how JavaScript is delivered with pages. ** Mode can be one of: ** inline All JavaScript is inserted inline at ** the end of the HTML file. ** separate Separate HTTP requests are made for ** each JavaScript file. ** bundled One single separate HTTP fetches all ** JavaScript concatenated together. ** Depending on the needs of any given page, inline ** and bundled modes might result in a single ** amalgamated script or several, but both approaches ** result in fewer HTTP requests than the separate mode. ** --max-latency N Do not let any single HTTP request run for more than N ** seconds (only works on unix) ** --nocompress Do not compress HTTP replies ** --nojail Drop root privileges but do not enter the chroot jail ** --nossl signal that no SSL connections are available (Always ** set by default for the "ui" command) ** --notfound URL Redirect |
︙ | ︙ |
Changes to src/main.mk.
︙ | ︙ | |||
152 153 154 155 156 157 158 | $(SRCDIR)/verify.c \ $(SRCDIR)/vfile.c \ $(SRCDIR)/webmail.c \ $(SRCDIR)/wiki.c \ $(SRCDIR)/wikiformat.c \ $(SRCDIR)/winfile.c \ $(SRCDIR)/winhttp.c \ | < | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | $(SRCDIR)/verify.c \ $(SRCDIR)/vfile.c \ $(SRCDIR)/webmail.c \ $(SRCDIR)/wiki.c \ $(SRCDIR)/wikiformat.c \ $(SRCDIR)/winfile.c \ $(SRCDIR)/winhttp.c \ $(SRCDIR)/xfer.c \ $(SRCDIR)/xfersetup.c \ $(SRCDIR)/zip.c EXTRA_FILES = \ $(SRCDIR)/../skins/aht/details.txt \ $(SRCDIR)/../skins/ardoise/css.txt \ |
︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 | $(SRCDIR)/forum.js \ $(SRCDIR)/fossil.bootstrap.js \ $(SRCDIR)/fossil.confirmer.js \ $(SRCDIR)/fossil.dom.js \ $(SRCDIR)/fossil.fetch.js \ $(SRCDIR)/fossil.page.fileedit.js \ $(SRCDIR)/fossil.page.forumpost.js \ $(SRCDIR)/fossil.storage.js \ $(SRCDIR)/fossil.tabs.js \ $(SRCDIR)/graph.js \ $(SRCDIR)/href.js \ $(SRCDIR)/login.js \ $(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \ | > | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | $(SRCDIR)/forum.js \ $(SRCDIR)/fossil.bootstrap.js \ $(SRCDIR)/fossil.confirmer.js \ $(SRCDIR)/fossil.dom.js \ $(SRCDIR)/fossil.fetch.js \ $(SRCDIR)/fossil.page.fileedit.js \ $(SRCDIR)/fossil.page.forumpost.js \ $(SRCDIR)/fossil.page.wikiedit.js \ $(SRCDIR)/fossil.storage.js \ $(SRCDIR)/fossil.tabs.js \ $(SRCDIR)/graph.js \ $(SRCDIR)/href.js \ $(SRCDIR)/login.js \ $(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \ |
︙ | ︙ | |||
255 256 257 258 259 260 261 262 263 264 265 266 267 268 | $(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)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ $(OBJDIR)/add_.c \ $(OBJDIR)/ajax_.c \ | > | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | $(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 = \ $(OBJDIR)/add_.c \ $(OBJDIR)/ajax_.c \ |
︙ | ︙ | |||
400 401 402 403 404 405 406 | $(OBJDIR)/verify_.c \ $(OBJDIR)/vfile_.c \ $(OBJDIR)/webmail_.c \ $(OBJDIR)/wiki_.c \ $(OBJDIR)/wikiformat_.c \ $(OBJDIR)/winfile_.c \ $(OBJDIR)/winhttp_.c \ | < | 401 402 403 404 405 406 407 408 409 410 411 412 413 414 | $(OBJDIR)/verify_.c \ $(OBJDIR)/vfile_.c \ $(OBJDIR)/webmail_.c \ $(OBJDIR)/wiki_.c \ $(OBJDIR)/wikiformat_.c \ $(OBJDIR)/winfile_.c \ $(OBJDIR)/winhttp_.c \ $(OBJDIR)/xfer_.c \ $(OBJDIR)/xfersetup_.c \ $(OBJDIR)/zip_.c OBJ = \ $(OBJDIR)/add.o \ $(OBJDIR)/ajax.o \ |
︙ | ︙ | |||
546 547 548 549 550 551 552 | $(OBJDIR)/verify.o \ $(OBJDIR)/vfile.o \ $(OBJDIR)/webmail.o \ $(OBJDIR)/wiki.o \ $(OBJDIR)/wikiformat.o \ $(OBJDIR)/winfile.o \ $(OBJDIR)/winhttp.o \ | < | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 | $(OBJDIR)/verify.o \ $(OBJDIR)/vfile.o \ $(OBJDIR)/webmail.o \ $(OBJDIR)/wiki.o \ $(OBJDIR)/wikiformat.o \ $(OBJDIR)/winfile.o \ $(OBJDIR)/winhttp.o \ $(OBJDIR)/xfer.o \ $(OBJDIR)/xfersetup.o \ $(OBJDIR)/zip.o all: $(OBJDIR) $(APPNAME) install: all mkdir -p $(INSTALLDIR) |
︙ | ︙ | |||
882 883 884 885 886 887 888 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ | < | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \ $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \ $(SRCDIR)/sqlite3.h \ $(SRCDIR)/th.h \ $(OBJDIR)/VERSION.h touch $(OBJDIR)/headers |
︙ | ︙ | |||
2013 2014 2015 2016 2017 2018 2019 | $(OBJDIR)/translate $(SRCDIR)/winhttp.c >$@ $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h: $(OBJDIR)/headers | < < < < < < < < | 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 | $(OBJDIR)/translate $(SRCDIR)/winhttp.c >$@ $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h: $(OBJDIR)/headers $(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate $(OBJDIR)/translate $(SRCDIR)/xfer.c >$@ $(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h: $(OBJDIR)/headers |
︙ | ︙ |
Changes to src/makemake.tcl.
︙ | ︙ | |||
162 163 164 165 166 167 168 | verify vfile webmail wiki wikiformat winfile winhttp | < | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip http_ssl } # Additional resource files that get built into the executable. |
︙ | ︙ |
Changes to src/setup.c.
︙ | ︙ | |||
1075 1076 1077 1078 1079 1080 1081 | @ be allowed. For example, to allow unsafe HTML only for checked-in files, @ make this setting be just "<b>b</b>". To allow unsafe HTML anywhere except @ in forum posts, make this setting be "<b>btw</b>". The default is an @ empty string which means that Fossil never allows Markdown documents @ to generate unsafe HTML. @ (Property: "safe-html")</p> @ <hr /> | < < < < < < < < | < < | 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 | @ be allowed. For example, to allow unsafe HTML only for checked-in files, @ make this setting be just "<b>b</b>". To allow unsafe HTML anywhere except @ in forum posts, make this setting be "<b>btw</b>". The default is an @ empty string which means that Fossil never allows Markdown documents @ to generate unsafe HTML. @ (Property: "safe-html")</p> @ <hr /> onoff_attribute("Use HTML as wiki markup language", "wiki-use-html", "wiki-use-html", 0, 0); @ <p>Use HTML as the wiki markup language. Wiki links will still be parsed @ but all other wiki formatting will be ignored.</p> @ <p><strong>CAUTION:</strong> when @ enabling, <i>all</i> HTML tags and attributes are accepted in the wiki. @ No sanitization is done. This means that it is very possible for malicious @ users to inject dangerous HTML, CSS and JavaScript code into your wiki.</p> @ <p>This should <strong>only</strong> be enabled when wiki editing is limited @ to trusted users. It should <strong>not</strong> be used on a publicly @ editable wiki.</p> |
︙ | ︙ |
Changes to src/style.c.
︙ | ︙ | |||
1421 1422 1423 1424 1425 1426 1427 | /* ** The first time this is called, it emits code to install and ** bootstrap the window.fossil object, using the built-in file ** fossil.bootstrap.js (not to be confused with bootstrap.js). ** ** Subsequent calls are no-ops. ** | | | | | | | | > | > | > | 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 | /* ** The first time this is called, it emits code to install and ** bootstrap the window.fossil object, using the built-in file ** fossil.bootstrap.js (not to be confused with bootstrap.js). ** ** Subsequent calls are no-ops. ** ** It emits 2 parts: ** ** 1) window.fossil core object, some of which depends on C-level ** runtime data. That part of the script is always emitted inline. If ** addScriptTag is true then it is wrapped in its own SCRIPT tag, else ** it is assumed that the caller already opened a tag. ** ** 2) Emits the static fossil.bootstrap.js using builtin_request_js(). */ void style_emit_script_fossil_bootstrap(int addScriptTag){ static int once = 0; if(0==once++){ /* Set up the generic/app-agnostic parts of window.fossil ** which require C-level state... */ if(addScriptTag!=0){ style_emit_script_tag(0,0); } CX("(function(){\n" "if(!window.fossil) window.fossil={};\n" "window.fossil.version = %!j;\n" /* fossil.rootPath is the top-most CGI/server path, ** including a trailing slash. */ "window.fossil.rootPath = %!j+'/';\n", get_version(), g.zTop); |
︙ | ︙ | |||
1463 1464 1465 1466 1467 1468 1469 | ** where the current page "should" store any of its own ** page-specific state, and it is reserved for that purpose. */ CX("window.fossil.page = {" "name:\"%T\"" "};\n", g.zPath); CX("})();\n"); | > > > | < | 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 | ** where the current page "should" store any of its own ** page-specific state, and it is reserved for that purpose. */ CX("window.fossil.page = {" "name:\"%T\"" "};\n", g.zPath); CX("})();\n"); if(addScriptTag!=0){ style_emit_script_tag(1,0); } /* The remaining window.fossil bootstrap code is not dependent on ** C-runtime state... */ builtin_request_js("fossil.bootstrap.js"); } } /* ** If passed 0 as its first argument, it emits a script opener tag ** with this request's nonce. If passed non-0 it emits a script |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | }else{ CX("<script nonce='%s'>", style_nonce()); } }else{ CX("</script>\n"); } } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1504 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 | }else{ CX("<script nonce='%s'>", style_nonce()); } }else{ CX("</script>\n"); } } /* ** Convenience wrapper which calls builtin_request_js() for a series ** of builtin scripts named fossil.NAME.js. The first time it is ** called, it also calls style_emit_script_fossil_bootstrap() to ** initialize the window.fossil JS API. The first argument is a ** no-meaning dummy required by the va_start() interface. All ** subsequent arguments must be strings of the NAME part of ** fossil.NAME.js, followed by a NULL argument to terminate the list. ** ** e.g. pass it (0, "fetch", "dom", "tabs", 0) to load those 3 ** APIs. Do not forget the trailing 0! */ void style_emit_fossil_js_apis( int dummy, ... ) { static int once = 0; const char *zArg; char * zName; va_list vargs; if(0==once++){ style_emit_script_fossil_bootstrap(1); } va_start(vargs,dummy); while( (zArg = va_arg (vargs, const char *))!=0 ){ zName = mprintf("fossil.%s.js", zArg); builtin_request_js(zName); fossil_free(zName); } va_end(vargs); } |
Changes to src/style.fileedit.css.
︙ | ︙ | |||
181 182 183 184 185 186 187 | flex-direction: column; align-items: stretch; width: initial; } body.fileedit .sbsdiffcols div.difftxtcol pre { max-width: 44em; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 181 182 183 184 185 186 187 | flex-direction: column; align-items: stretch; width: initial; } body.fileedit .sbsdiffcols div.difftxtcol pre { max-width: 44em; } |
Added src/style.wikiedit.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 | body.wikieedit.waiting * { /* Triggered during AJAX requests. */ cursor: wait; } body.wikiedit textarea, body.wikiedit textarea:focus, body.wikiedit input, body.wikiedit input:focus, body.wikiedit select, body.wikiedit select:focus{ /* The sudden appearance of a border (as in the Ardoise skin) shifts the layout in unsightly ways */ border: initial; } body.wikiedit div.wikiedit-preview { margin: 0; padding: 0; } body.wikiedit #wikiedit-tabs { margin: 1em 0 0 0; } body.wikiedit #wikiedit-tab-preview-wrapper { overflow: auto; } body.wikiedit .tab-container > .tabs > .tab-panel > .wikiedit-options { margin-top: 0; border: none; border-radius: 0; border-bottom-width: 1px; border-bottom-style: dotted; } body.wikiedit .tab-container > .tabs > .tab-panel > .wikiedit-options > button { vertical-align: middle; margin: 0.5em; } body.wikiedit .tab-container > .tabs > .tab-panel > .wikiedit-options > input { vertical-align: middle; margin: 0.5em; } body.wikiedit .tab-container > .tabs > .tab-panel > .wikiedit-options > .input-with-label { vertical-align: middle; margin: 0.5em; } body.wikiedit .wikiedit-options > div > * { margin: 0.25em; } body.wikiedit .wikiedit-options.flex-container.flex-row { align-items: first baseline; } body.wikiedit .WikiList { display: flex; flex-direction: column; align-items: start; } body.wikiedit .WikiList select { font-size: 110%; margin: initial; height: initial /* some skins set these to a fix height */; } body.wikiedit .WikiList select option { margin: 0.5em 0; } body.wikiedit .WikiList select option.stashed::before { /* Maintenance reminder: the option.stashed/stashed-new "content" values are duplicated in fossil.page.wikiedit.js and need to be changed there if they are changed here: see fossil.page.config.editStateMarkers */ content: "[*] "; } body.wikiedit .WikiList select option.stashed-new::before { content: "[+] "; } body.wikiedit textarea { max-width: initial; } body.wikiedit .tabs .tab-panel { /* Needed for wide diffs */ overflow: auto; } body.wikiedit .WikiList fieldset { padding: 0.25em; border-width: 1px /* Ardoise skin sets this to 0 */; } body.wikiedit .WikiList legend { font-size: 90%; } body.wikiedit .WikiList fieldset > :not(legend) { /* Stretch page selection list when it's empty or only has short page names */ width: 100%; } body.wikiedit .WikiList .fieldset-wrapper { /* Container for the filter and edit status fieldsets */ display: flex; flex-direction: row; flex-wrap: wrap; align-items: stretch; justify-content: stretch; margin: 0; } body.wikiedit .WikiList button.save { margin: 1em 0 0 0; } body.wikiedit .WikiList .new-page { align-items: flex-start; max-width: 15em; } body.wikiedit .WikiList .new-page input { } body.wikiedit #wikiedit-tab-misc h3 { margin: 0; } body.wikiedit span.mini-tip { font-size: 80%; } body.wikiedit span.save-button-slot { /* These invisible placeholders mark spots in the UI (max. 1 per tab) to where the save button gets relocated as we switch between tabs. */ display: none; } body.wikiedit #wikiedit-page-name > span { font-family: monospace; } |
Changes to src/wiki.c.
︙ | ︙ | |||
100 101 102 103 104 105 106 | return db_int(0, "SELECT srcid FROM tagxref" " WHERE tagid=%d AND mtime<%.16g" " ORDER BY mtime DESC LIMIT 1", tagid, mtime); } | < | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | return db_int(0, "SELECT srcid FROM tagxref" " WHERE tagid=%d AND mtime<%.16g" " ORDER BY mtime DESC LIMIT 1", tagid, mtime); } /* ** WEBPAGE: home ** WEBPAGE: index ** WEBPAGE: not_found ** ** The /home, /index, and /not_found pages all redirect to the homepage ** configured by the administrator. |
︙ | ︙ | |||
396 397 398 399 400 401 402 403 404 405 406 407 408 409 | return WIKITYPE_BRANCH; }else if( sqlite3_strglob("tag/*", zPageName)==0 ){ return WIKITYPE_TAG; } return WIKITYPE_NORMAL; } /* ** Add an appropriate style_header() for either the /wiki or /wikiedit page ** for zPageName. zExtra is an empty string for /wiki but has the text ** "Edit: " for /wikiedit. ** ** If the page is /wiki and the page is one of the special times (check-in, | > > > > > > > > > > > > > > | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 | return WIKITYPE_BRANCH; }else if( sqlite3_strglob("tag/*", zPageName)==0 ){ return WIKITYPE_TAG; } return WIKITYPE_NORMAL; } /* ** Returns a JSON-friendly string form of the integer value returned ** by wiki_page_type(zPageName). */ const char * wiki_page_type_name(const char *zPageName){ switch(wiki_page_type(zPageName)){ case WIKITYPE_CHECKIN: return "checkin"; case WIKITYPE_BRANCH: return "branch"; case WIKITYPE_TAG: return "tag"; case WIKITYPE_NORMAL: default: return "normal"; } } /* ** Add an appropriate style_header() for either the /wiki or /wikiedit page ** for zPageName. zExtra is an empty string for /wiki but has the text ** "Edit: " for /wikiedit. ** ** If the page is /wiki and the page is one of the special times (check-in, |
︙ | ︙ | |||
539 540 541 542 543 544 545 | } } zMimetype = wiki_filter_mimetypes(zMimetype); if( !g.isHome && !noSubmenu ){ if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) && wiki_special_permission(zPageName) ){ | < < < < | < | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | } } zMimetype = wiki_filter_mimetypes(zMimetype); if( !g.isHome && !noSubmenu ){ if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) && wiki_special_permission(zPageName) ){ style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); }else if( rid && g.perm.ApndWiki ){ style_submenu_element("Edit", "%R/wikiappend?name=%T", zPageName); } if( g.perm.Hyperlink ){ style_submenu_element("History", "%R/whistory?name=%T", zPageName); } } |
︙ | ︙ | |||
618 619 620 621 622 623 624 625 626 627 | for(i=4; i>=2; i-=2){ if( zMimetype && fossil_strcmp(zMimetype, azStyles[i])==0 ){ return azStyles[i+1]; } } return azStyles[1]; } /* ** WEBPAGE: wikiedit | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > | > > > < < < < < < | < < | < < < | < < < < < < < < < < | < > | > < | < < | < | < < < < < > < < < | > | < < < | > > > | | > | > | | | | | < > | > > > | | < | | < < < < | < > > | < < | > > > > > > > > > > > > > | | | < > | | < > | | | < > | > > > | > > > < < < < < > > | | < < < > | < | < < > | | < > > > | | > > | > > > > | > > > | > > | | < < < | < < > | | | | | < | > | | > > > > | > > | < < < | < > > | | < < > > | | | | | | | | | > > | | > > > > > > | | < | < < > | < < < < | | | | | > > > > | | | > | < | | | > > > > > | < | > > < < < < | < < > | > > | 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 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 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 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 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 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 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 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 | for(i=4; i>=2; i-=2){ if( zMimetype && fossil_strcmp(zMimetype, azStyles[i])==0 ){ return azStyles[i+1]; } } return azStyles[1]; } /* ** Tries to fetch a wiki page for the given name. If found, it ** returns true, else false. ** ** versionsBack specifies how many versions back in the history to ** fetch. Use 0 for the latest version, 1 for its parent, etc. ** ** If pRid is not NULL then if a result is found *pRid is set to its ** RID. If ppWiki is not NULL then if found *ppWiki is set to the ** loaded wiki object, which the caller is responsible for passing to ** manifest_destroy(). */ static int wiki_fetch_by_name( const char *zPageName, unsigned int versionsBack, int * pRid, Manifest **ppWiki ){ Manifest *pWiki = 0; char *zTag = mprintf("wiki-%s", zPageName); Stmt q = empty_Stmt; int rid = 0; db_prepare(&q, "SELECT rid FROM tagxref" " WHERE tagid=(SELECT tagid FROM tag WHERE" " tagname=%Q) " " ORDER BY mtime DESC LIMIT -1 OFFSET %u", zTag, versionsBack); fossil_free(zTag); if(SQLITE_ROW == db_step(&q)){ rid = db_column_int(&q, 0); } db_finalize(&q); if( rid == 0 ){ return 0; } else if(pRid){ *pRid = rid; } if(ppWiki){ pWiki = manifest_get(rid, CFTYPE_WIKI, 0); if( pWiki==0 ){ /* "Cannot happen." */ return 0; } *ppWiki = pWiki; } return 1; } /* ** Determines whether the wiki page with the given name can be edited ** or created by the current user. If not, an AJAX error is queued and ** false is returned, else true is returned. A NULL, empty, or ** malformed name is considered non-writable, regardless of the user. ** ** If pRid is not NULL then this function writes the page's rid to ** *pRid (whether or not access is granted). On error or if the page ** does not yet exist, *pRid will be set to 0. ** ** Note that the sandbox is a special case: it is a pseudo-page with ** no rid and the /wikiajax API does not allow anyone to actually save ** a sandbox page, but it is reported as writable here (with rid 0). */ static int wiki_ajax_can_write(const char *zPageName, int * pRid){ int rid = 0; const char * zErr = 0; if(pRid) *pRid = 0; if(!zPageName || !*zPageName || !wiki_name_is_wellformed((unsigned const char *)zPageName)){ zErr = "Invalid page name."; }else if(is_sandbox(zPageName)){ return 1; }else{ wiki_fetch_by_name(zPageName, 0, &rid, 0); if(pRid) *pRid = rid; if(!wiki_special_permission(zPageName)){ zErr = "Editing this page requires non-wiki write permissions."; }else if( (rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki) ){ return 3; }else if(rid && !g.perm.WrWiki){ zErr = "Requires wiki-write permissions."; }else if(!rid && !g.perm.NewWiki){ zErr = "Requires new-wiki permissions."; }else{ zErr = "Cannot happen! Please report this as a bug."; } } ajax_route_error(403, "%s", zErr); return 0; } /* ** Loads the given wiki page, sets the response type to ** application/json, and emits it as a JSON object. If zPageName is a ** sandbox page then a "fake" object is emitted, as the wikiajax API ** does not permit saving the sandbox. ** ** Returns true on success, false on error, and on error it ** queues up a JSON-format error response. ** ** Output JSON format: ** ** { name: "page name", ** type: "normal" | "tag" | "checkin" | "branch" | "sandbox", ** mimetype: "mime type", ** version: UUID string or null for a sandbox page, ** parent: "parent uuid" or null if no parent, ** content: "page content" ** } ** ** If includeContent is false then the content member is elided. */ static int wiki_ajax_emit_page_object(const char *zPageName, int includeContent){ Manifest * pWiki = 0; char * zUuid; cgi_set_content_type("application/json"); if( is_sandbox(zPageName) ){ char * zMimetype = db_get("sandbox-mimetype","text/x-fossil-wiki"); char * zBody = db_get("sandbox",""); CX("{\"name\": %!j, \"type\": \"sandbox\", " "\"mimetype\": %!j, \"version\": null, \"parent\": null", zPageName, zMimetype); if(includeContent){ CX(", \"content\": %!j", zBody); } CX("}"); fossil_free(zMimetype); fossil_free(zBody); return 1; }else if( !wiki_fetch_by_name(zPageName, 0, 0, &pWiki) ){ ajax_route_error(404, "Wiki page could not be loaded: %s", zPageName); return 0; }else{ zUuid = rid_to_uuid(pWiki->rid); CX("{\"name\": %!j, \"type\": %!j, " "\"version\": %!j, " "\"mimetype\": %!j, ", pWiki->zWikiTitle, wiki_page_type_name(pWiki->zWikiTitle), zUuid, pWiki->zMimetype ? pWiki->zMimetype : "text/x-fossil-wiki"); CX("\"parent\": "); if(pWiki->nParent){ CX("%!j", pWiki->azParent[0]); }else{ CX("null"); } if(includeContent){ CX(", \"content\": %!j", pWiki->zWiki); } CX("}"); fossil_free(zUuid); manifest_destroy(pWiki); return 2; } } /* ** Ajax route handler for /wikiajax/save. ** ** URL params: ** ** page = the wiki page name. ** mimetype = content mime type. ** content = page content. Fossil considers an empty page to ** be "deleted". ** isnew = 1 if the page is to be newly-created, else 0 or ** not send. ** ** Responds with JSON. On error, an object in the form documented by ** ajax_route_error(). On success, an object in the form documented ** for wiki_ajax_emit_page_object(). ** ** The wikiajax API disallows saving of a sandbox pseudo-page, and ** will respond with an error if asked to save one. ** ** Reminder: the original implementation implements sandbox-page ** saving using: ** ** db_set("sandbox",zBody,0); ** db_set("sandbox-mimetype",zMimetype,0); ** */ static void wiki_ajax_route_save(void){ const char *zPageName = P("page"); const char *zMimetype = P("mimetype"); const char *zContent = P("content"); const int isNew = atoi(PD("isnew","0"))==1; Blob content = empty_blob; int parentRid = 0; int rollback = 0; if(!wiki_ajax_can_write(zPageName, &parentRid)){ return; }else if(is_sandbox(zPageName)){ ajax_route_error(403,"Saving a sandbox page is prohibited."); return; } /* These isNew checks are just me being pedantic. The hope is to avoid accidental addition of new pages which differ only by the case of their name. We could just as easily derive isNew based on whether or not the page already exists. */ if(isNew){ if(parentRid>0){ ajax_route_error(403,"Requested a new page, " "but it already exists with RID %d: %s", parentRid, zPageName); return; } }else if(parentRid==0){ ajax_route_error(403,"Creating new page [%s] requires passing " "isnew=1.", zPageName); return; } blob_init(&content, zContent ? zContent : "", -1); db_begin_transaction(); wiki_cmd_commit(zPageName, parentRid, &content, zMimetype, 0); rollback = wiki_ajax_emit_page_object(zPageName, 1) ? 0 : 1; db_end_transaction(rollback); } /* ** Ajax route handler for /wikiajax/fetch. ** ** URL params: ** ** page = the wiki page name ** ** Responds with JSON. On error, an object in the form documented by ** ajax_route_error(). On success, an object in the form documented ** for wiki_ajax_emit_page_object(). */ static void wiki_ajax_route_fetch(void){ const char * zPageName = P("page"); if( zPageName==0 || zPageName[0]==0 ){ ajax_route_error(400,"Missing page name."); return; } wiki_ajax_emit_page_object(zPageName, 1); } /* ** Ajax route handler for /wikiajax/diff. ** ** URL params: ** ** page = the wiki page name ** content = the new/edited wiki page content ** ** Requires that the user have write access solely to avoid some ** potential abuse cases. It does not actually write anything. */ static void wiki_ajax_route_diff(void){ const char * zPageName = P("page"); Blob contentNew = empty_blob, contentOrig = empty_blob; Manifest * pParent = 0; const char * zContent = P("content"); u64 diffFlags = DIFF_HTML | DIFF_NOTTOOBIG | DIFF_STRIP_EOLCR; if( zPageName==0 || zPageName[0]==0 ){ ajax_route_error(400,"Missing page name."); return; }else if(!wiki_ajax_can_write(zPageName, 0)){ return; } switch(atoi(PD("sbs","0"))){ case 0: diffFlags |= DIFF_LINENO; break; default: diffFlags |= DIFF_SIDEBYSIDE; } switch(atoi(PD("ws","2"))){ case 1: diffFlags |= DIFF_IGNORE_EOLWS; break; case 2: diffFlags |= DIFF_IGNORE_ALLWS; break; default: break; } wiki_fetch_by_name( zPageName, 0, 0, &pParent ); if( pParent && pParent->zWiki && *pParent->zWiki ){ blob_init(&contentOrig, pParent->zWiki, -1); }else{ blob_init(&contentOrig, "", 0); } blob_init(&contentNew, zContent ? zContent : "", -1); cgi_set_content_type("text/html"); ajax_render_diff(&contentOrig, &contentNew, diffFlags); blob_reset(&contentNew); blob_reset(&contentOrig); manifest_destroy(pParent); } /* ** Ajax route handler for /wikiajax/preview. ** ** URL params: ** ** page = wiki page name. This is only needed for authorization ** checking. ** mimetype = the wiki page mimetype (determines rendering style) ** content = the wiki page content */ static void wiki_ajax_route_preview(void){ const char * zPageName = P("page"); const char * zContent = P("content"); if(!wiki_ajax_can_write(zPageName, 0)){ return; }else if( zContent==0 ){ ajax_route_error(400,"Missing content to preview."); return; }else{ Blob content = empty_blob; const char * zMimetype = PD("mimetype","text/x-fossil-wiki"); blob_init(&content, zContent, -1); cgi_set_content_type("text/html"); wiki_render_by_mimetype(&content, zMimetype); blob_reset(&content); } } /* ** Ajax route handler for /wikiajax/list. ** ** Optional parameters: verbose, includeContent (see below). ** ** Responds with JSON. On error, an object in the form documented by ** ajax_route_error(). ** ** On success, it emits an array of strings (page names) sorted ** case-insensitively. If the "verbose" parameter is passed in then ** the result list contains objects in the format documented for ** wiki_ajax_emit_page_object(). The content of each object is elided ** unless the "includeContent" parameter is passed on. ** ** The result list always contains an entry ** named "sandbox" which represents the sandbox pseudo-page. */ static void wiki_ajax_route_list(void){ Stmt q = empty_Stmt; int n = 0; const int verbose = ajax_p_bool("verbose"); const int includeContent = ajax_p_bool("includeContent"); cgi_set_content_type("application/json"); db_begin_transaction(); db_prepare(&q, "SELECT" " substr(tagname,6) AS name" " FROM tag WHERE tagname GLOB 'wiki-*'" " UNION SELECT 'Sandbox' AS name" " ORDER BY name COLLATE NOCASE"); CX("["); while( SQLITE_ROW==db_step(&q) ){ char const * zName = db_column_text(&q,0); if(n++){ CX(","); } if(verbose==0){ CX("%!j", zName); }else{ wiki_ajax_emit_page_object(zName, includeContent); } } db_finalize(&q); db_end_transaction(0); CX("]"); } /* ** WEBPAGE: wikiajax ** ** An internal dispatcher for wiki AJAX operations. Not for direct ** client use. All routes defined by this interface are app-internal, ** subject to change */ void wiki_ajax_page(void){ const char * zName = P("name"); AjaxRoute routeName = {0,0,0,0}; const AjaxRoute * pRoute = 0; const AjaxRoute routes[] = { /* Keep these sorted by zName (for bsearch()) */ {"diff", wiki_ajax_route_diff, 1, 1}, {"fetch", wiki_ajax_route_fetch, 0, 0}, {"list", wiki_ajax_route_list, 0, 0}, {"preview", wiki_ajax_route_preview, 0, 1} /* preview access mode: whether or not wiki-write mode is needed really depends on multiple factors. e.g. the sandbox page does not normally require more than anonymous access. We set its write-mode to false and do those checks manually in that route's handler. */, {"save", wiki_ajax_route_save, 1, 1} }; if(zName==0 || zName[0]==0){ ajax_route_error(400,"Missing required [route] 'name' parameter."); return; } routeName.zName = zName; pRoute = (const AjaxRoute *)bsearch(&routeName, routes, count(routes), sizeof routes[0], cmp_ajax_route_name); if(pRoute==0){ ajax_route_error(404,"Ajax route not found."); return; } login_check_credentials(); if( pRoute->bWriteMode!=0 && g.perm.WrWiki==0 ){ ajax_route_error(403,"Write permissions required."); return; }else if(0==cgi_csrf_safe(pRoute->bPost)){ ajax_route_error(403, "CSRF violation (make sure sending of HTTP " "Referer headers is enabled for XHR " "connections)."); return; } pRoute->xCallback(); } /* ** WEBPAGE: wikiedit ** URL: /wikedit?name=PAGENAME ** ** The main front-end for the Ajax-based wiki editor app. Passing ** in the name of an unknown page will trigger the creation ** of a new page (which is not actually created in the database ** until the user explicitly saves it). If passed no page name, ** the user may select a page from the list on the first UI tab. ** ** When creating a new page, the mimetype URL parameter may optionally ** be used to set its mimetype to one of text/x-fossil-wiki, ** text/x-markdown, or text/plain, defauling to the former. */ void wikiedit_page(void){ const char *zPageName; const char * zMimetype = P("mimetype"); int isSandbox; int found = 0; login_check_credentials(); zPageName = PD("name",""); if(zPageName && *zPageName){ if( check_name(zPageName) ) return; } isSandbox = is_sandbox(zPageName); if( isSandbox ){ if( !g.perm.WrWiki ){ login_needed(g.anon.WrWiki); return; } found = 1; }else if( zPageName!=0 ){ int rid = 0; if( !wiki_special_permission(zPageName) ){ login_needed(0); return; } found = wiki_fetch_by_name(zPageName, 0, &rid, 0); if( (rid && !g.perm.WrWiki) || (!rid && !g.perm.NewWiki) ){ login_needed(rid ? g.anon.WrWiki : g.anon.NewWiki); return; } } style_header("Wiki Editor"); /* Status bar */ CX("<div id='fossil-status-bar' " "title='Status message area. Double-click to clear them.'>" "Status messages will go here.</div>\n" /* will be moved into the tab container via JS */); CX("<div id='wikiedit-page-name'>Editing: <span>(no file loaded)</span></div>"); /* Main tab container... */ CX("<div id='wikiedit-tabs' class='tab-container'>Loading...</div>"); /* The .hidden class on the following tab elements is to help lessen the FOUC effect of the tabs before JS re-assembles them. */ /******* Page list *******/ { CX("<div id='wikiedit-tab-pages' " "data-tab-parent='wikiedit-tabs' " "data-tab-label='Wiki Page List' " "class='hidden'" ">"); CX("<div>Loading wiki pages list...</div>"); CX("</div>"/*#wikiedit-tab-pages*/); } /******* Content tab *******/ { CX("<div id='wikiedit-tab-content' " "data-tab-parent='wikiedit-tabs' " "data-tab-label='Editor' " "class='hidden'" ">"); CX("<div class='flex-container flex-row child-gap-small'>"); CX("<span class='input-with-label'>" "<label>Mime type</label>"); mimetype_option_menu(0); CX("</span>"); style_select_list_int("select-font-size", "editor_font_size", "Editor font size", NULL/*tooltip*/, 100, "100%", 100, "125%", 125, "150%", 150, "175%", 175, "200%", 200, NULL); CX("<button class='wikiedit-content-reload' " "title='Reload the file from the server, discarding " "any local edits. To help avoid accidental loss of " "edits, it requires confirmation (a second click) within " "a few seconds or it will not reload.'" ">Discard & Reload</button>"); CX("<button class='wikiedit-save' disabled='disabled'>" "Save</button>"/*will get moved around dynamically*/); CX("<span class='save-button-slot'></span>"); CX("</div>"); CX("<div class='flex-container flex-column stretch'>"); CX("<textarea name='content' id='wikiedit-content-editor' " "class='wikiedit' " "rows='25' cols='80'>"); CX("</textarea>"); CX("</div>"/*textarea wrapper*/); CX("</div>"/*#tab-file-content*/); } /****** Preview tab ******/ { CX("<div id='wikiedit-tab-preview' " "data-tab-parent='wikiedit-tabs' " "data-tab-label='Preview' " "class='hidden'" ">"); CX("<div class='wikiedit-options flex-container flex-row'>"); CX("<button id='btn-preview-refresh' " "data-f-preview-from='wikiContent' " /* ^^^ fossil.page[methodName]() OR text source elem ID, ** but we need a method in order to support clients swapping out ** the text editor with their own. */ "data-f-preview-via='_postPreview' " /* ^^^ fossil.page[methodName](content, callback) */ "data-f-preview-to='#wikiedit-tab-preview-wrapper' " /* ^^^ dest elem ID */ ">Refresh</button>"); /* Toggle auto-update of preview when the Preview tab is selected. */ style_labeled_checkbox("cb-preview-autoupdate", NULL, "Auto-refresh?", "1", 1, "If on, the preview will automatically " "refresh when this tab is selected."); CX("<span class='save-button-slot'></span>"); CX("</div>"/*.wikiedit-options*/); CX("<div id='wikiedit-tab-preview-wrapper'></div>"); CX("</div>"/*#wikiedit-tab-preview*/); } /****** Diff tab ******/ { CX("<div id='wikiedit-tab-diff' " "data-tab-parent='wikiedit-tabs' " "data-tab-label='Diff' " "class='hidden'" ">"); CX("<div class='wikiedit-options flex-container flex-row' " "id='wikiedit-tab-diff-buttons'>"); CX("<button class='sbs'>Side-by-side</button>" "<button class='unified'>Unified</button>"); CX("<span class='save-button-slot'></span>"); CX("</div>"); CX("<div id='wikiedit-tab-diff-wrapper'>" "Diffs will be shown here." "</div>"); CX("</div>"/*#wikiedit-tab-diff*/); } /****** The obligatory "Misc" tab ******/ { CX("<div id='wikiedit-tab-misc' " "data-tab-parent='wikiedit-tabs' " "data-tab-label='Help, Attachments, etc.' " "class='hidden'" ">"); CX("<h3>Wiki formatting rules</h3>"); CX("<ul>"); CX("<li><a href='%R/wiki_rules'>Fossil wiki format</a></li>"); CX("<li><a href='%R/md_rules'>Markdown format</a></li>"); CX("<li>Plain-text pages use no special formatting.</li>"); CX("</ul>"); CX("<hr><h3>Attachments</h3>"); CX("<div id='wikiedit-attachments'></div>" /* Filled out by JS */); CX("<hr><h3>The \"Sandbox\" Page</h3>"); CX("<p>The page named \"Sandbox\" is not a real wiki page. " "It provides a place where users may test out wiki syntax " "without having to actually save anything, nor pollute " "the repo with endless test runs. Any attempt to save the " "sandbox page will fail.</p>"); CX("<hr><h3>Wiki Name Rules</h3>"); well_formed_wiki_name_rules(); CX("</div>"/*#wikiedit-tab-save*/); } builtin_request_js("sbsdiff.js"); style_emit_fossil_js_apis(0, "fetch", "dom", "tabs", "confirmer", "storage", "page.wikiedit", 0); builtin_fulfill_js_requests(); /* Dynamically populate the editor... */ style_emit_script_tag(0,0); CX("\nfossil.onPageLoad(function(){\n"); CX("const P = fossil.page;\n" "try{\n"); if(!found && zPageName && *zPageName){ /* For a new page, stick a dummy entry in the JS-side stash and "load" it from there. */ CX("const winfo = {" "\"name\": %!j, \"mimetype\": %!j, " "\"type\": %!j, " "\"parent\": null, \"version\": null" "};\n", zPageName, zMimetype ? zMimetype : "text/x-fossil-wiki", wiki_page_type_name(zPageName)); /* If the JS-side stash already has this page, load that copy from the stash, otherwise inject a new stash entry for it and load *that* one... */ CX("if(!P.$stash.getWinfo(winfo)){" "P.$stash.updateWinfo(winfo,'');" "}\n"); } if(zPageName && *zPageName){ CX("P.loadPage(%!j);\n", zPageName); } CX("}catch(e){" "fossil.error(e); console.error('Exception:',e);" "}\n"); CX("});\n"/*fossil.onPageLoad()*/); style_emit_script_tag(1,0); style_footer(); } /* ** WEBPAGE: wikinew ** URL /wikinew ** |
︙ | ︙ | |||
849 850 851 852 853 854 855 | if( !g.perm.NewWiki ){ login_needed(g.anon.NewWiki); return; } zName = PD("name",""); zMimetype = wiki_filter_mimetypes(P("mimetype")); if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){ | < < < < < | < | 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 | if( !g.perm.NewWiki ){ login_needed(g.anon.NewWiki); return; } zName = PD("name",""); zMimetype = wiki_filter_mimetypes(P("mimetype")); if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){ cgi_redirectf("wikiedit?name=%T&mimetype=%s", zName, zMimetype); } style_header("Create A New Wiki Page"); wiki_standard_submenu(W_ALL_BUT(W_NEW)); @ <p>Rules for wiki page names:</p> well_formed_wiki_name_rules(); form_begin(0, "%R/wikinew"); @ <p>Name of new wiki page: |
︙ | ︙ | |||
1439 1440 1441 1442 1443 1444 1445 | ** ** Options: ** -M|--mimetype TEXT-FORMAT The mime type of the update. ** Defaults to the type used by ** the previous version of the ** page, or text/x-fossil-wiki. ** Valid values are: text/x-fossil-wiki, | | | 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 | ** ** Options: ** -M|--mimetype TEXT-FORMAT The mime type of the update. ** Defaults to the type used by ** the previous version of the ** page, or text/x-fossil-wiki. ** Valid values are: text/x-fossil-wiki, ** text/x-markdown and text/plain. fossil, ** markdown or plain can be specified as ** synonyms of these values. ** -t|--technote DATETIME Specifies the timestamp of ** the technote to be created or ** updated. When updating a tech note ** the most recently modified tech note ** with the specified timestamp will be |
︙ | ︙ |
Deleted src/wysiwyg.c.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to win/Makefile.dmc.
︙ | ︙ | |||
26 27 28 29 30 31 32 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | | | | | 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 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O RC=$(DMDIR)\bin\rcc RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ APPNAME = $(OBJDIR)\fossil$(E) all: $(APPNAME) $(APPNAME) : translate$E mkindex$E codecheck1$E headers $(OBJ) $(OBJDIR)\link cd $(OBJDIR) codecheck1$E $(SRC) $(DMDIR)\bin\link @link $(OBJDIR)\fossil.res: $B\win\fossil.rc $(RC) $(RCFLAGS) -o$@ $** $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res +echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@ +echo fossil >> $@ +echo fossil >> $@ +echo $(LIBS) >> $@ +echo. >> $@ +echo fossil >> $@ translate$E: $(SRCDIR)\translate.c |
︙ | ︙ | |||
960 961 962 963 964 965 966 | $(OBJDIR)\winhttp$O : winhttp_.c winhttp.h $(TCC) -o$@ -c winhttp_.c winhttp_.c : $(SRCDIR)\winhttp.c +translate$E $** > $@ | < < < < < < | | 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 | $(OBJDIR)\winhttp$O : winhttp_.c winhttp.h $(TCC) -o$@ -c winhttp_.c winhttp_.c : $(SRCDIR)\winhttp.c +translate$E $** > $@ $(OBJDIR)\xfer$O : xfer_.c xfer.h $(TCC) -o$@ -c xfer_.c xfer_.c : $(SRCDIR)\xfer.c +translate$E $** > $@ $(OBJDIR)\xfersetup$O : xfersetup_.c xfersetup.h $(TCC) -o$@ -c xfersetup_.c xfersetup_.c : $(SRCDIR)\xfersetup.c +translate$E $** > $@ $(OBJDIR)\zip$O : zip_.c zip.h $(TCC) -o$@ -c zip_.c zip_.c : $(SRCDIR)\zip.c +translate$E $** > $@ headers: makeheaders$E page_index.h builtin_data.h VERSION.h +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h @copy /Y nul: headers |
Changes to win/Makefile.mingw.
︙ | ︙ | |||
564 565 566 567 568 569 570 | $(SRCDIR)/verify.c \ $(SRCDIR)/vfile.c \ $(SRCDIR)/webmail.c \ $(SRCDIR)/wiki.c \ $(SRCDIR)/wikiformat.c \ $(SRCDIR)/winfile.c \ $(SRCDIR)/winhttp.c \ | < | 564 565 566 567 568 569 570 571 572 573 574 575 576 577 | $(SRCDIR)/verify.c \ $(SRCDIR)/vfile.c \ $(SRCDIR)/webmail.c \ $(SRCDIR)/wiki.c \ $(SRCDIR)/wikiformat.c \ $(SRCDIR)/winfile.c \ $(SRCDIR)/winhttp.c \ $(SRCDIR)/xfer.c \ $(SRCDIR)/xfersetup.c \ $(SRCDIR)/zip.c EXTRA_FILES = \ $(SRCDIR)/../skins/aht/details.txt \ $(SRCDIR)/../skins/ardoise/css.txt \ |
︙ | ︙ | |||
638 639 640 641 642 643 644 645 646 647 648 649 650 651 | $(SRCDIR)/forum.js \ $(SRCDIR)/fossil.bootstrap.js \ $(SRCDIR)/fossil.confirmer.js \ $(SRCDIR)/fossil.dom.js \ $(SRCDIR)/fossil.fetch.js \ $(SRCDIR)/fossil.page.fileedit.js \ $(SRCDIR)/fossil.page.forumpost.js \ $(SRCDIR)/fossil.storage.js \ $(SRCDIR)/fossil.tabs.js \ $(SRCDIR)/graph.js \ $(SRCDIR)/href.js \ $(SRCDIR)/login.js \ $(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \ | > | 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 | $(SRCDIR)/forum.js \ $(SRCDIR)/fossil.bootstrap.js \ $(SRCDIR)/fossil.confirmer.js \ $(SRCDIR)/fossil.dom.js \ $(SRCDIR)/fossil.fetch.js \ $(SRCDIR)/fossil.page.fileedit.js \ $(SRCDIR)/fossil.page.forumpost.js \ $(SRCDIR)/fossil.page.wikiedit.js \ $(SRCDIR)/fossil.storage.js \ $(SRCDIR)/fossil.tabs.js \ $(SRCDIR)/graph.js \ $(SRCDIR)/href.js \ $(SRCDIR)/login.js \ $(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \ |
︙ | ︙ | |||
667 668 669 670 671 672 673 674 675 676 677 678 679 680 | $(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)/tree.js \ $(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \ $(OBJDIR)/add_.c \ $(OBJDIR)/ajax_.c \ | > | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 | $(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 = \ $(OBJDIR)/add_.c \ $(OBJDIR)/ajax_.c \ |
︙ | ︙ | |||
812 813 814 815 816 817 818 | $(OBJDIR)/verify_.c \ $(OBJDIR)/vfile_.c \ $(OBJDIR)/webmail_.c \ $(OBJDIR)/wiki_.c \ $(OBJDIR)/wikiformat_.c \ $(OBJDIR)/winfile_.c \ $(OBJDIR)/winhttp_.c \ | < | 813 814 815 816 817 818 819 820 821 822 823 824 825 826 | $(OBJDIR)/verify_.c \ $(OBJDIR)/vfile_.c \ $(OBJDIR)/webmail_.c \ $(OBJDIR)/wiki_.c \ $(OBJDIR)/wikiformat_.c \ $(OBJDIR)/winfile_.c \ $(OBJDIR)/winhttp_.c \ $(OBJDIR)/xfer_.c \ $(OBJDIR)/xfersetup_.c \ $(OBJDIR)/zip_.c OBJ = \ $(OBJDIR)/add.o \ $(OBJDIR)/ajax.o \ |
︙ | ︙ | |||
958 959 960 961 962 963 964 | $(OBJDIR)/verify.o \ $(OBJDIR)/vfile.o \ $(OBJDIR)/webmail.o \ $(OBJDIR)/wiki.o \ $(OBJDIR)/wikiformat.o \ $(OBJDIR)/winfile.o \ $(OBJDIR)/winhttp.o \ | < | 958 959 960 961 962 963 964 965 966 967 968 969 970 971 | $(OBJDIR)/verify.o \ $(OBJDIR)/vfile.o \ $(OBJDIR)/webmail.o \ $(OBJDIR)/wiki.o \ $(OBJDIR)/wikiformat.o \ $(OBJDIR)/winfile.o \ $(OBJDIR)/winhttp.o \ $(OBJDIR)/xfer.o \ $(OBJDIR)/xfersetup.o \ $(OBJDIR)/zip.o APPNAME = fossil.exe APPTARGETS = |
︙ | ︙ | |||
1319 1320 1321 1322 1323 1324 1325 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ | < | 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \ $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \ $(SRCDIR)/sqlite3.h \ $(SRCDIR)/th.h \ $(OBJDIR)/VERSION.h echo Done >$(OBJDIR)/headers |
︙ | ︙ | |||
2452 2453 2454 2455 2456 2457 2458 | $(TRANSLATE) $(SRCDIR)/winhttp.c >$@ $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h: $(OBJDIR)/headers | < < < < < < < < | 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 | $(TRANSLATE) $(SRCDIR)/winhttp.c >$@ $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h: $(OBJDIR)/headers $(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(TRANSLATE) $(TRANSLATE) $(SRCDIR)/xfer.c >$@ $(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h: $(OBJDIR)/headers |
︙ | ︙ |
Changes to win/Makefile.msc.
︙ | ︙ | |||
486 487 488 489 490 491 492 | "$(OX)\verify_.c" \ "$(OX)\vfile_.c" \ "$(OX)\webmail_.c" \ "$(OX)\wiki_.c" \ "$(OX)\wikiformat_.c" \ "$(OX)\winfile_.c" \ "$(OX)\winhttp_.c" \ | < | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 | "$(OX)\verify_.c" \ "$(OX)\vfile_.c" \ "$(OX)\webmail_.c" \ "$(OX)\wiki_.c" \ "$(OX)\wikiformat_.c" \ "$(OX)\winfile_.c" \ "$(OX)\winhttp_.c" \ "$(OX)\xfer_.c" \ "$(OX)\xfersetup_.c" \ "$(OX)\zip_.c" EXTRA_FILES = "$(SRCDIR)\..\skins\aht\details.txt" \ "$(SRCDIR)\..\skins\ardoise\css.txt" \ "$(SRCDIR)\..\skins\ardoise\details.txt" \ |
︙ | ︙ | |||
559 560 561 562 563 564 565 566 567 568 569 570 571 572 | "$(SRCDIR)\forum.js" \ "$(SRCDIR)\fossil.bootstrap.js" \ "$(SRCDIR)\fossil.confirmer.js" \ "$(SRCDIR)\fossil.dom.js" \ "$(SRCDIR)\fossil.fetch.js" \ "$(SRCDIR)\fossil.page.fileedit.js" \ "$(SRCDIR)\fossil.page.forumpost.js" \ "$(SRCDIR)\fossil.storage.js" \ "$(SRCDIR)\fossil.tabs.js" \ "$(SRCDIR)\graph.js" \ "$(SRCDIR)\href.js" \ "$(SRCDIR)\login.js" \ "$(SRCDIR)\markdown.md" \ "$(SRCDIR)\menu.js" \ | > | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 | "$(SRCDIR)\forum.js" \ "$(SRCDIR)\fossil.bootstrap.js" \ "$(SRCDIR)\fossil.confirmer.js" \ "$(SRCDIR)\fossil.dom.js" \ "$(SRCDIR)\fossil.fetch.js" \ "$(SRCDIR)\fossil.page.fileedit.js" \ "$(SRCDIR)\fossil.page.forumpost.js" \ "$(SRCDIR)\fossil.page.wikiedit.js" \ "$(SRCDIR)\fossil.storage.js" \ "$(SRCDIR)\fossil.tabs.js" \ "$(SRCDIR)\graph.js" \ "$(SRCDIR)\href.js" \ "$(SRCDIR)\login.js" \ "$(SRCDIR)\markdown.md" \ "$(SRCDIR)\menu.js" \ |
︙ | ︙ | |||
588 589 590 591 592 593 594 595 596 597 598 599 600 601 | "$(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)\tree.js" \ "$(SRCDIR)\useredit.js" \ "$(SRCDIR)\wiki.wiki" OBJ = "$(OX)\add$O" \ "$(OX)\ajax$O" \ "$(OX)\alerts$O" \ | > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 | "$(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" \ "$(OX)\ajax$O" \ "$(OX)\alerts$O" \ |
︙ | ︙ | |||
738 739 740 741 742 743 744 | "$(OX)\verify$O" \ "$(OX)\vfile$O" \ "$(OX)\webmail$O" \ "$(OX)\wiki$O" \ "$(OX)\wikiformat$O" \ "$(OX)\winfile$O" \ "$(OX)\winhttp$O" \ | < | 739 740 741 742 743 744 745 746 747 748 749 750 751 752 | "$(OX)\verify$O" \ "$(OX)\vfile$O" \ "$(OX)\webmail$O" \ "$(OX)\wiki$O" \ "$(OX)\wikiformat$O" \ "$(OX)\winfile$O" \ "$(OX)\winhttp$O" \ "$(OX)\xfer$O" \ "$(OX)\xfersetup$O" \ "$(OX)\zip$O" \ !if $(FOSSIL_ENABLE_MINIZ)!=0 "$(OX)\miniz$O" \ !endif "$(OX)\fossil.res" |
︙ | ︙ | |||
965 966 967 968 969 970 971 | echo "$(OX)\verify.obj" >> $@ echo "$(OX)\vfile.obj" >> $@ echo "$(OX)\webmail.obj" >> $@ echo "$(OX)\wiki.obj" >> $@ echo "$(OX)\wikiformat.obj" >> $@ echo "$(OX)\winfile.obj" >> $@ echo "$(OX)\winhttp.obj" >> $@ | < | 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | echo "$(OX)\verify.obj" >> $@ echo "$(OX)\vfile.obj" >> $@ echo "$(OX)\webmail.obj" >> $@ echo "$(OX)\wiki.obj" >> $@ echo "$(OX)\wikiformat.obj" >> $@ echo "$(OX)\winfile.obj" >> $@ echo "$(OX)\winhttp.obj" >> $@ echo "$(OX)\xfer.obj" >> $@ echo "$(OX)\xfersetup.obj" >> $@ echo "$(OX)\zip.obj" >> $@ !if $(FOSSIL_ENABLE_MINIZ)!=0 echo "$(OX)\miniz.obj" >> $@ !endif echo $(LIBS) >> $@ |
︙ | ︙ | |||
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | echo "$(SRCDIR)\forum.js" >> $@ echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ echo "$(SRCDIR)\fossil.confirmer.js" >> $@ echo "$(SRCDIR)\fossil.dom.js" >> $@ echo "$(SRCDIR)\fossil.fetch.js" >> $@ echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ echo "$(SRCDIR)\fossil.storage.js" >> $@ echo "$(SRCDIR)\fossil.tabs.js" >> $@ echo "$(SRCDIR)\graph.js" >> $@ echo "$(SRCDIR)\href.js" >> $@ echo "$(SRCDIR)\login.js" >> $@ echo "$(SRCDIR)\markdown.md" >> $@ echo "$(SRCDIR)\menu.js" >> $@ | > | 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | echo "$(SRCDIR)\forum.js" >> $@ echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ echo "$(SRCDIR)\fossil.confirmer.js" >> $@ echo "$(SRCDIR)\fossil.dom.js" >> $@ echo "$(SRCDIR)\fossil.fetch.js" >> $@ echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@ echo "$(SRCDIR)\fossil.storage.js" >> $@ echo "$(SRCDIR)\fossil.tabs.js" >> $@ echo "$(SRCDIR)\graph.js" >> $@ echo "$(SRCDIR)\href.js" >> $@ echo "$(SRCDIR)\login.js" >> $@ echo "$(SRCDIR)\markdown.md" >> $@ echo "$(SRCDIR)\menu.js" >> $@ |
︙ | ︙ | |||
1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 | 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)\tree.js" >> $@ echo "$(SRCDIR)\useredit.js" >> $@ echo "$(SRCDIR)\wiki.wiki" >> $@ "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add_.c" | > | 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | 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" $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add_.c" |
︙ | ︙ | |||
2026 2027 2028 2029 2030 2031 2032 | "$(OX)\winhttp$O" : "$(OX)\winhttp_.c" "$(OX)\winhttp.h" $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp_.c" "$(OX)\winhttp_.c" : "$(SRCDIR)\winhttp.c" "$(OBJDIR)\translate$E" $** > $@ | < < < < < < | 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 | "$(OX)\winhttp$O" : "$(OX)\winhttp_.c" "$(OX)\winhttp.h" $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp_.c" "$(OX)\winhttp_.c" : "$(SRCDIR)\winhttp.c" "$(OBJDIR)\translate$E" $** > $@ "$(OX)\xfer$O" : "$(OX)\xfer_.c" "$(OX)\xfer.h" $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer_.c" "$(OX)\xfer_.c" : "$(SRCDIR)\xfer.c" "$(OBJDIR)\translate$E" $** > $@ "$(OX)\xfersetup$O" : "$(OX)\xfersetup_.c" "$(OX)\xfersetup.h" |
︙ | ︙ | |||
2194 2195 2196 2197 2198 2199 2200 | "$(OX)\verify_.c":"$(OX)\verify.h" \ "$(OX)\vfile_.c":"$(OX)\vfile.h" \ "$(OX)\webmail_.c":"$(OX)\webmail.h" \ "$(OX)\wiki_.c":"$(OX)\wiki.h" \ "$(OX)\wikiformat_.c":"$(OX)\wikiformat.h" \ "$(OX)\winfile_.c":"$(OX)\winfile.h" \ "$(OX)\winhttp_.c":"$(OX)\winhttp.h" \ | < | 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 | "$(OX)\verify_.c":"$(OX)\verify.h" \ "$(OX)\vfile_.c":"$(OX)\vfile.h" \ "$(OX)\webmail_.c":"$(OX)\webmail.h" \ "$(OX)\wiki_.c":"$(OX)\wiki.h" \ "$(OX)\wikiformat_.c":"$(OX)\wikiformat.h" \ "$(OX)\winfile_.c":"$(OX)\winfile.h" \ "$(OX)\winhttp_.c":"$(OX)\winhttp.h" \ "$(OX)\xfer_.c":"$(OX)\xfer.h" \ "$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \ "$(OX)\zip_.c":"$(OX)\zip.h" \ "$(SRCDIR)\sqlite3.h" \ "$(SRCDIR)\th.h" \ "$(OX)\VERSION.h" \ "$(SRCDIR)\cson_amalgamation.h" @copy /Y nul: $@ |
Changes to www/changes.wiki.
︙ | ︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 | the 2.11 release. * Update the built-in SQLite so that the "[/help?cmd=sql|fossil sql]" command supports new output modes ".mode box" and ".mode json". * Add the "<tt>obscure()</tt>" SQL function to the "[/help?cmd=sql|fossil sql]" command. * [./delta_format.wiki|Delta compression] is now applied to forum edits. * Countless documentation enhancements. <a name='v2_11'></a> <h2>Changes for Version 2.11 (2020-05-25)</h2> * Support [/md_rules|Markdown] in the default ticket configuration. * Timestamp strings in [./checkin_names.wiki|object names] | > > > > > > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | the 2.11 release. * Update the built-in SQLite so that the "[/help?cmd=sql|fossil sql]" command supports new output modes ".mode box" and ".mode json". * Add the "<tt>obscure()</tt>" SQL function to the "[/help?cmd=sql|fossil sql]" command. * [./delta_format.wiki|Delta compression] is now applied to forum edits. * The [/help?cmd=/wikiedit|wiki editor] has been modernized and is now Ajax-based. The WYSIWYG editing option for Fossil-format wiki pages was removed. (Please let us know, via the site's Support menu, if that removal unduly impacts you.) This also changes the semantics of the wiki "Sandbox": that pseudo-page may be freely edited but no longer saved via the UI. * Countless documentation enhancements. <a name='v2_11'></a> <h2>Changes for Version 2.11 (2020-05-25)</h2> * Support [/md_rules|Markdown] in the default ticket configuration. * Timestamp strings in [./checkin_names.wiki|object names] |
︙ | ︙ |