Skip to content

Commit a9805f1

Browse files
sachinchauhan2889dependabot-preview[bot]
sachinchauhan2889
and
dependabot-preview[bot]
committed
align-modal
fix-all-modals-crpper chore(deps-dev): bump @sentry/tracing from 5.27.0 to 5.27.1 (#5372) Bumps [@sentry/tracing](https://github.com/getsentry/sentry-javascript) from 5.27.0 to 5.27.1. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-javascript@5.27.0...5.27.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> chore(deps-dev): bump mini-css-extract-plugin from 1.1.2 to 1.2.0 (#5371) Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/mini-css-extract-plugin@v1.1.2...v1.2.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
1 parent bbdbe76 commit a9805f1

File tree

6 files changed

+128
-19
lines changed

6 files changed

+128
-19
lines changed

‎app/components/modals/modal-base.js‎

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,50 @@ import { isTesting } from 'open-event-frontend/utils/testing';
77

88
export default UiModal.extend({
99
tagName : 'div',
10+
classNames : ['centered-modal'],
1011
classNameBindings : ['isFullScreen:fullscreen', 'isSmall:small', 'isLarge:large'],
1112

1213
openObserver: observer('isOpen', function() {
1314
const $element = $(this.element);
1415
if (this.isOpen) {
15-
$element.modal('show');
16+
$element.modal({
17+
centered : false,
18+
duration : isTesting ? 0 : 200,
19+
dimmerSettings : {
20+
dimmerName : `${this.elementId}-modal-dimmer`,
21+
variation : 'inverted'
22+
},
23+
onHide: () => {
24+
this.set('isOpen', false);
25+
if (this.onHide) {
26+
this.onHide();
27+
}
28+
},
29+
onDeny: () => {
30+
if (this.onDeny) {
31+
this.onDeny();
32+
}
33+
return true;
34+
},
35+
onApprove: () => {
36+
if (this.onApprove) {
37+
this.onApprove();
38+
}
39+
return true;
40+
},
41+
42+
onVisible: () => {
43+
this.set('isOpen', true);
44+
const $element = $(this.element);
45+
$element.modal('refresh');
46+
$element.find('[data-content]').popup({
47+
inline: true
48+
});
49+
if (this.onVisible) {
50+
this.onVisible();
51+
}
52+
}
53+
}).modal('show');
1654
} else {
1755
$element.modal('hide');
1856
}
@@ -91,7 +129,44 @@ export default UiModal.extend({
91129

92130
didInitSemantic() {
93131
if (this.isOpen) {
94-
$(this.element).modal('show');
132+
$(this.element).modal({
133+
centered : false,
134+
duration : isTesting ? 0 : 200,
135+
dimmerSettings : {
136+
dimmerName : `${this.elementId}-modal-dimmer`,
137+
variation : 'inverted'
138+
},
139+
onHide: () => {
140+
this.set('isOpen', false);
141+
if (this.onHide) {
142+
this.onHide();
143+
}
144+
},
145+
onDeny: () => {
146+
if (this.onDeny) {
147+
this.onDeny();
148+
}
149+
return true;
150+
},
151+
onApprove: () => {
152+
if (this.onApprove) {
153+
this.onApprove();
154+
}
155+
return true;
156+
},
157+
158+
onVisible: () => {
159+
this.set('isOpen', true);
160+
const $element = $(this.element);
161+
$element.modal('refresh');
162+
$element.find('[data-content]').popup({
163+
inline: true
164+
});
165+
if (this.onVisible) {
166+
this.onVisible();
167+
}
168+
}
169+
}).modal('show');
95170
}
96171
}
97172
});

‎app/components/modals/tax-info-modal.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import { orderBy } from 'lodash-es';
77

88
export default ModalBase.extend(FormMixin, {
99
isSmall : false,
10-
options : {
11-
closable: false
12-
},
1310

1411
autoScrollToErrors : true,
1512
isTaxIncludedInPrice : 'include',

‎app/styles/partials/overrides.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,8 @@ body.dimmable.undetached.dimmed {
7676
}
7777
}
7878
}
79+
80+
.centered-modal {
81+
margin-left: auto !important;
82+
margin-top: auto !important;
83+
}

‎app/templates/components/modals/tax-info-modal.hbs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<i class="black close icon"></i>
12
<div class="header">
23
{{t 'Add tax information'}}
34
</div>

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@open-event/theme": "^0.2.2",
3737
"@sentry/browser": "^5.27.0",
3838
"@sentry/integrations": "^5.27.0",
39-
"@sentry/tracing": "^5.27.0",
39+
"@sentry/tracing": "^5.27.1",
4040
"@types/ember": "^3.16.1",
4141
"@types/ember-data": "^3.16.6",
4242
"@types/ember-qunit": "^3.4.12",
@@ -139,7 +139,7 @@
139139
"http-status": "^1.4.2",
140140
"loader.js": "^4.7.0",
141141
"lodash-es": "^4.17.15",
142-
"mini-css-extract-plugin": "^1.1.2",
142+
"mini-css-extract-plugin": "^1.2.0",
143143
"moment-timezone": "^0.5.31",
144144
"npm-run-all": "^4.1.5",
145145
"object-to-formdata": "^4.1.0",

‎yarn.lock‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,6 +1755,15 @@
17551755
"@sentry/utils" "5.27.0"
17561756
tslib "^1.9.3"
17571757

1758+
"@sentry/[email protected]":
1759+
version "5.27.1"
1760+
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.27.1.tgz#c95faaf18257c365acc09246fafd27276bfd6a2f"
1761+
integrity sha512-RBHo3T92s6s4Ian1pZcPlmNtFqB+HAP6xitU+ZNA48bYUK+R1vvqEcI8Xs83FyNaRGCgclp9erDFQYyAuxY4vw==
1762+
dependencies:
1763+
"@sentry/types" "5.27.1"
1764+
"@sentry/utils" "5.27.1"
1765+
tslib "^1.9.3"
1766+
17581767
"@sentry/integrations@^5.27.0":
17591768
version "5.27.0"
17601769
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.27.0.tgz#8760bd0827db07fc72f90026d64df88e653a9e28"
@@ -1774,22 +1783,36 @@
17741783
"@sentry/types" "5.27.0"
17751784
tslib "^1.9.3"
17761785

1777-
"@sentry/tracing@^5.27.0":
1778-
version "5.27.0"
1779-
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-5.27.0.tgz#133b03a02640a0d63d11f341a00e96315c9d0303"
1780-
integrity sha512-h82VmO4loeWd5bMFgNWBO+eY6bEpPt5iRc1YZouC10fouhlzw2O4p2A4n1/rVQ+eIKAsfkkgsjEuKBnTPxDAsw==
1786+
"@sentry/minimal@5.27.1":
1787+
version "5.27.1"
1788+
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.27.1.tgz#d6ce881ba3c262db29520177a4c1f0e0f5388697"
1789+
integrity sha512-MHXCeJdA1NAvaJuippcM8nrWScul8iTN0Q5nnFkGctGIGmmiZHTXAYkObqJk7H3AK+CP7r1jqN2aQj5Nd9CtyA==
17811790
dependencies:
1782-
"@sentry/hub" "5.27.0"
1783-
"@sentry/minimal" "5.27.0"
1784-
"@sentry/types" "5.27.0"
1785-
"@sentry/utils" "5.27.0"
1791+
"@sentry/hub" "5.27.1"
1792+
"@sentry/types" "5.27.1"
1793+
tslib "^1.9.3"
1794+
1795+
"@sentry/tracing@^5.27.1":
1796+
version "5.27.1"
1797+
resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-5.27.1.tgz#198cd97514363369d29eef9b597be9332ab170c4"
1798+
integrity sha512-GBmdR8Ky/nv4KOa6+DEnOSBkFOFhM+asR8Y/gw2qSUWCwzKuWHh9BEnDwxtSI8CMvgUwOIZ5wiiqJGc1unYfCw==
1799+
dependencies:
1800+
"@sentry/hub" "5.27.1"
1801+
"@sentry/minimal" "5.27.1"
1802+
"@sentry/types" "5.27.1"
1803+
"@sentry/utils" "5.27.1"
17861804
tslib "^1.9.3"
17871805

17881806
"@sentry/[email protected]":
17891807
version "5.27.0"
17901808
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.0.tgz#cea288d02c727ef83541768b8738e6a829dfc831"
17911809
integrity sha512-coB2bMDxmzTwIWcXbzbnE2JtEqDkvmK9+KyZZNI/Mk3wwabFYqL7hOnqXB45/+hx+6l9/siWmB1l5um3tzqdOw==
17921810

1811+
"@sentry/[email protected]":
1812+
version "5.27.1"
1813+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.1.tgz#031480a4cf8f0b6e6337fb03ee884deedcef6f40"
1814+
integrity sha512-g1aX0V0fz5BTo0mjgSVY9XmPLGZ6p+8OEzq3ubKzDUf59VHl+Vt8viZ8VXw/vsNtfAjBHn7BzSuzJo7cXJJBtA==
1815+
17931816
"@sentry/[email protected]":
17941817
version "5.27.0"
17951818
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.27.0.tgz#21c15401b43041b1208521465c09c64eafc2e0ff"
@@ -1798,6 +1821,14 @@
17981821
"@sentry/types" "5.27.0"
17991822
tslib "^1.9.3"
18001823

1824+
"@sentry/[email protected]":
1825+
version "5.27.1"
1826+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.27.1.tgz#0ed9d9685aae6f4ef9eb6b9ebb81e361fd1c5452"
1827+
integrity sha512-VIzK8utuvFO9EogZcKJPgmLnlJtYbaPQ0jCw7od9HRw1ckrSBc84sA0uuuY6pB6KSM+7k6EjJ5IdIBaCz5ep/A==
1828+
dependencies:
1829+
"@sentry/types" "5.27.1"
1830+
tslib "^1.9.3"
1831+
18011832
"@simple-dom/document@^1.4.0":
18021833
version "1.4.0"
18031834
resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678"
@@ -11973,10 +12004,10 @@ min-document@^2.19.0:
1197312004
dependencies:
1197412005
dom-walk "^0.1.0"
1197512006

11976-
mini-css-extract-plugin@^1.1.2:
11977-
version "1.1.2"
11978-
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.1.2.tgz#34877f631eb4bc8f9d99f0ade2ccacadb0317def"
11979-
integrity sha512-tIq578wiGzmo9Ll+JOgHPssV4eoMDTcj3MKkjPbzgooaakMklViJG1qbT0zcwoogUKKliFy/kKjUJaFb4DBHxQ==
12007+
mini-css-extract-plugin@^1.2.0:
12008+
version "1.2.0"
12009+
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.0.tgz#f1bdfa7bb6f6a238bc327f813f204283ea33ee36"
12010+
integrity sha512-iBZokjaIjHvI4N0AURx5aPBawcmxB/d2NYikxZ4J57Lg5sDShUPyWvuSWl1dueI5oCs7nz8V7qtOCaLjB7AYPw==
1198012011
dependencies:
1198112012
loader-utils "^2.0.0"
1198212013
schema-utils "^3.0.0"

0 commit comments

Comments
 (0)