aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filelist.js10
-rw-r--r--apps/files/js/gotoplugin.js1
-rw-r--r--apps/files/l10n/da.js5
-rw-r--r--apps/files/l10n/da.json5
-rw-r--r--apps/files/l10n/is.js2
-rw-r--r--apps/files/l10n/is.json2
-rw-r--r--apps/files/l10n/pl.js1
-rw-r--r--apps/files/l10n/pl.json1
-rw-r--r--apps/files/l10n/sv.js3
-rw-r--r--apps/files/l10n/sv.json3
-rw-r--r--apps/files/lib/Helper.php9
-rw-r--r--apps/files/tests/js/filelistSpec.js6
12 files changed, 42 insertions, 6 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 0fcb10a21ee..db85caf65fa 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -327,6 +327,7 @@
this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this));
this.$fileList.on('change', 'td.filename>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
+ this.$el.on('show', _.bind(this._onShow, this));
this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this));
this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
@@ -553,6 +554,13 @@
},
/**
+ * Event handler when leaving previously hidden state
+ */
+ _onShow: function(e) {
+ this.reload();
+ },
+
+ /**
* Event handler for when the URL changed
*/
_onUrlChanged: function(e) {
@@ -1061,6 +1069,8 @@
return OC.MimeType.getIconUrl('dir-shared');
} else if (fileInfo.mountType === 'external-root') {
return OC.MimeType.getIconUrl('dir-external');
+ } else if (fileInfo.mountType !== undefined && fileInfo.mountType !== '') {
+ return OC.MimeType.getIconUrl('dir-' + fileInfo.mountType);
}
return OC.MimeType.getIconUrl('dir');
}
diff --git a/apps/files/js/gotoplugin.js b/apps/files/js/gotoplugin.js
index 69ec64b0266..4793420ed2d 100644
--- a/apps/files/js/gotoplugin.js
+++ b/apps/files/js/gotoplugin.js
@@ -40,6 +40,7 @@
type: OCA.Files.FileActions.TYPE_DROPDOWN,
actionHandler: function (fileName, context) {
var fileModel = context.fileInfoModel;
+ OC.Apps.hideAppSidebar($('.detailsView'));
OCA.Files.App.setActiveView('files', {silent: true});
OCA.Files.App.fileList.changeDirectory(fileModel.get('path'), true, true).then(function() {
OCA.Files.App.fileList.scrollTo(fileModel.get('name'));
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index c098efa20c9..3b46f7a4e6c 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -52,6 +52,7 @@ OC.L10N.register(
"_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
"_%n file_::_%n files_" : ["%n fil","%n filer"],
"{dirs} and {files}" : "{dirs} og {files}",
+ "_including %n hidden_::_including %n hidden_" : ["%n skujlte inkluderet","%n skujlte inkluderet"],
"You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
"_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
"New" : "Ny",
@@ -120,6 +121,7 @@ OC.L10N.register(
"Select all" : "Vælg alle",
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
+ "No favorites yet" : "Ingen foretrukne endnu",
"Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her",
"Shared with you" : "Delt med dig",
"Shared with others" : "Delt med andre",
@@ -128,8 +130,11 @@ OC.L10N.register(
"Deleted files" : "Slettede filer",
"Text file" : "Tekstfil",
"New text file.txt" : "Ny tekst file.txt",
+ "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} time tilbage","{hours}:{minutes}:{seconds} timer tilbage"],
"{hours}:{minutes}h" : "{hours}:{minutes}t",
+ "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minut tilbage","{minutes}:{seconds} minutter tilbage"],
"{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+ "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} sekund tilbage","{seconds} sekunder tilbage"],
"{seconds}s" : "{seconds}s",
"Any moment now..." : "Når som helst...",
"Soon..." : "Snart...",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index b74dd4deaa9..e7a93be7897 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -50,6 +50,7 @@
"_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
"_%n file_::_%n files_" : ["%n fil","%n filer"],
"{dirs} and {files}" : "{dirs} og {files}",
+ "_including %n hidden_::_including %n hidden_" : ["%n skujlte inkluderet","%n skujlte inkluderet"],
"You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
"_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
"New" : "Ny",
@@ -118,6 +119,7 @@
"Select all" : "Vælg alle",
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
+ "No favorites yet" : "Ingen foretrukne endnu",
"Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her",
"Shared with you" : "Delt med dig",
"Shared with others" : "Delt med andre",
@@ -126,8 +128,11 @@
"Deleted files" : "Slettede filer",
"Text file" : "Tekstfil",
"New text file.txt" : "Ny tekst file.txt",
+ "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} time tilbage","{hours}:{minutes}:{seconds} timer tilbage"],
"{hours}:{minutes}h" : "{hours}:{minutes}t",
+ "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minut tilbage","{minutes}:{seconds} minutter tilbage"],
"{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+ "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} sekund tilbage","{seconds} sekunder tilbage"],
"{seconds}s" : "{seconds}s",
"Any moment now..." : "Når som helst...",
"Soon..." : "Snart...",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index ed0c1f66f28..7431287a389 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -69,6 +69,7 @@ OC.L10N.register(
"_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"],
"Favorited" : "Sett í eftirlæti",
"Favorite" : "Eftirlæti",
+ "Copy direct link (only works for users who have access to this file/folder)" : "Afrita beinan tengil (virkar bara fyrir notendur sem eiga aðgang að þessari skrá/möppu)",
"Folder" : "Mappa",
"New folder" : "Ný mappa",
"Upload" : "Senda inn",
@@ -120,6 +121,7 @@ OC.L10N.register(
"Select all" : "Velja allt",
"Upload too large" : "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
+ "No favorites yet" : "Engin eftirlæti ennþá",
"Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem eftirlæti birtast hér",
"Shared with you" : "Deilt með þér",
"Shared with others" : "Deilt með öðrum",
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index e96f38480e7..6ef9d3e8656 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -67,6 +67,7 @@
"_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"],
"Favorited" : "Sett í eftirlæti",
"Favorite" : "Eftirlæti",
+ "Copy direct link (only works for users who have access to this file/folder)" : "Afrita beinan tengil (virkar bara fyrir notendur sem eiga aðgang að þessari skrá/möppu)",
"Folder" : "Mappa",
"New folder" : "Ný mappa",
"Upload" : "Senda inn",
@@ -118,6 +119,7 @@
"Select all" : "Velja allt",
"Upload too large" : "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
+ "No favorites yet" : "Engin eftirlæti ennþá",
"Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem eftirlæti birtast hér",
"Shared with you" : "Deilt með þér",
"Shared with others" : "Deilt með öðrum",
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index 2f89e7956e1..62860215eca 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"Select all" : "Wybierz wszystko",
"Upload too large" : "Ładowany plik jest za duży",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
+ "No favorites yet" : "Brak jeszcze ulubionych",
"Files and folders you mark as favorite will show up here" : "Pliki i katalogi, które oznaczysz jako ulubione wyświetlą się tutaj",
"Shared with you" : "Udostępnione dla Ciebie",
"Shared with others" : "Udostępnione przez Ciebie",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index 65022458e40..ab3d703873e 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -119,6 +119,7 @@
"Select all" : "Wybierz wszystko",
"Upload too large" : "Ładowany plik jest za duży",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
+ "No favorites yet" : "Brak jeszcze ulubionych",
"Files and folders you mark as favorite will show up here" : "Pliki i katalogi, które oznaczysz jako ulubione wyświetlą się tutaj",
"Shared with you" : "Udostępnione dla Ciebie",
"Shared with others" : "Udostępnione przez Ciebie",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index c4e1f10bcb1..d5e36728d73 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -58,6 +58,7 @@ OC.L10N.register(
"New" : "Ny",
"\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
"File name cannot be empty." : "Filnamn kan inte vara tomt.",
+ "\"{name}\" is not an allowed filetype" : "\"{name}\" är inte en tillåten filtyp",
"Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagring av {owner} är full, filer kan inte uppdateras eller synkroniseras längre!",
"Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
"Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagring av {owner} är nästan full ({usedSpacePercent}%)",
@@ -68,6 +69,7 @@ OC.L10N.register(
"_%n byte_::_%n bytes_" : ["%n bytes","%n bytes"],
"Favorited" : "Favoriserad",
"Favorite" : "Favorit",
+ "Copy direct link (only works for users who have access to this file/folder)" : "Kopiera direktlänk (fungerar endast för de användare som har tillgång till denna fil eller mapp)",
"Folder" : "Mapp",
"New folder" : "Ny mapp",
"Upload" : "Ladda upp",
@@ -119,6 +121,7 @@ OC.L10N.register(
"Select all" : "Välj allt",
"Upload too large" : "För stor uppladdning",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
+ "No favorites yet" : "Inga favoriter ännu",
"Files and folders you mark as favorite will show up here" : "Filer och mappar markerade som favoriter kommer att visas här",
"Shared with you" : "Delad med dig",
"Shared with others" : "Delad med andra",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index 620f52574cd..50ac86a0d85 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -56,6 +56,7 @@
"New" : "Ny",
"\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
"File name cannot be empty." : "Filnamn kan inte vara tomt.",
+ "\"{name}\" is not an allowed filetype" : "\"{name}\" är inte en tillåten filtyp",
"Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagring av {owner} är full, filer kan inte uppdateras eller synkroniseras längre!",
"Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
"Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagring av {owner} är nästan full ({usedSpacePercent}%)",
@@ -66,6 +67,7 @@
"_%n byte_::_%n bytes_" : ["%n bytes","%n bytes"],
"Favorited" : "Favoriserad",
"Favorite" : "Favorit",
+ "Copy direct link (only works for users who have access to this file/folder)" : "Kopiera direktlänk (fungerar endast för de användare som har tillgång till denna fil eller mapp)",
"Folder" : "Mapp",
"New folder" : "Ny mapp",
"Upload" : "Ladda upp",
@@ -117,6 +119,7 @@
"Select all" : "Välj allt",
"Upload too large" : "För stor uppladdning",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
+ "No favorites yet" : "Inga favoriter ännu",
"Files and folders you mark as favorite will show up here" : "Filer och mappar markerade som favoriter kommer att visas här",
"Shared with you" : "Delad med dig",
"Shared with others" : "Delad med andra",
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
index c3d80957913..d2cebce5ddc 100644
--- a/apps/files/lib/Helper.php
+++ b/apps/files/lib/Helper.php
@@ -157,12 +157,9 @@ class Helper {
$entry['isShareMountPoint'] = $i['is_share_mount_point'];
}
$mountType = null;
- if ($i->isShared()) {
- $mountType = 'shared';
- } else if ($i->isMounted()) {
- $mountType = 'external';
- }
- if ($mountType !== null) {
+ $mount = $i->getMountPoint();
+ $mountType = $mount->getMountType();
+ if ($mountType !== '') {
if ($i->getInternalPath() === '') {
$mountType .= '-root';
}
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index ee73914f166..934aa054fb6 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1507,6 +1507,12 @@ describe('OCA.Files.FileList tests', function() {
$('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'}));
expect(fileList.getCurrentDirectory()).toEqual('/somedir');
});
+ it('reloads the list when leaving hidden state', function() {
+ var reloadStub = sinon.stub(fileList, 'reload');
+ $('#app-content-files').trigger(new $.Event('show'));
+ expect(reloadStub.calledOnce).toEqual(true);
+ reloadStub.restore();
+ });
it('refreshes breadcrumb after update', function() {
var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
fileList.changeDirectory('/anothersubdir');
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-31 02:58:45 +0000