scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #948 from ZmagoD/zd_SCI_1950

Browse source 
fixes bug with navbar[SCI-1950]
This commit is contained in:
Adrian Oprea 2018-01-18 14:45:22 +02:00 committed by GitHub
parent 7b28bfa6d4 2857857c24
commit cb7f00c9ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/src/componentLoader/massageConfiguration.js
View file

@ -2,7 +2,7 @@ const massageConfiguration = (config, identifier) => {
let result = {};
const addons = Object.keys(config);
if (addons) {
if (addons.length > 0) {
result = {
[identifier]: {}
@ -19,7 +19,7 @@ const massageConfiguration = (config, identifier) => {
)
);
}
return result;
};

22
yarn.lock
View file

@ -1509,9 +1509,9 @@ coffee-loader@^0.8.0:
dependencies:
loader-utils "^1.0.2"
coffee-script@^1.12.6:
coffeescript@^1.12.6:
version "1.12.7"
resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
collection-visit@^1.0.0:
version "1.0.0"
@ -2333,9 +2333,9 @@ eslint-plugin-import@^2.7.0:
minimatch "^3.0.3"
read-pkg-up "^2.0.0"
eslint-plugin-jsx-a11y@^6.0.2:
version "6.0.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz#54583d1ae442483162e040e13cc31865465100e5"
eslint-plugin-jsx-a11y@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
dependencies:
aria-query "^0.7.0"
array-includes "^3.0.3"
@ -2343,7 +2343,7 @@ eslint-plugin-jsx-a11y@^6.0.2:
axobject-query "^0.1.0"
damerau-levenshtein "^1.0.0"
emoji-regex "^6.1.0"
jsx-ast-utils "^2.0.0"
jsx-ast-utils "^1.4.0"
eslint-plugin-prettier@^2.1.2:
version "2.5.0"
@ -3903,6 +3903,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
jsx-ast-utils@^1.4.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
jsx-ast-utils@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
@ -4401,11 +4405,7 @@ moment-timezone@^0.5.14:
dependencies:
moment ">= 2.9.0"
"moment@>= 2.9.0":
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
moment@^2.18.1:
"moment@>= 2.9.0", moment@^2.18.1:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"