lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-05 00:46:39 +02:00
commit fe672e1e4b
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/tpl/ajax/fileupload_main.tpl.php
View File

@ -42,13 +42,6 @@ $(function () {
// Initialize the jQuery File Upload widget: // Initialize the jQuery File Upload widget:
$('#fileupload').fileupload(); $('#fileupload').fileupload();
// Options
$('#fileupload').fileupload('option', {
// Enable iframe cross-domain access via redirect option
redirect: window.location.href.replace(/\/[^\/]*$/,'<?php echo DOL_URL_ROOT; ?>/includes/jquery/plugins/fileupload/cors/result.html?%s'),
maxFileSize: '<?php echo $max_file_size; ?>'
});
// Events // Events
$('#fileupload').fileupload({ $('#fileupload').fileupload({
completed: function (e, data) { completed: function (e, data) {