diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-05-08 22:06:30 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-05-15 17:51:04 +0200 |
commit | 9d38e3602b2faf37d861729c52690ce51b8fee97 (patch) | |
tree | 5da63d26db4a4e8ec356dee45fc8f7804c6fe38a /apps/files_trashbin/index.php | |
parent | fb10bf4048aaf5b2a9665fc9dff217c790efe005 (diff) | |
download | nextcloud-server-9d38e3602b2faf37d861729c52690ce51b8fee97.tar.gz nextcloud-server-9d38e3602b2faf37d861729c52690ce51b8fee97.zip |
Namespacing for FileList, FileActions and trashbin app
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
"files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
Diffstat (limited to 'apps/files_trashbin/index.php')
-rw-r--r-- | apps/files_trashbin/index.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 4c5527822fb..08227b7f322 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -5,12 +5,8 @@ OCP\User::checkLoggedIn(); $tmpl = new OCP\Template('files_trashbin', 'index', ''); -// TODO: re-enable after making sure the scripts doesn't -// override the files app -/* -OCP\Util::addScript('files_trashbin', 'disableDefaultActions'); OCP\Util::addStyle('files_trashbin', 'trash'); +OCP\Util::addScript('files_trashbin', 'app'); +OCP\Util::addScript('files_trashbin', 'files'); OCP\Util::addScript('files_trashbin', 'filelist'); -OCP\Util::addScript('files_trashbin', 'trash'); - */ $tmpl->printPage(); |