diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2552b60b..5cab08ba 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -625,6 +625,18 @@
"message": "Get styles",
"description": "Help link text on the manage page e.g. https://userstyles.org"
},
+ "linkGetStylesInfo": {
+ "message": "This archive site was created by a userstyle community member to back up the slow and unresponsive userstyles.org. The archive updates its contents approximately once a day.",
+ "description": "Info shown when clicking the (i) icon of the uso-archive link in the manager"
+ },
+ "linkGetShareStyles": {
+ "message": "Get and share styles",
+ "description": "Link text for https://userstyles.world/ on the manage page"
+ },
+ "linkGetShareStylesInfo": {
+ "message": "The new community-driven userstyles.world site is created by userstyle authors in order to replace userstyles.org, which has been so slow and unresponsive for the past year that many authors stopped updating their styles.",
+ "description": "Info shown when clicking the (i) icon of the userstyles.world link in the manager"
+ },
"linkStylusWiki": {
"message": "Wiki",
"description": "Wiki link text on the manage page e.g. https://github.com/openstyles/stylus/wiki"
@@ -633,10 +645,6 @@
"message": "Translate",
"description": "Transifex link text on the manage page"
},
- "linkUSW": {
- "message": "Upload and discover styles on userstyles.world",
- "description": "Link text for https://userstyles.world/ on the manage page"
- },
"linterCSSLintIncompatible": {
"message": "CSSLint doesn't support $preprocessorname$ preprocessor",
"placeholders": {
diff --git a/js/dlg/message-box.js b/js/dlg/message-box.js
index 31de0726..423c39a3 100644
--- a/js/dlg/message-box.js
+++ b/js/dlg/message-box.js
@@ -53,6 +53,9 @@ messageBox.show = async ({
if (focusAccessibility.lastFocusedViaClick && document.activeElement) {
document.activeElement.dataset.focusedViaClick = '';
}
+ if (document.activeElement === messageBox._originalFocus) {
+ document.body.focus();
+ }
if (typeof onshow === 'function') {
onshow(messageBox.element);
diff --git a/js/dom.js b/js/dom.js
index a2893146..86ebf7c6 100644
--- a/js/dom.js
+++ b/js/dom.js
@@ -1,5 +1,6 @@
/* global FIREFOX debounce */// toolbox.js
/* global prefs */
+/* global t */// localization.js
'use strict';
/* exported
@@ -259,7 +260,7 @@ function moveFocus(rootElement, step) {
const activeIndex = step ? Math.max(step < 0 ? 0 : -1, elements.indexOf(activeEl)) : -1;
const num = elements.length;
if (!step) step = 1;
- for (let i = 1; i < num; i++) {
+ for (let i = 1; i <= num; i++) {
const el = elements[(activeIndex + i * step + num) % num];
if (!el.disabled && el.tabIndex >= 0) {
el.focus();
@@ -443,6 +444,7 @@ async function waitForSheet({
document.documentElement.setAttribute('lang', chrome.i18n.getUILanguage());
document.on('keypress', clickDummyLinkOnEnter);
document.on('wheel', changeFocusedInputOnWheel, {capture: true, passive: false});
+ document.on('click', showTooltipNote);
Promise.resolve().then(async () => {
if (!chrome.app) addFaviconFF();
@@ -451,6 +453,7 @@ async function waitForSheet({
});
onDOMready().then(() => {
+ splitLongTooltips();
debounce(addTooltipsToEllipsized, 500);
window.on('resize', () => debounce(addTooltipsToEllipsized, 100));
});
@@ -546,6 +549,34 @@ async function waitForSheet({
}
}
}
+
+ function showTooltipNote(event) {
+ const el = event.target.closest('[data-cmd=note]');
+ if (el) {
+ event.preventDefault();
+ window.messageBoxProxy.show({
+ className: 'note center-dialog',
+ contents: el.dataset.title || el.title,
+ buttons: [t('confirmClose')],
+ });
+ }
+ }
+
+ function splitLongTooltips() {
+ for (const el of $$('[title]')) {
+ el.dataset.title = el.title;
+ el.title = el.title.replace(/<\/?\w+>/g, ''); // strip html tags
+ if (el.title.length < 50) {
+ continue;
+ }
+ const newTitle = el.title
+ .split('\n')
+ .map(s => s.replace(/([^.][.。?!]|.{50,60},)\s+/g, '$1\n'))
+ .map(s => s.replace(/(.{50,80}(?=.{40,}))\s+/g, '$1\n'))
+ .join('\n');
+ if (newTitle !== el.title) el.title = newTitle;
+ }
+ }
})();
//#endregion
diff --git a/manage.html b/manage.html
index f6f9ea5c..8e119947 100644
--- a/manage.html
+++ b/manage.html
@@ -329,13 +329,21 @@