From 1a66899867fbc4cfd367fb686b57437289be8bf0 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 22 Aug 2014 09:48:57 -0500
Subject: [PATCH] Remove unnecessary multifile code
---
include/class.forms.php | 3 ---
include/client/header.inc.php | 2 +-
include/staff/header.inc.php | 2 +-
js/osticket.js | 14 --------------
scp/js/scp.js | 8 --------
5 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/include/class.forms.php b/include/class.forms.php
index 3aa5f4a93..69a69c3e9 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 2d06fe507..d15783238 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 08fc55dcc..cf832ae2a 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 ae166d4e3..099169067 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 9bd4a3f0f..74a92a23d 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,
--
GitLab