haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.2'

Browse Source 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
This commit is contained in:
zhengxie
2017-12-28 15:47:18 +08:00
parent a6fe949ebc 1d613f070b
commit d37144ef75
98 changed files with 35519 additions and 30010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
media/js/base.js
View File

@@ -5,12 +5,6 @@ $('#title-panel, #left-panel, #right-panel').each(function() { // for ie 7
});
$('#tabs').tabs({cookie:{expires:1}});
// handle messages
if ($('.messages')[0]) {
$('#main').append($('.messages'));
$('.messages').css({'left':($(window).width() - $('.messages').width())/2, 'top':10}).removeClass('hide');
setTimeout(function() { $('.messages').addClass('hide'); }, 10000);
}
$(function() {
@@ -410,15 +404,43 @@ function apply_form_error(formid, error_msg) {
// show feedback
function feedback(con, type, time) {
var time = time || 5000;
if ($('.messages')[0]) {
$('.messages').html('<li class="' + type + '">' + con + '</li>');
var $el;
var hide_pos_top,
show_pos_top = '15px';
if ($('.messages').length > 0) {
$el = $('.messages').html('<li class="' + type + '">' + this.HTMLescape(con) + '</li>');
} else {
var html = '<ul class="messages"><li class="' + type + '">' + con + '</li></ul>';
$('#main').append(html);
$el = $('<ul class="messages"><li class="' + type + '">' + this.HTMLescape(con) + '</li></ul>');
$('#main').append($el);
}
$('.messages').css({'left':($(window).width() - $('.messages').width())/2, 'top':10}).removeClass('hide');
setTimeout(function() { $('.messages').addClass('hide'); }, time);
hide_pos_top = '-' + ($el.outerHeight() + parseInt(show_pos_top)) + 'px';
// add transition: from 'hide' to 'show'. the transition effect is offered by CSS.
$el.css({'left':($(window).width() - $el.width())/2, 'top': hide_pos_top});
setTimeout(function() { $el.css({'top': show_pos_top}); }, 10);
setTimeout(function() { $el.css({'top': hide_pos_top}); }, time);
}
// handle existing messages (in base.html)
(function() {
var $el;
var hide_pos_top,
show_pos_top = '15px';
if ($('.messages').length > 0) {
$el = $('.messages');
hide_pos_top = '-' + ($el.outerHeight() + parseInt(show_pos_top)) + 'px';
// add transition: from 'hide' to 'show'. the transition effect is offered by CSS.
$el.css({'left':($(window).width() - $el.width())/2, 'top': hide_pos_top});
setTimeout(function() { $el.css({'top': show_pos_top}); }, 10);
setTimeout(function() { $el.css({'top': hide_pos_top}); }, 5000);
}
})();
function disable(btn) {
btn.attr('disabled', 'disabled').addClass('btn-disabled');
}