summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-06-27 18:00:32 +0200
committerVincent Petry <pvince81@owncloud.com>2014-06-27 18:00:32 +0200
commit7a1b45c43bcca2de24ef1cc55dd1867b63e1462e (patch)
treefa55176052a608c56a6d554b35a68afa8685ec30 /apps
parenta18658fa7fd142e14d0c3ffbba7bd1118045d03d (diff)
parent0ff30a7d5e28d4eeb391e87f33ea28b643814574 (diff)
downloadnextcloud-server-7a1b45c43bcca2de24ef1cc55dd1867b63e1462e.tar.gz
nextcloud-server-7a1b45c43bcca2de24ef1cc55dd1867b63e1462e.zip
Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage
Allow late registration of file actions in public page
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/filelist.js1
-rw-r--r--apps/files_sharing/js/public.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index dd77b534f51..0477a657035 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -517,7 +517,6 @@
* This will refresh the file actions on the list.
*/
_onFileActionsUpdated: function() {
- console.log('onFileActionsUpdated');
var self = this;
this.$fileList.find('tr td.filename').each(function() {
self.fileActions.display($(this), true, self);
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 1d633a655d5..f911f3689eb 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -33,6 +33,10 @@ OCA.Sharing.PublicApp = {
// regular actions
fileActions.merge(OCA.Files.fileActions);
+ // in case apps would decide to register file actions later,
+ // replace the global object with this one
+ OCA.Files.fileActions = fileActions;
+
this._initialized = true;
this.initialDir = $('#dir').val();