Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix language switcher errors #12448

Merged
merged 4 commits into from
Jul 27, 2024
Merged

Fix language switcher errors #12448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3f4310
Fix language switcher errors
AlexVelezLl Jul 16, 2024
671ccf1
Update appendToRoot prop
AlexVelezLl Jul 18, 2024
a45d54f
remote teleport on CategorySearchModal
AlexVelezLl Jul 22, 2024
e8697a8
Update KDS version
AlexVelezLl Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@shouldFocusLastEl="focusLastEl"
>
<KModal
appendToRoot
:title="coreString('changeLanguageOption')"
:submitText="coreString('confirmAction')"
:cancelText="coreString('cancelAction')"
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"js-cookie": "^3.0.5",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-constants": "0.2.6",
"kolibri-design-system": "4.3.2",
"kolibri-design-system": "4.4.0",
"lockr": "0.8.5",
"lodash": "^4.17.21",
"loglevel": "^1.9.1",
Expand Down
29 changes: 12 additions & 17 deletions kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/CategorySearchModal/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<template>

<div>
<Teleport
<KModal
v-if="windowIsLarge"
to="body"
appendToRoot
:title="$tr('title')"
:cancelText="coreString('closeAction')"
size="large"
@cancel="$emit('cancel')"
>
<KModal
:title="$tr('title')"
:cancelText="coreString('closeAction')"
size="large"
@cancel="$emit('cancel')"
>
<CategorySearchOptions
ref="searchOptions"
:selectedCategory="selectedCategory"
v-on="$listeners"
/>
</KModal>
</Teleport>
<CategorySearchOptions
ref="searchOptions"
:selectedCategory="selectedCategory"
v-on="$listeners"
/>
</KModal>
<div v-else>
<h2>{{ $tr('title') }}</h2>
<CategorySearchOptions
Expand All @@ -33,7 +30,6 @@

<script>

import Teleport from 'vue2-teleport';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
import CategorySearchOptions from './CategorySearchOptions';
Expand All @@ -42,7 +38,6 @@
name: 'CategorySearchModal',
components: {
CategorySearchOptions,
Teleport,
},
mixins: [commonCoreStrings],
setup() {
Expand Down
3 changes: 0 additions & 3 deletions kolibri/plugins/learn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"description": "Learn Plugin for Kolibri",
"private": true,
"version": "0.0.1",
"dependencies": {
"vue2-teleport": "^1.1.4"
},
"devDependencies": {
"flush-promises": "^1.0.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/kolibri-core-for-export/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"js-cookie": "^3.0.5",
"knuth-shuffle-seeded": "^1.0.6",
"kolibri-constants": "0.2.6",
"kolibri-design-system": "4.3.2",
"kolibri-design-system": "4.4.0",
"lockr": "0.8.5",
"lodash": "^4.17.21",
"loglevel": "^1.9.1",
Expand Down
51 changes: 18 additions & 33 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3017,6 +3017,15 @@ anymatch@^3.0.3, anymatch@~3.1.2:
normalize-path "^3.0.0"
picomatch "^2.0.4"

"aphrodite@git+https://github.com/learningequality/aphrodite.git":
version "2.2.3"
uid fdc8d7be8912a5cf17f74ff10f124013c52c3e32
resolved "git+https://github.com/learningequality/aphrodite.git#fdc8d7be8912a5cf17f74ff10f124013c52c3e32"
dependencies:
asap "^2.0.3"
inline-style-prefixer "^4.0.2"
string-hash "^1.1.3"

"aphrodite@https://github.com/learningequality/aphrodite/":
version "2.2.3"
resolved "https://github.com/learningequality/aphrodite/#fdc8d7be8912a5cf17f74ff10f124013c52c3e32"
Expand Down Expand Up @@ -7707,10 +7716,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.6.tgz#d13762862505a3a6ec58a104870b21da96778656"
integrity sha512-gQaY2wFNFrsB+9+xQNeEcLHixNuZEK+GHyKKr78s/hg8gFU3YVsnhlYp0u+du4XeVwewpyN1ajGb4UrrdF8rTA==

kolibri-design-system@4.3.2:
version "4.3.2"
resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.3.2.tgz#1779fb5958499bd0cb1a65591a5ec8a82e0a2248"
integrity sha512-hsApuzPGAYxkQpcVlVLcY4GSgZAyrOzLLt+CQGj9XM1Lep99kiJuLysyNP0ZxRzmT/kKjx4jvIA8Mi81Ui5pkw==
kolibri-design-system@4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.4.0.tgz#4c230a701beafa9c87dc155b81e68128b02a4bfe"
integrity sha512-2oYNVkmY1NcXc3mNJVcphfT/glqQEriq72r0LEN3ILpGOitS99x/sGyHNOQmmww9h8/m4KBAAlD0D8IyE1xd0A==
dependencies:
"@vue/composition-api" "1.7.2"
aphrodite "https://github.com/learningequality/aphrodite/"
Expand All @@ -7724,6 +7733,7 @@ [email protected]:
purecss "2.2.0"
tippy.js "4.2.1"
vue-intl "3.1.0"
vue2-teleport "1.1.4"
xstate "4.38.3"

launch-editor-middleware@^2.8.0:
Expand Down Expand Up @@ -10587,16 +10597,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -10655,14 +10656,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -11645,7 +11639,7 @@ [email protected]:
vue-observe-visibility "^0.4.4"
vue-resize "^0.4.5"

vue2-teleport@^1.1.4:
[email protected]:
version "1.1.4"
resolved "https://registry.yarnpkg.com/vue2-teleport/-/vue2-teleport-1.1.4.tgz#30c84b1005bf9c208b1c05f4b6147300c54ee846"
integrity sha512-mGTszyQP6k3sSSk7MBq+PZdVojHYLwg5772hl3UVpu5uaLBqWIZ5eNP6/TjkDrf1XUTTxybvpXC6inpjwO+i/Q==
Expand Down Expand Up @@ -11974,16 +11968,7 @@ word-wrap@^1.2.5:
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down
Loading