Skip to content

Commit 5004ce6

Browse files
author
Tim Berners-Lee
committed
Tweaks to checkUser code to reduce unnecessary signin boxes. two more icons
1 parent a5a9459 commit 5004ce6

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

lib/icons/noun_19460_green.svg

Lines changed: 1 addition & 0 deletions
Loading

lib/icons/noun_45961.svg

Lines changed: 1 addition & 0 deletions
Loading

lib/signin.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ UI.widgets.loadPreferences = function(context) {
133133
var pending;
134134
if (box) {
135135
pending = UI.widgets.errorMessageBlock(context.dom,
136-
"(loading preferences " + preferencesFile+ ")");
136+
"(loading preferences " + preferencesFile+ ")", "straw");
137137
box.appendChild(pending);
138138
}
139139
kb.fetcher.load(preferencesFile).then(function(xhr){
@@ -142,7 +142,7 @@ UI.widgets.loadPreferences = function(context) {
142142
}
143143
resolve(context);
144144
}).catch(function(err){
145-
reject("Error loading preferences file" + err)
145+
reject("Error loading preferences file. " + err)
146146
});
147147
});
148148
};
@@ -529,13 +529,17 @@ UI.widgets.userCheckSite = 'https://databox.me/';
529529

530530

531531
UI.widgets.checkUser = function(doc, setIt) {
532+
var kb = UI.store
532533

533534
if (typeof $SolidTestEnvironment !== 'undefined' && $SolidTestEnvironment.username){ // Test setup
535+
tabulator.preferences.set('me', $SolidTestEnvironment.username)
534536
return setIt($SolidTestEnvironment.username)
535537
}
538+
var me_uri = tabulator.preferences.get('me')
539+
if (me_uri) return setIt(me_uri)
540+
536541
var userMirror = UI.store.any(doc, UI.ns.link('userMirror'));
537542
if (!userMirror) userMirror = doc;
538-
var kb = UI.store
539543
kb.fetcher.nowOrWhenFetched(userMirror.uri, undefined, function(ok, body) {
540544
if (!ok) {
541545
var message = "checkUser: Unable to load " + userMirror.uri + ": " + body;

lib/widgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ widgetModule.fieldLabel = function (dom, property, form) {
934934

935935
widgetModule.errorMessageBlock = function (dom, msg, backgroundColor) {
936936
var div = dom.createElement('div')
937-
div.setAttribute('style', 'padding: 0.5em; border: 0.5px solid black; background-color: ' +
937+
div.setAttribute('style', 'margin: 0.1em; padding: 0.5em; border: 0.05em solid gray; background-color: ' +
938938
(backgroundColor || '#fee') + '; color:black;')
939939
div.textContent = msg
940940
return div

0 commit comments

Comments
 (0)