1 parent
ee85497182
commit
54d5d34981
4 files changed
+26
-8
No files matched your search
@@ -32,12 +32,18 @@
|
|||||||
<Rose::Form as |form|>
|
<Rose::Form as |form|>
|
||||||
<form.radioGroup
|
<form.radioGroup
|
||||||
@name='theme'
|
@name='theme'
|
||||||
@selectedValue={{this.session.data.theme}}
|
@selectedValue={{or
|
||||||
|
this.session.data.theme
|
||||||
|
'system-default-theme'
|
||||||
|
}}
|
||||||
@changed={{route-action 'toggleTheme'}}
|
@changed={{route-action 'toggleTheme'}}
|
||||||
as |radioGroup|
|
as |radioGroup|
|
||||||
>
|
>
|
||||||
<dropdown.item>
|
<dropdown.item>
|
||||||
<radioGroup.radio @label={{t 'themes.system'}} />
|
<radioGroup.radio
|
||||||
|
@label={{t 'themes.system'}}
|
||||||
|
@value='system-default-theme'
|
||||||
|
/>
|
||||||
</dropdown.item>
|
</dropdown.item>
|
||||||
<dropdown.item>
|
<dropdown.item>
|
||||||
<radioGroup.radio
|
<radioGroup.radio
|
||||||
|
|||||||
@@ -350,8 +350,11 @@ module('Acceptance | authentication', function (hooks) {
|
|||||||
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
||||||
assert.ok(getRootElement().classList.contains('rose-theme-dark'));
|
assert.ok(getRootElement().classList.contains('rose-theme-dark'));
|
||||||
// toggle system default
|
// toggle system default
|
||||||
await click('[name="theme"][value=""]');
|
await click('[name="theme"][value="system-default-theme"]');
|
||||||
assert.notOk(currentSession().get('data.theme'));
|
assert.strictEqual(
|
||||||
|
currentSession().get('data.theme'),
|
||||||
|
'system-default-theme'
|
||||||
|
);
|
||||||
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
||||||
assert.notOk(getRootElement().classList.contains('rose-theme-dark'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-dark'));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -55,12 +55,18 @@
|
|||||||
<Rose::Form as |form|>
|
<Rose::Form as |form|>
|
||||||
<form.radioGroup
|
<form.radioGroup
|
||||||
@name='theme'
|
@name='theme'
|
||||||
@selectedValue={{this.session.data.theme}}
|
@selectedValue={{or
|
||||||
|
this.session.data.theme
|
||||||
|
'system-default-theme'
|
||||||
|
}}
|
||||||
@changed={{route-action 'toggleTheme'}}
|
@changed={{route-action 'toggleTheme'}}
|
||||||
as |radioGroup|
|
as |radioGroup|
|
||||||
>
|
>
|
||||||
<dropdown.item>
|
<dropdown.item>
|
||||||
<radioGroup.radio @label={{t 'themes.system'}} />
|
<radioGroup.radio
|
||||||
|
@label={{t 'themes.system'}}
|
||||||
|
@value='system-default-theme'
|
||||||
|
/>
|
||||||
</dropdown.item>
|
</dropdown.item>
|
||||||
<dropdown.item>
|
<dropdown.item>
|
||||||
<radioGroup.radio
|
<radioGroup.radio
|
||||||
|
|||||||
@@ -242,8 +242,11 @@ module('Acceptance | authentication', function (hooks) {
|
|||||||
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
||||||
assert.ok(getRootElement().classList.contains('rose-theme-dark'));
|
assert.ok(getRootElement().classList.contains('rose-theme-dark'));
|
||||||
// toggle system default
|
// toggle system default
|
||||||
await click('[name="theme"][value=""]');
|
await click('[name="theme"][value="system-default-theme"]');
|
||||||
assert.notOk(currentSession().get('data.theme'));
|
assert.strictEqual(
|
||||||
|
currentSession().get('data.theme'),
|
||||||
|
'system-default-theme'
|
||||||
|
);
|
||||||
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-light'));
|
||||||
assert.notOk(getRootElement().classList.contains('rose-theme-dark'));
|
assert.notOk(getRootElement().classList.contains('rose-theme-dark'));
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user