Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add hover dropzone css style feature see BT#10896
WIP: Need to improve #dropzone.hover style
  • Loading branch information
jmontoyaa committed Mar 24, 2017
1 parent ba2bcc0 commit fb93a14
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 14 deletions.
5 changes: 5 additions & 0 deletions app/Resources/public/css/base.css
Expand Up @@ -5868,6 +5868,11 @@ ul#toolnavbox-two li a.btn{
font-size: 120%;
margin-bottom: 0;
}

#dropzone.hover {
background: lawngreen;
}

#upload_form .fa-plus-square-o, #upload_form .fa-minus-square-o {
cursor:pointer;
}
Expand Down
32 changes: 18 additions & 14 deletions main/inc/lib/formvalidator/FormValidator.class.php
Expand Up @@ -1581,28 +1581,25 @@ private function addMultipleUploadJavascript($url, $inputName)
data.submit().always(function () {
\$this.remove();
});
});
});
$('#".$inputName."').fileupload({
url: url,
dataType: 'json',
autoUpload: true,
// Enable image resizing, except for Android and Opera,
// which actually support image resizing, but fail to
// send Blob objects via XHR requests:
disableImageResize: /Android(?!.*Chrome)|Opera/.test(window.navigator.userAgent),
previewMaxWidth: 100,
previewMaxHeight: 100,
previewCrop: true,
dropzone: $('#dropzone')
}).on('fileuploadadd', function (e, data) {
dropzone: $('#dropzone'),
}).on('fileuploadadd', function (e, data) {
data.context = $('<div class=\"row\" style=\"margin-bottom:35px\" />').appendTo('#files');
$.each(data.files, function (index, file) {
var node = $('<div class=\"col-sm-5\">').text(file.name);
node.appendTo(data.context);
}
);
});
}).on('fileuploadprocessalways', function (e, data) {
var index = data.index,
file = data.files[index],
Expand Down Expand Up @@ -1633,26 +1630,33 @@ private function addMultipleUploadJavascript($url, $inputName)
var link = $('<a>')
.attr('target', '_blank')
.prop('href', file.url);
$(data.context.children()[index]).parent().wrap(link);
$(data.context.children()[index]).parent().wrap(link);
var successMessage = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-success\"/>').text('" . addslashes(get_lang('UplUploadSucceeded')) . "'));
$(data.context.children()[index]).parent().append(successMessage);
} else if (file.error) {
var error = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-danger\"/>').text(file.error));
$(data.context.children()[index]).parent().append(error);
}
});
$('#dropzone').removeClass('hover');
}).on('fileuploadfail', function (e, data) {
$.each(data.files, function (index) {
var failedMessage = '" . addslashes(get_lang('UplUploadFailed')) . "';
var error = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-danger\"/>').text(failedMessage));
$(data.context.children()[index]).parent().append(error);
});
}).prop('disabled', !$.support.fileInput)
.parent().addClass($.support.fileInput ? undefined : 'disabled');
$('#dropzone').removeClass('hover');
}).prop('disabled', !$.support.fileInput).parent().addClass($.support.fileInput ? undefined : 'disabled');
$('#dropzone').on('dragover', function (e) {
// dragleave callback implementation
$('#dropzone').addClass('hover');
});
$('#dropzone').on('dragleave', function (e) {
$('#dropzone').removeClass('hover');
});
$('.fileinput-button').hide();
});
</script>");
}
Expand Down

0 comments on commit fb93a14

Please sign in to comment.