Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 61968adf94 |
@@ -54,3 +54,9 @@ test('image conversion resizes oversized output and closes its decoded bitmap',a
|
|||||||
assert.equal(await c.readImage({type:'image/png',size:100},960),'data:image/png;base64,AA==');
|
assert.equal(await c.readImage({type:'image/png',size:100},960),'data:image/png;base64,AA==');
|
||||||
assert.equal(canvas.width,768);assert.equal(canvas.height,384);assert.equal(closed,1);
|
assert.equal(canvas.width,768);assert.equal(canvas.height,384);assert.equal(closed,1);
|
||||||
});
|
});
|
||||||
|
test('settings opened before login resolves reloads once after the account is known',()=>{
|
||||||
|
let loads=0;const c=vm.createContext({applyBranding(){},applyAppearance(){},currentUser:{id:'root'},appearanceOwner:'',activePage:'settings',branding:{},loadSettings(){loads++;}});
|
||||||
|
vm.runInContext(part(source,'function onAppearanceSession(','function resetAppearance('),c);
|
||||||
|
c.onAppearanceSession({values:{},defaults:{},revision:0});c.onAppearanceSession({values:{},defaults:{},revision:0});
|
||||||
|
assert.equal(loads,1);assert.equal(c.appearanceOwner,'root');
|
||||||
|
});
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ function onAppearanceSession(preferences){
|
|||||||
applyBranding();if(!currentUser||!preferences)return;
|
applyBranding();if(!currentUser||!preferences)return;
|
||||||
const first=appearanceOwner!==currentUser.id;appearanceOwner=currentUser.id;
|
const first=appearanceOwner!==currentUser.id;appearanceOwner=currentUser.id;
|
||||||
personalValues=preferences.values;personalRevision=preferences.revision;branding.defaults=preferences.defaults;applyAppearance();
|
personalValues=preferences.values;personalRevision=preferences.revision;branding.defaults=preferences.defaults;applyAppearance();
|
||||||
|
if(first&&activePage==='settings'){loadSettings();return;}
|
||||||
if(first&&activePage==='households'){
|
if(first&&activePage==='households'){
|
||||||
let page=effectiveAppearance().startPage;
|
let page=effectiveAppearance().startPage;
|
||||||
if(page==='heritage'&&(currentHome()?.kind&¤tHome().kind!=='home'||!isAdmin()&¤tUser.familyAccess==='none'&&!['read','edit'].includes(currentUser.heritageAccess)))page='overview';
|
if(page==='heritage'&&(currentHome()?.kind&¤tHome().kind!=='home'||!isAdmin()&¤tUser.familyAccess==='none'&&!['read','edit'].includes(currentUser.heritageAccess)))page='overview';
|
||||||
|
|||||||
Reference in New Issue
Block a user