diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index d415ef263ec2e938206674cb31f1ed04acbd3a90..20f9cb8daff35bc7fb230ce277a0009ae655864c 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 0000000000000000000000000000000000000000..56b95407dd34cb105f90f8f00776dfffd5b185f5 --- /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 c4ecd1ca95915b370f50541e745d360efbd7f65f..0000000000000000000000000000000000000000 --- 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 c7783e8a4f587e329d593486569afafa7d4f0ea4..7d2f09c62c6867aab208b4cb19579c5b5173817e 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