wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Make regex more lenient. Nest redirect logic.

Browse Source
This commit is contained in:
Bart Kamphorst
2019-10-07 11:22:00 +02:00
parent 7458e396ee
commit 5487563a71
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/public/gollum/javascript/gollum.js.erb
+5 -5
View File
@@ -154,10 +154,6 @@ $(document).ready(function() {
} }
} }
if (match = new RegExp(/\?redirected\_from=([^?]*)/).exec(window.location.href)) {
notice = "The page you requested was renamed or moved. You've been successfully redirected to its new location.";
flashNotice('success', notice);
}
if ($('#minibutton-upload-page').length) { if ($('#minibutton-upload-page').length) {
new ClipboardJS('#ClipboardJSlink'); new ClipboardJS('#ClipboardJSlink');
@@ -611,7 +607,11 @@ $(document).ready(function() {
if($('.markdown-body').length ){ if($('.markdown-body').length ){
// Set text direction (LTR or RTL) // Set text direction (LTR or RTL)
preparePage(); preparePage();
// Check if there was a redirect here
if (match = new RegExp(/[?&]redirected\_from=([^?]*)/).exec(window.location.href)) {
notice = "The page you requested was renamed or moved. You've been successfully redirected to its new location.";
flashNotice('success', notice);
}
// Set the 'e' hotkey for editing pages. // Set the 'e' hotkey for editing pages.
Mousetrap.bind(['e'], function( e ) { Mousetrap.bind(['e'], function( e ) {
e.preventDefault(); e.preventDefault();