TagSpaces is an offline, open source, document manager with tagging support
TSN351 (#1099)
Stanimirdbd9f56cfe22
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsxindex e4fd0fdf0..eebcd5e67 100644--- a/app/components/FolderContainer.tsx+++ b/app/components/FolderContainer.tsx@@ -22,6 +22,7 @@ import { bindActionCreators } from 'redux';import Button from '@material-ui/core/Button';import MoreVertIcon from '@material-ui/icons/MoreVert';import BackButtonIcon from '@material-ui/icons/ArrowBack';+import FolderSeparatorIcon from '@material-ui/icons/ChevronRight';import MenuIcon from '@material-ui/icons/Menu';import Badge from '@material-ui/core/Badge';import { withStyles } from '@material-ui/core/styles';@@ -308,10 +309,7 @@ class FolderContainer extends React.Component<Props, State> {};renderPerspective() {- if (- !this.props.currentDirectoryPath ||- this.props.currentDirectoryPath.length < 2- ) {+ if (!this.props.currentDirectoryPath) {return <WelcomePanelAsync />;}if (this.state.currentPerspective === 'gallery') {@@ -434,7 +432,7 @@ class FolderContainer extends React.Component<Props, State> {}}>{extractShortDirectoryName(pathPart, '/')}- / + <FolderSeparatorIcon /></Button>))}{!isDesktopMode &&diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex f48b8cc7e..355c4ad7c 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -705,7 +705,7 @@ export const actions = {showIsLoading?: boolean) => ({type: types.LOAD_DIRECTORY_SUCCESS,- directoryPath,+ directoryPath: directoryPath || AppConfig.dirSeparator,directoryContent,showIsLoading}),diff --git a/app/utils/paths.ts b/app/utils/paths.tsindex 8cd1315ce..42ffafe24 100644--- a/app/utils/paths.ts+++ b/app/utils/paths.ts@@ -64,7 +64,10 @@ export function getMetaDirectoryPath(directoryPath: string,dirSeparator: string = AppConfig.dirSeparator) {- return normalizePath(directoryPath) + dirSeparator + AppConfig.metaFolder;+ return (+ (directoryPath ? normalizePath(directoryPath) + dirSeparator : '') ++ AppConfig.metaFolder+ );}export function getMetaFileLocationForFile(diff --git a/yarn.lock b/yarn.lockindex 3bc492051..fab8014ad 100644--- a/yarn.lock+++ b/yarn.lock@@ -1341,7 +1341,7 @@dependencies:regenerator-runtime "^0.13.2"-"@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5":+"@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5":version "7.5.5"resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==@@ -1472,88 +1472,11 @@global-agent "^2.0.2"global-tunnel-ng "^2.7.1"-"@emotion/cache@^10.0.15", "@emotion/cache@^10.0.9":- version "10.0.15"- resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.15.tgz#b81767b48015aae2689c60373992145c67b8de02"- integrity sha512-8VthgeKhlGeTXSW1JN7I14AnAaiFPbOrqNqg3dPoGCZ3bnMjkrmRU0zrx0BtBw9esBaPaQgDB9y0tVgAGT2Mrg==- dependencies:- "@emotion/sheet" "0.9.3"- "@emotion/stylis" "0.8.4"- "@emotion/utils" "0.11.2"- "@emotion/weak-memoize" "0.2.3"--"@emotion/core@^10.0.9":- version "10.0.16"- resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.16.tgz#e43630b65c84e31e81f34db3286eab584b08cfaa"- integrity sha512-whbiiA7FfPreBY4BqWky2qRfAZvq+4dKQ1WNJuiYQwPCNmb0pEYDgNheSbZoNKtGTtfPaM28hBbZAKWD5EZXmQ==- dependencies:- "@babel/runtime" "^7.4.3"- "@emotion/cache" "^10.0.15"- "@emotion/css" "^10.0.14"- "@emotion/serialize" "^0.11.9"- "@emotion/sheet" "0.9.3"- "@emotion/utils" "0.11.2"--"@emotion/css@^10.0.14", "@emotion/css@^10.0.9":- version "10.0.14"- resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz#95dacabdd0e22845d1a1b0b5968d9afa34011139"- integrity sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==- dependencies:- "@emotion/serialize" "^0.11.8"- "@emotion/utils" "0.11.2"- babel-plugin-emotion "^10.0.14"--"@emotion/[email protected]":- version "0.7.2"- resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.2.tgz#53211e564604beb9befa7a4400ebf8147473eeef"- integrity sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q==-"@emotion/hash@^0.8.0":version "0.8.0"resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==-"@emotion/[email protected]":- version "0.7.2"- resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.2.tgz#7f4c71b7654068dfcccad29553520f984cc66b30"- integrity sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w==--"@emotion/serialize@^0.11.8", "@emotion/serialize@^0.11.9":- version "0.11.9"- resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.9.tgz#123e0f51d2dee9693fae1057bd7fc27b021d6868"- integrity sha512-/Cn4V81z3ZyFiDQRw8nhGFaHkxHtmCSSBUit4vgTuLA1BqxfJUYiqSq97tq/vV8z9LfIoqs6a9v6QrUFWZpK7A==- dependencies:- "@emotion/hash" "0.7.2"- "@emotion/memoize" "0.7.2"- "@emotion/unitless" "0.7.4"- "@emotion/utils" "0.11.2"- csstype "^2.5.7"--"@emotion/[email protected]":- version "0.9.3"- resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a"- integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A==--"@emotion/[email protected]":- version "0.8.4"- resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz#6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c"- integrity sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ==--"@emotion/[email protected]":- version "0.7.4"- resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.4.tgz#a87b4b04e5ae14a88d48ebef15015f6b7d1f5677"- integrity sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ==--"@emotion/[email protected]":- version "0.11.2"- resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz#713056bfdffb396b0a14f1c8f18e7b4d0d200183"- integrity sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA==--"@emotion/[email protected]":- version "0.2.3"- resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz#dfa0c92efe44a1d1a7974fb49ffeb40ef2da5a27"- integrity sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ==-"@evocateur/libnpmaccess@^3.1.2":version "3.1.2"resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"@@ -3846,22 +3769,6 @@ babel-plugin-dynamic-import-node@^2.3.0:dependencies:object.assign "^4.1.0"-babel-plugin-emotion@^10.0.14:- version "10.0.16"- resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.16.tgz#cb306798058b102a634ca80e69b012caa345bb09"- integrity sha512-a01Xrourr/VRpw4KicX9drDwfVGHmw8HmlQk++N4fv0j73EfHKWC1Ah4Vu8s1cTGVvTiwum+UhVpJenV8j03FQ==- dependencies:- "@babel/helper-module-imports" "^7.0.0"- "@emotion/hash" "0.7.2"- "@emotion/memoize" "0.7.2"- "@emotion/serialize" "^0.11.9"- babel-plugin-macros "^2.0.0"- babel-plugin-syntax-jsx "^6.18.0"- convert-source-map "^1.5.0"- escape-string-regexp "^1.0.5"- find-root "^1.1.0"- source-map "^0.5.7"-babel-plugin-istanbul@^4.1.6:version "4.1.6"resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"@@ -3894,15 +3801,6 @@ babel-plugin-jest-hoist@^24.9.0:dependencies:"@types/babel__traverse" "^7.0.6"-babel-plugin-macros@^2.0.0:- version "2.6.1"- resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181"- integrity sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==- dependencies:- "@babel/runtime" "^7.4.2"- cosmiconfig "^5.2.0"- resolve "^1.10.0"-babel-plugin-module-resolver@^4.0.0:version "4.0.0"resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz#8f3a3d9d48287dc1d3b0d5595113adabd36a847f"@@ -3914,11 +3812,6 @@ babel-plugin-module-resolver@^4.0.0:reselect "^4.0.0"resolve "^1.13.1"-babel-plugin-syntax-jsx@^6.18.0:- version "6.18.0"- resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"- integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=-babel-plugin-syntax-object-rest-spread@^6.13.0:version "6.13.0"resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"@@ -5449,7 +5342,7 @@ conventional-recommended-bump@^5.0.0:meow "^4.0.0"q "^1.5.1"-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:+convert-source-map@^1.1.0, convert-source-map@^1.4.0:version "1.6.0"resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==@@ -5887,7 +5780,7 @@ cssstyle@^1.0.0:dependencies:cssom "0.3.x"-csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.7, csstype@^2.6.5:+csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5:version "2.6.6"resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==@@ -14174,13 +14067,6 @@ react-image-gallery@^1.0.2:react-swipeable "^5.2.0"resize-observer-polyfill "^1.5.0"-react-input-autosize@^2.2.2:- version "2.2.2"- resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"- integrity sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==- dependencies:- prop-types "^15.5.8"-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:version "16.9.0"resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"@@ -14275,20 +14161,6 @@ react-router@^4.2.0, react-router@^4.3.1:prop-types "^15.6.1"warning "^4.0.1"-react-select@^3.0.8:- version "3.0.8"- resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.8.tgz#06ff764e29db843bcec439ef13e196865242e0c1"- integrity sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==- dependencies:- "@babel/runtime" "^7.4.4"- "@emotion/cache" "^10.0.9"- "@emotion/core" "^10.0.9"- "@emotion/css" "^10.0.9"- memoize-one "^5.0.0"- prop-types "^15.6.0"- react-input-autosize "^2.2.2"- react-transition-group "^2.2.1"-react-split-pane@^0.1.89:version "0.1.89"resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.89.tgz#e111e5f7e6e1cd3c86a5aa0d9ddf987c2165f0d0"@@ -14372,16 +14244,6 @@ react-transition-group@^1.1.3:prop-types "^15.5.6"warning "^3.0.0"-react-transition-group@^2.2.1:- version "2.9.0"- resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"- integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==- dependencies:- dom-helpers "^3.4.0"- loose-envify "^1.4.0"- prop-types "^15.6.2"- react-lifecycles-compat "^3.0.4"-react-transition-group@^4.0.0:version "4.2.2"resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.2.2.tgz#8b5252410180c27fd7eebf50b185256b41799b16"