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

Merge pull request #1436 from gollum/upload_notices

Browse Source 
Show flashNotice instead of JS alert for (un)successful uploads.
This commit is contained in:
Bart Kamphorst
2019-10-09 18:56:01 +02:00
committed by GitHub
parent 9862c51e3f 70ede99545
commit c619920452
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/public/gollum/javascript/gollum.js.erb
+12 -4
View File
@@ -102,10 +102,17 @@ function preparePage () {
} }
} }
function flashNotice(type, notice) { function flashNotice(type, notice, button_label, button_function, button_type) {
// accepted types: info, success, warn, error // accepted types: info, success, warn, error
html = '<p><div class="flash flash-' + type +'"><button class="flash-close js-flash-close" type="button" onclick="parentNode.remove()"><%=rocticon('x')%></button>' + notice + '</div></p>'; nested_button_html = '';
if (typeof(button_label) !== 'undefined' && typeof(button_function) !== 'undefined') {
button_type = (typeof(button_type) !== 'undefined' && button_type == 'danger') ? ' btn-danger' : '';
nested_button_html = '<span class="px-2"><button type="button" class="btn btn-sm' + button_type + '" onclick="' + button_function + '">' + button_label + '</button></span>'
}
html = '<p><div id="gollum-flash" class="flash flash-' + type +'"><button class="flash-close js-flash-close" type="button" onclick="parentNode.remove()"><%=rocticon('x')%></button>' + notice + nested_button_html + '</div></p>';
$('#gollum-flash').remove();
$('#wiki-content h1').before(html); $('#wiki-content h1').before(html);
if (type == 'success') { setTimeout(function() {$('#gollum-flash').fadeOut();}, 5000); }
} }
// ua // ua
@@ -184,13 +191,14 @@ $(document).ready(function() {
success: function(data) { success: function(data) {
// File successfully uploaded // File successfully uploaded
$('#wiki-content').removeClass('uploading'); $('#wiki-content').removeClass('uploading');
flashNotice("success", "Your file was successfully uploaded.", "foobar", "alert('flash!')");
}, },
error: function(data, textStatus, errorThrown) { error: function(data, textStatus, errorThrown) {
$('#wiki-content').removeClass('uploading'); $('#wiki-content').removeClass('uploading');
if (data.status == 409) { if (data.status == 409) {
alert('This file already exists.'); flashNotice('error', 'The file you tried to upload already exists. Please rename the file and try again.');
} else { } else {
alert('Error uploading file: ' + textStatus + ' ' + errorThrown); flashNotice('error', 'Error uploading file: ' + textStatus + ' ' + errorThrown);
} }
} }
}); });