From 6ab95e8e33e5dee48291bb3f95a86af0be8c3e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 23 Jan 2013 11:30:42 +0100
Subject: [PATCH] code clean-up
---
apps/files_trashbin/index.php | 1 +
.../js/disableDefaultActions.js | 3 +++
apps/files_trashbin/js/part.list.php | 19 -------------------
apps/files_trashbin/templates/part.list.php | 2 --
4 files changed, 4 insertions(+), 21 deletions(-)
create mode 100644 apps/files_trashbin/js/disableDefaultActions.js
delete mode 100644 apps/files_trashbin/js/part.list.php
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index d415ef263e..20f9cb8daf 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -5,6 +5,7 @@ OCP\User::checkLoggedIn();
OCP\Util::addStyle('files_trashbin', 'trash');
OCP\Util::addScript('files_trashbin', 'trash');
+OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
OCP\Util::addScript('files', 'fileactions');
$tmpl = new OCP\Template('files_trashbin', 'index', 'user');
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
new file mode 100644
index 0000000000..56b95407dd
--- /dev/null
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -0,0 +1,3 @@
+/* disable download and sharing actions */
+var disableDownloadActions = true;
+var disableSharing = true;
diff --git a/apps/files_trashbin/js/part.list.php b/apps/files_trashbin/js/part.list.php
deleted file mode 100644
index c4ecd1ca95..0000000000
--- a/apps/files_trashbin/js/part.list.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Bjoern Schiessle <schiessle@owncloud.com>
-* This file is licensed under the Affero General Public License version 3 or
-* later.
-* See the COPYING-README file.
-*/
-
-// Set the content type to Javascript
-header("Content-type: text/javascript");
-
-// Disallow caching
-header("Cache-Control: no-cache, must-revalidate");
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-
-echo "
-var disableDownloadActions = true;
-var disableSharing = true;
-";
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index c7783e8a4f..7d2f09c62c 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -1,5 +1,3 @@
-<script type="text/javascript" src="<?php echo OC_Helper::linkTo('files_trashbin/js', 'part.list.php');?>"></script>
-
<?php foreach($_['files'] as $file):
$simple_file_size = OCP\simple_file_size($file['size']);
// the bigger the file, the darker the shade of grey; megabytes*2
--
GitLab