haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +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

35
static/scripts/common.js
View File

@@ -170,6 +170,7 @@ define([
case 'events': return siteRoot + 'api2/events/';
case 'devices': return siteRoot + 'api2/devices/';
case 'invitations': return siteRoot + 'api/v2.1/invitations/';
case 'invitations_batch': return siteRoot + 'api/v2.1/invitations/batch/';
case 'invitation': return siteRoot + 'api/v2.1/invitations/' + options.token + '/';
case 'search_user': return siteRoot + 'api2/search-user/';
case 'user_profile': return siteRoot + 'profile/' + options.username + '/';
@@ -374,15 +375,35 @@ define([
},
feedback: function(con, type, time) {
var _this = this;
var time = time || 5000;
if ($('.messages').length > 0) {
$('.messages').html('<li class="' + type + '">' + this.HTMLescape(con) + '</li>');
} else {
var html = '<ul class="messages"><li class="' + type + '">' + this.HTMLescape(con) + '</li></ul>';
$('#wrapper').append(html);
var $el;
var hide_pos_top,
show_pos_top = '15px';
var $con, str = '';
if (typeof con == 'string') { // most of the time
$con = $('<li class="' + type + '">' + this.HTMLescape(con) + '</li>');
} else { // [{'msg':'', 'type':''}]
$(con).each(function(index, item) {
str += '<li class="' + item.type + '">' + _this.HTMLescape(item.msg) + '</li>';
});
$con = $(str);
}
$('.messages').css({'left':($(window).width() - $('.messages').width())/2, 'top':10}).removeClass('hide');
setTimeout(function() { $('.messages').addClass('hide'); }, time);
if ($('.messages').length > 0) {
$el = $('.messages').html($con);
} else {
$el = $('<ul class="messages"></ul>').html($con);
$('#main').append($el);
}
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);
},
showFormError: function(formid, error_msg) {