scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #372 from okriuchykhin/ok_SCI_816

Browse source 
Fix flash message display in samples table [SCI-816]
This commit is contained in:
okriuchykhin 2016-12-30 15:30:14 +01:00 • committed by GitHub
commit 73478d7b5e
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/application.js.erb
View file

@ -193,9 +193,11 @@ function notificationAlertClose(){
.removeClass("alert-shown"); .removeClass("alert-shown");
}); });
} }
(function(){ var HelperModule = (function(){
function tree_link_truncation() { var helpers = {};
helpers.treeLinkTruncation = function() {
$('.tree-link a').each( function(){ $('.tree-link a').each( function(){
truncateLongString( $(this), <%= Constants::NAME_TRUNCATION_LENGTH %>); truncateLongString( $(this), <%= Constants::NAME_TRUNCATION_LENGTH %>);
}); });
@ -204,21 +206,22 @@ function notificationAlertClose(){
}); });
} }
function hide_flash_msg() { helpers.hideFlashMsg = function() {
var flash = $('.alert'); var flash = $('.alert');
if (flash.length > 0) { if (flash.length > 0) {
window.setTimeout(function () { window.setTimeout(function () {
flash.fadeTo(500, 0).slideUp(500, function () { flash.fadeTo(500, 0).slideUp(500, function () {
$(this).remove(); $(this).remove();
$('#content-wrapper') $('#content-wrapper').removeClass('alert-shown');
.css('marginTop', '50px');
}); });
}, 5000); }, 5000);
} }
} }
$( document ).ready(function() { $( document ).ready(function() {
tree_link_truncation(); helpers.treeLinkTruncation();
hide_flash_msg(); helpers.hideFlashMsg();
}); });
return helpers;
})(); })();

1
app/assets/javascripts/samples/sample_datatable.js.erb
View file

@ -500,6 +500,7 @@ function onClickSave() {
data: data, data: data,
success: function (data) { success: function (data) {
sampleAlertMsg(data.flash, "success"); sampleAlertMsg(data.flash, "success");
HelperModule.hideFlashMsg();
onClickCancel(); onClickCancel();
}, },
error: function (e, eData, status, xhr) { error: function (e, eData, status, xhr) {