diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-02-20 13:36:38 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-02-20 13:36:38 +0100 |
| commit | 7cb25149c8514af776d40e57ebd5ebbb8032db3d (patch) | |
| tree | 166f0c0d757beb2f5b4f589b29ab42a4747e20b4 /apps/files/js | |
| parent | 79ef5eda9688c998a51bfbb3f24f5274cc83bcc2 (diff) | |
| parent | b7ff0d44d8859ee363f8afd620bf0182c626ddbc (diff) | |
| download | nextcloud-server-7cb25149c8514af776d40e57ebd5ebbb8032db3d.tar.gz nextcloud-server-7cb25149c8514af776d40e57ebd5ebbb8032db3d.zip | |
Merge pull request #13645 from owncloud/fix-breadcrumb-backslash
Parse backslash as directory separator in breadcrumb
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/breadcrumb.js | 1 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 5cea2639c7d..364475e4a4f 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -67,6 +67,7 @@ * @param dir path to be displayed as breadcrumb */ setDirectory: function(dir) { + dir = dir.replace(/\\/g, '/'); dir = dir || '/'; if (dir !== this.dir) { this.dir = dir; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c5c665cee77..e5634323ef1 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1009,6 +1009,7 @@ * @param changeUrl true to also update the URL, false otherwise (default) */ _setCurrentDir: function(targetDir, changeUrl) { + targetDir = targetDir.replace(/\\/g, '/'); var previousDir = this.getCurrentDirectory(), baseDir = OC.basename(targetDir); |