Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Merged ajax_upload branch (#3957).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10977 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-12-10 20:09:41 +00:00
parent 2304f5d42c
commit ef25210aca
22 changed files with 442 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
public/javascripts/application.js
View File

@@ -290,40 +290,6 @@ function submit_query_form(id) {
$('#'+id).submit();
}
var fileFieldCount = 1;
function addFileField() {
var fields = $('#attachments_fields');
if (fields.children().length >= 10) return false;
fileFieldCount++;
var s = fields.children('span').first().clone();
s.children('input.file').attr('name', "attachments[" + fileFieldCount + "][file]").val('');
s.children('input.description').attr('name', "attachments[" + fileFieldCount + "][description]").val('');
fields.append(s);
}
function removeFileField(el) {
var fields = $('#attachments_fields');
var s = $(el).parents('span').first();
if (fields.children().length > 1) {
s.remove();
} else {
s.children('input.file').val('');
s.children('input.description').val('');
}
}
function checkFileSize(el, maxSize, message) {
var files = el.files;
if (files) {
for (var i=0; i<files.length; i++) {
if (files[i].size > maxSize) {
alert(message);
el.value = "";
}
}
}
}
function showTab(name) {
$('div#content .tab-content').hide();
$('div.tabs a').removeClass('selected');
@@ -579,8 +545,8 @@ function warnLeavingUnsaved(message) {
};
$(document).ready(function(){
$('#ajax-indicator').bind('ajaxSend', function(){
if ($('.ajax-loading').length == 0) {
$('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings){
if ($('.ajax-loading').length == 0 && settings.contentType != 'application/octet-stream') {
$('#ajax-indicator').show();
}
});
@@ -607,5 +573,10 @@ function addFormObserversForDoubleSubmit() {
});
}
function blockEventPropagation(event) {
event.stopPropagation();
event.preventDefault();
}
$(document).ready(hideOnLoad);
$(document).ready(addFormObserversForDoubleSubmit);