fix ku#25 add option for textonly to avoid title duplication in case …

…of textonly + title
timotheecour · Aug 11, 2018 · 3fafbe7 · 3fafbe7
1 parent 18e7d8d
commit 3fafbe7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/extension/options.html b/extension/options.html
@@ -62,6 +62,8 @@ <h2>Variables</h2>
     <dl id="variables">
       <dt>%text%</dt>
       <dd>Selected text or page title. All newlines are converted to " ".</dd>
+      <dt>%textonly%</dt>
+      <dd>Selected text. All newlines are converted to " ".</dd>
       <dt>%text_n%</dt>
       <dd>Selected text or page title. All newlines are copied as they are.</dd>
       <dt>%text_br%</dt>

diff --git a/spec/createlink-spec.js b/spec/createlink-spec.js
@@ -77,6 +77,14 @@ describe("CreateLink", () => {
       var t = createLink.formatLinkText({format: "%text%"}, url, "ONE\nTWO", title, [])
       expect(t).toEqual("ONE TWO")
     })
+    it("replaces %textonly%", () => {
+      var t = createLink.formatLinkText({format: "%textonly%"}, url, "ONE\nTWO", title, [])
+      expect(t).toEqual("ONE TWO")
+    })
+    it("replaces %textonly%", () => {
+      var t = createLink.formatLinkText({format: "%textonly%"}, url, undefined, title, [])
+      expect(t).toEqual(title)
+    })
     xit("replaces %text_n%", () => {})
     xit("replaces %text_br%", () => {})
     xit("replaces %text_md%", () => {})

diff --git a/src/createlink.js b/src/createlink.js
@@ -19,12 +19,13 @@ class CreateLink {
     return Promise.resolve(data);
   }
 
-  formatLinkText(def, url, text, title, inputs) {
+  formatLinkText(def, url, text, textonly, title, inputs) {
     text = text || ''
 
     var data = def.format.
       replace(/%url%/g, url).
       replace(/%text%/g, text.replace(/\n/g, ' ')).
+      replace(/%textonly%/g, textonly.replace(/\n/g, ' ')).
       replace(/%text_n%/g, text).
       replace(/%text_br%/g, text.replace(/\n/g, '<br />\n')).
       replace(/%text_md%/g, text.replace(/[|\\`*_{}\[\]()#+\-.!]/g, '\\$&')).
@@ -60,15 +61,16 @@ class CreateLink {
       url = info.linkUrl || info.pageUrl || tab.url;
     }
     var text = info.selectionText || tab.title;
+    var textonly = info.selectionText;
     var title = tab.title;
 
     var def = this.formats[formatId]
-    return this.formatString(tab.id, def, url, text, title)
+    return this.formatString(tab.id, def, url, text, textonly, title)
   }
 
-  formatString(tabId, def, url, text, title) {
+  formatString(tabId, def, url, text, textonly, title) {
     return this.getInputs(def, tabId).then( (inputs) => {
-      const linkText = this.formatLinkText(def, url, text, title, inputs)
+      const linkText = this.formatLinkText(def, url, text, textonly, title, inputs)
       return this.applyFilter(tabId, def, linkText)
     })
   }