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 '5.0'

Browse Source 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
	seahub/group/templates/group/group_discuss.html
	seahub/options/models.py
	seahub/templates/repo_folder_perm.html
	seahub/templates/repo_share_manage.html
	seahub/templates/snippets/shared_link_js.html
	seahub/test_utils.py
This commit is contained in:
zhengxie
2016-03-28 12:16:30 +08:00
parent f305ddd586 855318e003
commit ec9be6975d
29 changed files with 411 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/js/base.js
View File

@@ -218,17 +218,6 @@ $('#logout').click(function() {
}
}
});
if ($.browser.mozilla || $.browser.msie) {
$('a').focus(function() {
$(this).blur();
});
}
if ($.browser.msie) {
$('button, input[type="checkbox"], input[type="radio"], input[type="submit"]').focus(function() {
$(this).blur();
});
$('.search-input').css({'line-height':$('.search-input').css('height')});
}
/*
* add confirm to an operation, using a popup