Files: fix the order fileactions are computed for a file

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f3264da5a127cd221153602ac18b744f63db442c..a77add141a155ed2802e4c3604f6e3be9313f4a1 100644 (file)
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -22,18 +22,18 @@ var FileActions = {
                if (FileActions.actions.all) {
                        actions = $.extend(actions, FileActions.actions.all);
                }
-               if (mime) {
-                       if (FileActions.actions[mime]) {
-                               actions = $.extend(actions, FileActions.actions[mime]);
+               if (type) {//type is 'dir' or 'file'
+                       if (FileActions.actions[type]) {
+                               actions = $.extend(actions, FileActions.actions[type]);
                        }
+               }
+               if (mime) {
                        var mimePart = mime.substr(0, mime.indexOf('/'));
                        if (FileActions.actions[mimePart]) {
                                actions = $.extend(actions, FileActions.actions[mimePart]);
                        }
-               }
-               if (type) {//type is 'dir' or 'file'
-                       if (FileActions.actions[type]) {
-                               actions = $.extend(actions, FileActions.actions[type]);
+                       if (FileActions.actions[mime]) {
+                               actions = $.extend(actions, FileActions.actions[mime]);
                        }
                }
                var filteredActions = {};