Fossil SCM
Do not override base href for wiki pages. This needs testing.
Commit
89dd34519f454333d777bf8d93cf858241b4702e4184bf5a8dcb4a186332199d
Parent
288fe34ced9099e…
2 files changed
+8
-2
+8
-2
+8
-2
| --- src/fossil.page.wikiedit.js | ||
| +++ src/fossil.page.wikiedit.js | ||
| @@ -883,11 +883,14 @@ | ||
| 883 | 883 | btnSlot.parentNode.insertBefore( P.e.btnSave.parentNode, btnSlot ); |
| 884 | 884 | btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot ); |
| 885 | 885 | P.updateSaveButton(); |
| 886 | 886 | } |
| 887 | 887 | if(theTab===P.e.tabs.preview){ |
| 888 | - P.baseHrefForWiki(); | |
| 888 | + | |
| 889 | + /* FIXME: P.baseHrefForWiki(); | |
| 890 | + ** Overriding of base href disabled as part of 'base-href-fix' branch | |
| 891 | + */ | |
| 889 | 892 | if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview(); |
| 890 | 893 | }else if(theTab===P.e.tabs.diff){ |
| 891 | 894 | /* Work around a weird bug where the page gets wider than |
| 892 | 895 | the window when the diff tab is NOT in view and the |
| 893 | 896 | current SBS diff widget is wider than the window. When |
| @@ -903,11 +906,14 @@ | ||
| 903 | 906 | P.tabs.addEventListener( |
| 904 | 907 | /* Set up auto-refresh of the preview tab... */ |
| 905 | 908 | 'before-switch-from', function(ev){ |
| 906 | 909 | const theTab = ev.detail; |
| 907 | 910 | if(theTab===P.e.tabs.preview){ |
| 908 | - P.baseHrefRestore(); | |
| 911 | + | |
| 912 | + /* FIXME: P.baseHrefRestore(); | |
| 913 | + ** Overriding of base href disabled as part of 'base-href-fix' branch | |
| 914 | + */ | |
| 909 | 915 | }else if(theTab===P.e.tabs.diff){ |
| 910 | 916 | /* See notes in the before-switch-to handler. */ |
| 911 | 917 | D.addClass(P.e.diffTarget, 'hidden'); |
| 912 | 918 | } |
| 913 | 919 | } |
| 914 | 920 |
| --- src/fossil.page.wikiedit.js | |
| +++ src/fossil.page.wikiedit.js | |
| @@ -883,11 +883,14 @@ | |
| 883 | btnSlot.parentNode.insertBefore( P.e.btnSave.parentNode, btnSlot ); |
| 884 | btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot ); |
| 885 | P.updateSaveButton(); |
| 886 | } |
| 887 | if(theTab===P.e.tabs.preview){ |
| 888 | P.baseHrefForWiki(); |
| 889 | if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview(); |
| 890 | }else if(theTab===P.e.tabs.diff){ |
| 891 | /* Work around a weird bug where the page gets wider than |
| 892 | the window when the diff tab is NOT in view and the |
| 893 | current SBS diff widget is wider than the window. When |
| @@ -903,11 +906,14 @@ | |
| 903 | P.tabs.addEventListener( |
| 904 | /* Set up auto-refresh of the preview tab... */ |
| 905 | 'before-switch-from', function(ev){ |
| 906 | const theTab = ev.detail; |
| 907 | if(theTab===P.e.tabs.preview){ |
| 908 | P.baseHrefRestore(); |
| 909 | }else if(theTab===P.e.tabs.diff){ |
| 910 | /* See notes in the before-switch-to handler. */ |
| 911 | D.addClass(P.e.diffTarget, 'hidden'); |
| 912 | } |
| 913 | } |
| 914 |
| --- src/fossil.page.wikiedit.js | |
| +++ src/fossil.page.wikiedit.js | |
| @@ -883,11 +883,14 @@ | |
| 883 | btnSlot.parentNode.insertBefore( P.e.btnSave.parentNode, btnSlot ); |
| 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 |
| 896 | current SBS diff widget is wider than the window. When |
| @@ -903,11 +906,14 @@ | |
| 906 | P.tabs.addEventListener( |
| 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 | } |
| 920 |
+8
-2
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -597,11 +597,14 @@ | ||
| 597 | 597 | style_submenu_element("History", "%R/whistory?name=%T", zPageName); |
| 598 | 598 | } |
| 599 | 599 | } |
| 600 | 600 | if( !isPopup ){ |
| 601 | 601 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 602 | - style_set_base_href_suffix("%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 | + */ | |
| 603 | 606 | wiki_page_header(WIKITYPE_UNKNOWN, zPageName, ""); |
| 604 | 607 | if( !noSubmenu ){ |
| 605 | 608 | wiki_standard_submenu(submenuFlags); |
| 606 | 609 | } |
| 607 | 610 | } |
| @@ -1670,11 +1673,14 @@ | ||
| 1670 | 1673 | manifest_destroy(pWiki); |
| 1671 | 1674 | cgi_redirectf("wiki?name=%T", zPageName); |
| 1672 | 1675 | return; |
| 1673 | 1676 | } |
| 1674 | 1677 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 1675 | - style_set_base_href_suffix("%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 | + */ | |
| 1676 | 1682 | style_set_current_feature("wiki"); |
| 1677 | 1683 | style_header("Append Comment To: %s", zPageName); |
| 1678 | 1684 | if( !goodCaptcha ){ |
| 1679 | 1685 | @ <p class="generalError">Error: Incorrect security code.</p> |
| 1680 | 1686 | } |
| 1681 | 1687 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -597,11 +597,14 @@ | |
| 597 | style_submenu_element("History", "%R/whistory?name=%T", zPageName); |
| 598 | } |
| 599 | } |
| 600 | if( !isPopup ){ |
| 601 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 602 | style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName); |
| 603 | wiki_page_header(WIKITYPE_UNKNOWN, zPageName, ""); |
| 604 | if( !noSubmenu ){ |
| 605 | wiki_standard_submenu(submenuFlags); |
| 606 | } |
| 607 | } |
| @@ -1670,11 +1673,14 @@ | |
| 1670 | manifest_destroy(pWiki); |
| 1671 | cgi_redirectf("wiki?name=%T", zPageName); |
| 1672 | return; |
| 1673 | } |
| 1674 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 1675 | style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName); |
| 1676 | style_set_current_feature("wiki"); |
| 1677 | style_header("Append Comment To: %s", zPageName); |
| 1678 | if( !goodCaptcha ){ |
| 1679 | @ <p class="generalError">Error: Incorrect security code.</p> |
| 1680 | } |
| 1681 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -597,11 +597,14 @@ | |
| 597 | style_submenu_element("History", "%R/whistory?name=%T", zPageName); |
| 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 | } |
| 610 | } |
| @@ -1670,11 +1673,14 @@ | |
| 1673 | manifest_destroy(pWiki); |
| 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 | } |
| 1687 |