diff --git a/include/class.forms.php b/include/class.forms.php index 3aa5f4a93ff8aa92ddf05a51e029650f7e00d7fd..69a69c3e98df96f75bd6c9e86579a004c41ba1ce 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -1718,9 +1718,6 @@ class ThreadEntryWidget extends Widget { class FileUploadWidget extends Widget { static $media = array( - 'js' => array( - '/js/filedrop.field.js' - ), 'css' => array( '/css/filedrop.css', ), diff --git a/include/client/header.inc.php b/include/client/header.inc.php index 2d06fe5075bb5a2a9b4b167bf89a72dfaa6c69f7..d15783238a543bc9a386af165e4269bfb85837f3 100644 --- a/include/client/header.inc.php +++ b/include/client/header.inc.php @@ -35,7 +35,7 @@ if (($lang = Internationalization::getCurrentLanguage()) <link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/rtl.css"/> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-1.8.3.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script> - <script src="<?php echo ROOT_PATH; ?>js/jquery.multifile.js"></script> + <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> <script src="<?php echo ROOT_PATH; ?>js/osticket.js"></script> <script src="<?php echo ROOT_PATH; ?>scp/js/bootstrap-typeahead.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php index 08fc55dcc6438ca437bac75f9a52814c097a1fb0..cf832ae2a12dfdf54863ce62367827550fd513f5 100644 --- a/include/staff/header.inc.php +++ b/include/staff/header.inc.php @@ -21,7 +21,7 @@ if (($lang = Internationalization::getCurrentLanguage()) <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-1.8.3.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script> - <script type="text/javascript" src="../js/jquery.multifile.js"></script> + <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> <script type="text/javascript" src="./js/tips.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script> diff --git a/js/osticket.js b/js/osticket.js index ae166d4e3a2d9dadb8747639ed99f388491a7174..099169067145379c95429d28a08c3ed26df982a3 100644 --- a/js/osticket.js +++ b/js/osticket.js @@ -94,20 +94,6 @@ $(document).ready(function(){ } })(); - /* Multifile uploads */ - var elems = $('.multifile'); - if (elems.exists()) { - /* Get config settings from the backend */ - getConfig().then(function(c) { - elems.multifile({ - container: '.uploads', - max_uploads: c.max_file_uploads || 1, - file_types: c.file_types || ".*", - max_file_size: c.max_file_size || 0 - }); - }); - } - $.translate_format = function(str) { var translation = { 'd':'dd', diff --git a/scp/js/scp.js b/scp/js/scp.js index 9bd4a3f0f23deb40e0243cf38c68e974efff3f22..74a92a23d837f7a4534485f68100ef7a368d2471 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -245,14 +245,6 @@ var scp_prep = function() { /* Get config settings from the backend */ getConfig().then(function(c) { - // Multifile uploads - $('.multifile').multifile({ - container: '.uploads', - max_uploads: c.max_file_uploads || 1, - file_types: c.file_types || ".*", - max_file_size: c.max_file_size || 0 - }); - // Datepicker $('.dp').datepicker({ numberOfMonths: 2,