YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Cleanup JS about flash messages and rebuild dist.

Browse source
This commit is contained in:
opi 2015-11-23 12:41:17 +01:00
parent 72b3454c66
commit 4708516000
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dist/js/script.min.js vendored
View file

File diff suppressed because one or more lines are too long

9
src/js/app.js
View file

@ -100,9 +100,9 @@ var app = Sammy('#main', function (sam) {
store.set('flash', true); store.set('flash', true);
} }
// Helper CSS class on main wrapper
$('#slider').addClass('with-flashMessage'); $('#slider').addClass('with-flashMessage');
// If the line is a bash command // If the line is a bash command
if (level === 'info' && message.charAt(0) === '+') { if (level === 'info' && message.charAt(0) === '+') {
level = 'log'; level = 'log';
@ -246,7 +246,6 @@ var app = Sammy('#main', function (sam) {
loaded = true; loaded = true;
$('div.loader').remove(); $('div.loader').remove();
$('#modal').modal('hide'); $('#modal').modal('hide');
$('#flashModal').modal('hide');
if (enableSlide) { if (enableSlide) {
var leSwap = function() { var leSwap = function() {
@ -470,11 +469,6 @@ var app = Sammy('#main', function (sam) {
req.redirect('#/login'); req.redirect('#/login');
return false; return false;
} }
// Clear flash display
if (!store.get('flash')) {
$('#flash').fadeOut(function() { $('#flash').html('').show(); });
}
}); });
sam.after(function () {}); sam.after(function () {});
@ -709,7 +703,6 @@ var app = Sammy('#main', function (sam) {
// Step 3 : administration passowrd // Step 3 : administration passowrd
sam.get('#/postinstall/password', function(c) { sam.get('#/postinstall/password', function(c) {
$('#masthead').hide(); $('#masthead').hide();
$('#flash .alert').remove();
if (!store.get('maindomain')) { if (!store.get('maindomain')) {
store.clear('slide'); store.clear('slide');
c.redirect('#/postinstall/domain'); c.redirect('#/postinstall/domain');