From a0eaf27791847489814866691909cf6fd0f841dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:16:41 +0000 Subject: [PATCH 1/3] Bump jquery-ui from 1.12.1 to 1.13.0 Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.12.1 to 1.13.0. - [Release notes](https://github.com/jquery/jquery-ui/releases) - [Commits](https://github.com/jquery/jquery-ui/compare/1.12.1...1.13.0) --- updated-dependencies: - dependency-name: jquery-ui dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 46ec0868..4ef7c884 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "backbone": "^1.4.0", "flux": "^3.1.3", "jquery": "^3.4.0", - "jquery-ui": "^1.12.1", + "jquery-ui": "^1.13.0", "marked": "^1.0.0", "prop-types": "^15.7.2", "q": "^1.5.1", diff --git a/yarn.lock b/yarn.lock index 6130ec46..9433d1a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2575,15 +2575,17 @@ jasmine@^3.1.0: glob "^7.1.4" jasmine-core "~3.5.0" -jquery-ui@^1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" - integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= +jquery-ui@^1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz#ab5ac65f37ca093c51b3478c4097f55bbc008f36" + integrity sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw== + dependencies: + jquery ">=1.8.0 <4.0.0" -jquery@^3.4.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" - integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ== +"jquery@>=1.8.0 <4.0.0", jquery@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" + integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" From c97e16a1da61ca5924630de37b84fea761ad8ef5 Mon Sep 17 00:00:00 2001 From: Cezary Sawicki Date: Tue, 16 Nov 2021 17:58:23 +0100 Subject: [PATCH 2/3] Fixed polish typo 'rewiznajch' to 'rewizjach' --- src/levels/intro/commits.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/levels/intro/commits.js b/src/levels/intro/commits.js index 2b593759..12bcc777 100644 --- a/src/levels/intro/commits.js +++ b/src/levels/intro/commits.js @@ -743,7 +743,7 @@ exports.level = { "", "Git przechowuje również całą historię, kiedy dokonano każdego zatwierdzenia. Dlatego większość commitów ma na sobie zmiany przodków -- oznaczamy to strzałkami w naszej wizualizacji. Zachowanie historii to świetna funkcja dla wszystkich, którzy pracują nad projektem!", "", - "To sporo do zapamiętania, ale na razie możesz myśleć o commitach jako \"rewiznajch\" albo migawkach projektu. Są bardzo lekkie, a przełączanie się między nimi jest niesamowicie szybkie!" + "To sporo do zapamiętania, ale na razie możesz myśleć o commitach jako \"rewizjach\" albo migawkach projektu. Są bardzo lekkie, a przełączanie się między nimi jest niesamowicie szybkie!" ] } }, From 20f834c08e00635573eecf7ae5c8794389ce4e73 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 28 Nov 2021 19:40:36 +0000 Subject: [PATCH 3/3] Resolves Issue #901 -- fix client math for height of text node --- src/js/visuals/visBranch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index 2d8ebc6e..533f933b 100644 --- a/src/js/visuals/visBranch.js +++ b/src/js/visuals/visBranch.js @@ -316,7 +316,7 @@ var VisBranch = VisBase.extend({ return firefoxFix({ w: maxWidth, - h: textNode.clientHeight + h: textNode.getBoundingClientRect().height, }); },