1.17.9

Fixed #2271 Configuration option to set separator of tab indices

Author: brookhong

README.md

@@ -587,6 +587,8 @@ Some functionalities are also available when you're using original pdf viewer, b
 | settings.caretViewport | null | Set it in format `[top, left, bottom, right]` to limit hints generation on `v` for entering visual mode, such as `[window.innerHeight / 2 - 10, 0, window.innerHeight / 2 + 10, window.innerWidth]` will make Surfingkeys generate Hints only for text that display on vertically middle of window. |
 | settings.mouseSelectToQuery | [] | All hosts that have enable feature -- mouse selection to query. |
 | settings.autoSpeakOnInlineQuery | false | Whether to automatically speak the query string with TTS on inline query. |
+| settings.showTabIndices | false | Whether to show tab numbers (indices) in the tab titles. |
+| settings.tabIndicesSeparator | "\|" | The separator between index and original title of a tab. |
 
 ### Example of settings.theme, below is to set font size of status bar
 

README_CN.md

@@ -572,6 +572,8 @@ Surfingkeys默认使用[这个markdown分析器](https://github.com/chjj/marked)
 | settings.caretViewport | null | 按`[top, left, bottom, right]`格式设置，可以限制按`v`进入可视模式时的选择范围。比如`[window.innerHeight / 2 - 10, 0, window.innerHeight / 2 + 10, window.innerWidth]`会使Surfingkeys只会为显示在窗口中间的文字生成拨号盘字符。|
 | settings.mouseSelectToQuery | [] | 所有启用鼠标选择查询功能的网站列表。 |
 | settings.autoSpeakOnInlineQuery | false | 是否在使用inline query时自动发声。 |
+| settings.showTabIndices | false | 是否在标签页标题上显示当前标签页的编号。 |
+| settings.tabIndicesSeparator | "\|" | 标签页编号与标签页原始标题之间的分隔符。 |
 
 ### settings.theme示例，修改状态栏字体
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Surfingkeys",
-  "version": "1.17.8",
+  "version": "1.17.9",
   "description": "Map your keys for web surfing, expand your browser with javascript and keyboard.",
   "main": "background.js",
   "directories": {

src/content_scripts/common/hints.js

@@ -354,10 +354,20 @@ div.hint-scrollable {
                 mouseEventModifiers[modKey] = true;
             }
             flashPressedLink(element,() => {
-                self.mouseoutLastElement();
-                dispatchMouseEvent(element, behaviours.mouseEvents, mouseEventModifiers);
-                dispatchSKEvent("observer", ['turnOn']);
-                lastMouseTarget = element;
+                if (tabbed && getBrowserName().startsWith("Safari")) {
+                    RUNTIME("openLink", {
+                        tab: {
+                            tabbed: tabbed,
+                            active: mouseEventModifiers.shiftKey
+                        },
+                        url: getHref(element)
+                    });
+                } else {
+                    self.mouseoutLastElement();
+                    dispatchMouseEvent(element, behaviours.mouseEvents, mouseEventModifiers);
+                    dispatchSKEvent("observer", ['turnOn']);
+                    lastMouseTarget = element;
+                }
 
                 if (behaviours.multipleHits) {
                     setTimeout(resetHints, 300);

src/content_scripts/common/runtime.js

@@ -86,6 +86,7 @@ const runtime = (function() {
             smoothScroll: true,
             startToShowEmoji: 2,
             stealFocusOnLoad: true,
+            tabIndicesSeparator: "|",
             tabsThreshold: 100,
             verticalTabs: true,
             textAnchorPat: /(^[\n\r\s]*\S{3,}|\b\S{4,})/g,

src/content_scripts/content.js

@@ -99,6 +99,12 @@ function applyRuntimeConf(normal) {
     });
 }
 
+const userConfPromise = new Promise(function (resolve, reject) {
+    document.addEventListener("surfingkeys:settingsFromSnippetsLoaded", () => {
+        resolve(runtime.conf);
+    }, {once: true});
+});
+
 function applySettings(api, normal, rs) {
     for (var k in rs) {
         if (runtime.conf.hasOwnProperty(k)) {
@@ -265,7 +271,9 @@ function start(browser) {
                 if (resp.index > 0) {
                     var showTabIndexInTitle = function () {
                         skipObserver = true;
-                        document.title = myTabIndex + " " + originalTitle;
+                        userConfPromise.then(function(conf) {
+                            document.title = myTabIndex + conf.tabIndicesSeparator + originalTitle;
+                        });
                     };
 
                     var myTabIndex = resp.index,

src/content_scripts/ui/llmchat.js

@@ -228,7 +228,7 @@ export default function (omnibar, front) {
         messages[0].content = opts && opts.system || "";
         omnibar.resultsDiv.className = "llmChat";
         if (!provider) {
-            provider = opts.provider || runtime.conf.defaultLLMProvider;
+            provider = opts && opts.provider || runtime.conf.defaultLLMProvider;
         }
         omnibar.resultsDiv.append(createElementWithContent('h4', provider));
         renderMessages();