Fossil SCM

FIXME-comments in the code did not indicate issues and are now rephrased to be mere reminders.

george 2022-02-15 21:35 UTC base-href-fix
Commit d253ece08a07b8b2877451a47e974237c5cd283eb56de831f81b4bdb31b051ce
Parent 89dd34519f45433…
3 files changed +2 -2 +6 -4 +6 -4
~ src/extcgi.c ~ src/fossil.page.wikiedit.js ~ src/wiki.c
M src/extcgi.c
+2 -2
--- src/extcgi.c
+++ src/extcgi.c
@@ -229,12 +229,12 @@
229229
 goto ext_not_found;
230230
 }
231231
 assert( nScript>=nRoot+1 );
232232
 style_set_current_page("ext/%s", &zScript[nRoot+1]);
233233
234
- /* FIXME: a call to style_set_base_href_suffix() skipped
235
- * because we want #fragment links to work under /ext */
234
+ /* Overriding of base href disabled as part of 'base-href-fix' branch
235
+ ** otherwise #fragment links may break under /ext */
236236
237237
 zMime = mimetype_from_name(zScript);
238238
 if( zMime==0 ) zMime = "application/octet-stream";
239239
 if( !file_isexe(zScript, ExtFILE) ){
240240
 /* File is not executable. Must be a regular file. In that case,
241241
--- src/extcgi.c
+++ src/extcgi.c
@@ -229,12 +229,12 @@
229 goto ext_not_found;
230 }
231 assert( nScript>=nRoot+1 );
232 style_set_current_page("ext/%s", &zScript[nRoot+1]);
233
234 /* FIXME: a call to style_set_base_href_suffix() skipped
235 * because we want #fragment links to work under /ext */
236
237 zMime = mimetype_from_name(zScript);
238 if( zMime==0 ) zMime = "application/octet-stream";
239 if( !file_isexe(zScript, ExtFILE) ){
240 /* File is not executable. Must be a regular file. In that case,
241
--- src/extcgi.c
+++ src/extcgi.c
@@ -229,12 +229,12 @@
229 goto ext_not_found;
230 }
231 assert( nScript>=nRoot+1 );
232 style_set_current_page("ext/%s", &zScript[nRoot+1]);
233
234 /* Overriding of base href disabled as part of 'base-href-fix' branch
235 ** otherwise #fragment links may break under /ext */
236
237 zMime = mimetype_from_name(zScript);
238 if( zMime==0 ) zMime = "application/octet-stream";
239 if( !file_isexe(zScript, ExtFILE) ){
240 /* File is not executable. Must be a regular file. In that case,
241
M src/fossil.page.wikiedit.js
+6 -4
--- src/fossil.page.wikiedit.js
+++ src/fossil.page.wikiedit.js
@@ -884,12 +884,13 @@
884884
 btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot );
885885
 P.updateSaveButton();
886886
 }
887887
 if(theTab===P.e.tabs.preview){
888888
889
- /* FIXME: P.baseHrefForWiki();
890
- ** Overriding of base href disabled as part of 'base-href-fix' branch
889
+ /* Overriding of base href disabled as part of 'base-href-fix' branch
890
+ ** To bring back the old behavior uncomment the following call
891
+ ** P.baseHrefForWiki();
891892
 */
892893
 if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview();
893894
 }else if(theTab===P.e.tabs.diff){
894895
 /* Work around a weird bug where the page gets wider than
895896
 the window when the diff tab is NOT in view and the
@@ -907,12 +908,13 @@
907908
 /* Set up auto-refresh of the preview tab... */
908909
 'before-switch-from', function(ev){
909910
 const theTab = ev.detail;
910911
 if(theTab===P.e.tabs.preview){
911912
912
- /* FIXME: P.baseHrefRestore();
913
- ** Overriding of base href disabled as part of 'base-href-fix' branch
913
+ /* Overriding of base href disabled as part of 'base-href-fix' branch
914
+ ** To bring back the old behavior uncomment the following call
915
+ ** P.baseHrefRestore();
914916
 */
915917
 }else if(theTab===P.e.tabs.diff){
916918
 /* See notes in the before-switch-to handler. */
917919
 D.addClass(P.e.diffTarget, 'hidden');
918920
 }
919921
--- src/fossil.page.wikiedit.js
+++ src/fossil.page.wikiedit.js
@@ -884,12 +884,13 @@
884 btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot );
885 P.updateSaveButton();
886 }
887 if(theTab===P.e.tabs.preview){
888
889 /* FIXME: P.baseHrefForWiki();
890 ** Overriding of base href disabled as part of 'base-href-fix' branch
 
891 */
892 if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview();
893 }else if(theTab===P.e.tabs.diff){
894 /* Work around a weird bug where the page gets wider than
895 the window when the diff tab is NOT in view and the
@@ -907,12 +908,13 @@
907 /* Set up auto-refresh of the preview tab... */
908 'before-switch-from', function(ev){
909 const theTab = ev.detail;
910 if(theTab===P.e.tabs.preview){
911
912 /* FIXME: P.baseHrefRestore();
913 ** Overriding of base href disabled as part of 'base-href-fix' branch
 
914 */
915 }else if(theTab===P.e.tabs.diff){
916 /* See notes in the before-switch-to handler. */
917 D.addClass(P.e.diffTarget, 'hidden');
918 }
919
--- src/fossil.page.wikiedit.js
+++ src/fossil.page.wikiedit.js
@@ -884,12 +884,13 @@
884 btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot );
885 P.updateSaveButton();
886 }
887 if(theTab===P.e.tabs.preview){
888
889 /* Overriding of base href disabled as part of 'base-href-fix' branch
890 ** To bring back the old behavior uncomment the following call
891 ** P.baseHrefForWiki();
892 */
893 if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview();
894 }else if(theTab===P.e.tabs.diff){
895 /* Work around a weird bug where the page gets wider than
896 the window when the diff tab is NOT in view and the
@@ -907,12 +908,13 @@
908 /* Set up auto-refresh of the preview tab... */
909 'before-switch-from', function(ev){
910 const theTab = ev.detail;
911 if(theTab===P.e.tabs.preview){
912
913 /* Overriding of base href disabled as part of 'base-href-fix' branch
914 ** To bring back the old behavior uncomment the following call
915 ** P.baseHrefRestore();
916 */
917 }else if(theTab===P.e.tabs.diff){
918 /* See notes in the before-switch-to handler. */
919 D.addClass(P.e.diffTarget, 'hidden');
920 }
921
M src/wiki.c
+6 -4
--- src/wiki.c
+++ src/wiki.c
@@ -598,12 +598,13 @@
598598
 }
599599
 }
600600
 if( !isPopup ){
601601
 style_set_current_page("%T?name=%T", g.zPath, zPageName);
602602
603
- /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
604
- ** Overriding of base href disabled as part of 'base-href-fix' branch
603
+ /* Overriding of base href disabled as part of 'base-href-fix' branch
604
+ ** To bring back the old behavior uncomment the following call
605
+ ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
605606
 */
606607
 wiki_page_header(WIKITYPE_UNKNOWN, zPageName, "");
607608
 if( !noSubmenu ){
608609
 wiki_standard_submenu(submenuFlags);
609610
 }
@@ -1674,12 +1675,13 @@
16741675
 cgi_redirectf("wiki?name=%T", zPageName);
16751676
 return;
16761677
 }
16771678
 style_set_current_page("%T?name=%T", g.zPath, zPageName);
16781679
1679
- /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
1680
- ** Overriding of base href disabled as part of 'base-href-fix' branch
1680
+ /* Overriding of base href disabled as part of 'base-href-fix' branch
1681
+ ** To bring back the old behavior uncomment the following call
1682
+ ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
16811683
 */
16821684
 style_set_current_feature("wiki");
16831685
 style_header("Append Comment To: %s", zPageName);
16841686
 if( !goodCaptcha ){
16851687
 @ <p class="generalError">Error: Incorrect security code.</p>
16861688
--- src/wiki.c
+++ src/wiki.c
@@ -598,12 +598,13 @@
598 }
599 }
600 if( !isPopup ){
601 style_set_current_page("%T?name=%T", g.zPath, zPageName);
602
603 /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
604 ** Overriding of base href disabled as part of 'base-href-fix' branch
 
605 */
606 wiki_page_header(WIKITYPE_UNKNOWN, zPageName, "");
607 if( !noSubmenu ){
608 wiki_standard_submenu(submenuFlags);
609 }
@@ -1674,12 +1675,13 @@
1674 cgi_redirectf("wiki?name=%T", zPageName);
1675 return;
1676 }
1677 style_set_current_page("%T?name=%T", g.zPath, zPageName);
1678
1679 /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
1680 ** Overriding of base href disabled as part of 'base-href-fix' branch
 
1681 */
1682 style_set_current_feature("wiki");
1683 style_header("Append Comment To: %s", zPageName);
1684 if( !goodCaptcha ){
1685 @ <p class="generalError">Error: Incorrect security code.</p>
1686
--- src/wiki.c
+++ src/wiki.c
@@ -598,12 +598,13 @@
598 }
599 }
600 if( !isPopup ){
601 style_set_current_page("%T?name=%T", g.zPath, zPageName);
602
603 /* Overriding of base href disabled as part of 'base-href-fix' branch
604 ** To bring back the old behavior uncomment the following call
605 ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
606 */
607 wiki_page_header(WIKITYPE_UNKNOWN, zPageName, "");
608 if( !noSubmenu ){
609 wiki_standard_submenu(submenuFlags);
610 }
@@ -1674,12 +1675,13 @@
1675 cgi_redirectf("wiki?name=%T", zPageName);
1676 return;
1677 }
1678 style_set_current_page("%T?name=%T", g.zPath, zPageName);
1679
1680 /* Overriding of base href disabled as part of 'base-href-fix' branch
1681 ** To bring back the old behavior uncomment the following call
1682 ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
1683 */
1684 style_set_current_feature("wiki");
1685 style_header("Append Comment To: %s", zPageName);
1686 if( !goodCaptcha ){
1687 @ <p class="generalError">Error: Incorrect security code.</p>
1688

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button