diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/app.js | 6 | ||||
| -rw-r--r-- | apps/files/js/fileactions.js | 27 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 8 |
3 files changed, 3 insertions, 38 deletions
diff --git a/apps/files/js/app.js b/apps/files/js/app.js index 4597dc9529a..20da85f0f92 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -67,16 +67,12 @@ var fileActions = new OCA.Files.FileActions(); // default actions fileActions.registerDefaultActions(); - // legacy actions - fileActions.merge(window.FileActions); // regular actions fileActions.merge(OCA.Files.fileActions); this._onActionsUpdated = _.bind(this._onActionsUpdated, this); OCA.Files.fileActions.on('setDefault.app-files', this._onActionsUpdated); OCA.Files.fileActions.on('registerAction.app-files', this._onActionsUpdated); - window.FileActions.on('setDefault.app-files', this._onActionsUpdated); - window.FileActions.on('registerAction.app-files', this._onActionsUpdated); this.files = OCA.Files.Files; @@ -150,8 +146,6 @@ this.files = null; OCA.Files.fileActions.off('setDefault.app-files', this._onActionsUpdated); OCA.Files.fileActions.off('registerAction.app-files', this._onActionsUpdated); - window.FileActions.off('setDefault.app-files', this._onActionsUpdated); - window.FileActions.off('registerAction.app-files', this._onActionsUpdated); }, _onActionsUpdated: function(ev) { diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 1399f24a3cc..d800f2b8eb5 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -409,8 +409,6 @@ var fileName = $file.attr('data-file'); context.fileActions.currentFile = currentFile; - // also set on global object for legacy apps - window.FileActions.currentFile = currentFile; var callContext = _.extend({}, context); @@ -480,8 +478,6 @@ var fileName = fileInfoModel.get('name'); this.currentFile = fileName; - // also set on global object for legacy apps - window.FileActions.currentFile = fileName; if (fileList) { // compatibility with action handlers that expect these @@ -659,7 +655,7 @@ if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { context.fileList.move(filename, targetPath, false, context.dir); } - context.fileList.dirInfo.dirLastCopiedTo = targetPath; + context.fileList.dirInfo.dirLastCopiedTo = targetPath; }, false, "httpd/unix-directory", true, actions, dialogDir); } }); @@ -814,25 +810,4 @@ // global file actions to be used by all lists OCA.Files.fileActions = new OCA.Files.FileActions(); - OCA.Files.legacyFileActions = new OCA.Files.FileActions(); - - // for backward compatibility - // - // legacy apps are expecting a stateful global FileActions object to register - // their actions on. Since legacy apps are very likely to break with other - // FileList views than the main one ("All files"), actions registered - // through window.FileActions will be limited to the main file list. - // @deprecated use OCA.Files.FileActions instead - window.FileActions = OCA.Files.legacyFileActions; - window.FileActions.register = function (mime, name, permissions, icon, action, displayName) { - console.warn('FileActions.register() is deprecated, please use OCA.Files.fileActions.register() instead', arguments); - OCA.Files.FileActions.prototype.register.call( - window.FileActions, mime, name, permissions, icon, action, displayName - ); - }; - window.FileActions.display = function (parent, triggerEvent, fileList) { - fileList = fileList || OCA.Files.App.fileList; - console.warn('FileActions.display() is deprecated, please use OCA.Files.fileActions.register() which automatically redisplays actions', mime, name); - OCA.Files.FileActions.prototype.display.call(window.FileActions, parent, triggerEvent, fileList); - }; })(); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index edb2ae2cbaf..0e24c09ec07 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -839,8 +839,6 @@ var action = this.fileActions.getDefault(mime,type, permissions); if (action) { event.preventDefault(); - // also set on global object for legacy apps - window.FileActions.currentFile = this.fileActions.currentFile; action(filename, { $file: $tr, fileList: this, @@ -865,8 +863,6 @@ var permissions = this.fileActions.getCurrentPermissions(); var action = this.fileActions.get(mime, type, permissions)['Details']; if (action) { - // also set on global object for legacy apps - window.FileActions.currentFile = this.fileActions.currentFile; action(filename, { $file: $tr, fileList: this, @@ -1022,7 +1018,7 @@ if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { self.move(files, targetPath, disableLoadingState); } - self.dirInfo.dirLastCopiedTo = targetPath; + self.dirInfo.dirLastCopiedTo = targetPath; }, false, "httpd/unix-directory", true, actions, dialogDir); event.preventDefault(); }, @@ -3273,7 +3269,7 @@ /** * Are all files selected? - * + * * @returns {Boolean} all files are selected */ isAllSelected: function() { |