diff --git a/flomo-chrome/READNE.md b/flomo/READNE.md similarity index 76% rename from flomo-chrome/READNE.md rename to flomo/READNE.md index 20684a5..3d392a5 100644 --- a/flomo-chrome/READNE.md +++ b/flomo/READNE.md @@ -1,40 +1,37 @@ -# flomo for chrome -> 我的第一个chrome 插件竟然给了[flomo](http://flomoapp.com/) +# flomo +> 我的第一个Edge 插件竟然给了[flomo](http://flomoapp.com/) **目前还未上架,只能以压缩包形式安装** ### 更新说明 +#### v1.0.8 +- 新增修改默认tag + #### v1.0.7 - 优化快捷记录,默认关闭(需要去设置页面启用) -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm747c4du4j30ox0f7gmc.jpg) #### v1.0.6 (开启UI优化之路) - 优化popup -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm6sw4xwlnj30cc0c8aao.jpg) #### v1.0.5(处于完善) - 优化扩展页面无logo -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm4h6t9zu0j30b3062a9y.jpg) #### v1.0.4(更快捷Send Text to flomo) - 选中文字出现flomo 图标,点击即可发送到flomo(少楠的意见) -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm3pldp5hgj306b01wmwz.jpg) #### v1.0.3 (在浏览器上随时随地的记录) - 增加搜索建议,输入memo ,然后回车输入任意文字,点击enter即可保存到flomo - 通知优化,使用chrome通知 -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm3po6fpkzj312j06gjrj.jpg) #### v1.0.2 - Save LInk to flomo 新增 title(预览如下图) -![](https://tva1.sinaimg.cn/large/0081Kckwgy1gm3ax2zhgyj30il02a744.jpg) #### v1.0.1 - 初始版本提交 @@ -65,7 +62,7 @@ - Save Link to flomo(当前网页地址 ) - Save Text to flomo(复制的文字 + 当前网页地址 ) -- 默认 #chrome 标签 +- 默认 #Edge 标签 diff --git a/flomo-chrome/background.html b/flomo/background.html similarity index 100% rename from flomo-chrome/background.html rename to flomo/background.html diff --git a/flomo-chrome/css/comm.css b/flomo/css/comm.css similarity index 100% rename from flomo-chrome/css/comm.css rename to flomo/css/comm.css diff --git a/flomo-chrome/css/options.css b/flomo/css/options.css similarity index 100% rename from flomo-chrome/css/options.css rename to flomo/css/options.css diff --git a/flomo-chrome/css/popup.css b/flomo/css/popup.css similarity index 100% rename from flomo-chrome/css/popup.css rename to flomo/css/popup.css diff --git a/flomo-chrome/js/background.js b/flomo/js/background.js similarity index 83% rename from flomo-chrome/js/background.js rename to flomo/js/background.js index a1d8d8c..c49f95c 100644 --- a/flomo-chrome/js/background.js +++ b/flomo/js/background.js @@ -1,139 +1,140 @@ -chrome.storage.sync.set({ - quick_enabled: false, -}); - - -chrome.contextMenus.create({ - type: "normal", - title: "Save Text to flomo(#chrome)", - id: "flomoText", - onclick: sendToFlomoWithText, - contexts: ["selection"], -}); - -chrome.contextMenus.create({ - type: "normal", - title: "Save Link to flomo", - id: "flomoLink", - onclick: sendToFlomoWithLink, -}); - - -function sendToFlomoWithLink(tab) { - var url = localStorage.api || ""; - var opt = null; - var content = ""; - if (url == "") { - alert("请填写API后才能使用呃~(右键)"); - } else { - - chrome.tabs.getSelected(null, function (tab) { - var tag = localStorage.tag?localStorage.tag:'#chrome ' - content = "#"+ tag + " 标题:" + tab.title + ",来自:" + tab.url; - - var data = { - content: content, - }; - - sendToFlomo(data, url); - }); - } -} - -function sendToFlomoWithText(info, tab) { - var url = localStorage.api || ""; - var opt = null; - var content = ""; - var currentUrl = ""; - if (url == "") { - alert("请填写API后才能使用呃~(右键)"); - } else { - chrome.tabs.getSelected(null, function (tab) { - currentUrl = tab.url; - var tag = localStorage.tag?localStorage.tag:'#chrome ' - content = "#"+tag + " "+ info.selectionText + " 来自:" + currentUrl; - var data = { - content: content, - }; - - sendToFlomo(data, url); - }); - } -} - -function sendToFlomo(data, url) { - $.ajax({ - url: url, - type: "POST", - dataType: "json", - contentType: "application/json; charset=utf-8", - data: JSON.stringify(data), - success: function (data) { - console.log("succes: " + data); - if (data.code == 0) { - alert(data.message); - } else { - alert(data.message); - } - }, - }); -} - -chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) { - if(message.type=='text'){ - chrome.contextMenus.update("flomoText", { - title: "Send Text to flomo(#"+localStorage.tag+")“" + message.content + "”", - }); - } - chrome.storage.sync.get("quick_enabled", function (obj) { - var checked = obj.quick_enabled; - if (checked) { - chrome.tabs.getSelected(null, function (tab) { - currentUrl = tab.url; - content = +localStorage.tag?localStorage.tag:'#chrome ' + " "+ message + " 来自:" + currentUrl; - var data = { - content: content, - }; - var url = localStorage.api || ""; - sendToFlomo(data, url); - }); - } - }) - -}); - -chrome.omnibox.onInputChanged.addListener((text, suggest) => { - console.log("inputChanged: " + text); - if (!text) return; - suggest([ - { content: "#chrome " + text, description: "保存到flomo ===>>> " + text }, - { content: "flomo", description: "回到flomo https://flomoapp.com/mine" }, - ]); -}); - -chrome.omnibox.onInputEntered.addListener((text) => { - console.log("inputEntered: " + text); - if (!text) return; - if (text == "flomo") { - openUrlCurrentTab("https://flomoapp.com/mine"); - } else { - var data = { - content: text, - }; - var url = localStorage.api || ""; - sendToFlomo(data, url); - } -}); - -// 获取当前选项卡ID -function getCurrentTabId(callback) { - chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) { - if (callback) callback(tabs.length ? tabs[0].id : null); - }); -} -// 当前标签打开某个链接 -function openUrlCurrentTab(url) { - getCurrentTabId((tabId) => { - chrome.tabs.update(tabId, { url: url }); - }); -} +chrome.storage.sync.set({ + quick_enabled: false, +}); + + +chrome.contextMenus.create({ + type: "normal", + title: "Save Text to flomo(#Edge)", + id: "flomoText", + onclick: sendToFlomoWithText, + contexts: ["selection"], +}); + +chrome.contextMenus.create({ + type: "normal", + title: "Save Link to flomo", + id: "flomoLink", + onclick: sendToFlomoWithLink, +}); + + +function sendToFlomoWithLink(tab) { + var url = localStorage.api || ""; + var opt = null; + var content = ""; + if (url == "") { + alert("请填写API后才能使用呃~(右键)"); + } else { + + chrome.tabs.getSelected(null, function (tab) { + var tag = localStorage.tag?localStorage.tag:'Edge ' + content = "#"+ tag + " 标题:" + tab.title + ",来自:" + tab.url; + + var data = { + content: content, + }; + + sendToFlomo(data, url); + }); + } +} + +function sendToFlomoWithText(info, tab) { + var url = localStorage.api || ""; + var opt = null; + var content = ""; + var currentUrl = ""; + if (url == "") { + alert("请填写API后才能使用呃~(右键)"); + } else { + chrome.tabs.getSelected(null, function (tab) { + currentUrl = tab.url; + var tag = localStorage.tag?localStorage.tag:'Edge ' + content = "#"+tag + " "+ info.selectionText + " 来自:" + currentUrl; + var data = { + content: content, + }; + + sendToFlomo(data, url); + }); + } +} + +function sendToFlomo(data, url) { + $.ajax({ + url: url, + type: "POST", + dataType: "json", + contentType: "application/json; charset=utf-8", + data: JSON.stringify(data), + success: function (data) { + console.log("succes: " + data); + if (data.code == 0) { + alert(data.message); + } else { + alert(data.message); + } + }, + }); +} + +chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) { + if(message.type=='text'){ + var tag = localStorage.tag?localStorage.tag:'Edge' + chrome.contextMenus.update("flomoText", { + title: "Send Text to flomo(#"+ tag +")“" + message.content + "”", + }); + } + chrome.storage.sync.get("quick_enabled", function (obj) { + var checked = obj.quick_enabled; + if (checked) { + chrome.tabs.getSelected(null, function (tab) { + currentUrl = tab.url; + content = +localStorage.tag?localStorage.tag:'#Edge ' + " "+ message + " 来自:" + currentUrl; + var data = { + content: content, + }; + var url = localStorage.api || ""; + sendToFlomo(data, url); + }); + } + }) + +}); + +chrome.omnibox.onInputChanged.addListener((text, suggest) => { + console.log("inputChanged: " + text); + if (!text) return; + suggest([ + { content: "#Edge " + text, description: "保存到flomo ===>>> " + text }, + { content: "flomo", description: "回到flomo https://flomoapp.com/mine" }, + ]); +}); + +chrome.omnibox.onInputEntered.addListener((text) => { + console.log("inputEntered: " + text); + if (!text) return; + if (text == "flomo") { + openUrlCurrentTab("https://flomoapp.com/mine"); + } else { + var data = { + content: text, + }; + var url = localStorage.api || ""; + sendToFlomo(data, url); + } +}); + +// 获取当前选项卡ID +function getCurrentTabId(callback) { + chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) { + if (callback) callback(tabs.length ? tabs[0].id : null); + }); +} +// 当前标签打开某个链接 +function openUrlCurrentTab(url) { + getCurrentTabId((tabId) => { + chrome.tabs.update(tabId, { url: url }); + }); +} diff --git a/flomo-chrome/js/core.js b/flomo/js/core.js similarity index 96% rename from flomo-chrome/js/core.js rename to flomo/js/core.js index 5cb70fb..c1b0204 100644 --- a/flomo-chrome/js/core.js +++ b/flomo/js/core.js @@ -1,58 +1,58 @@ -window.onload = function () { - var objImg = new Image(); - objImg.src = "https://flomoapp.com/images/logo-192x192.png"; - objImg.alt = "send Text to flomo"; - objImg.title = "将选中的文字发送到flomo"; - objImg.style.display = "none"; - objImg.style.position = "absolute"; - objImg.style.cursor = "pointer"; - objImg.style.zIndex = "9999999999"; - objImg.style.width = "25px"; - objImg.style.height = "25px"; - objImg.style.borderRadius = "5px"; - objImg.style.border = "1px solid lightgray"; - document.body.appendChild(objImg); - - function selectText() { - if (document.selection) { - //For ie - return document.selection.createRange().text; - } else { - return window.getSelection().toString(); - } - } - document.onmouseup = function (ev) { - var ev = ev || window.event, - left = ev.clientX, - top = ev.clientY; - - chrome.storage.sync.get("quick_enabled", function (obj) { - var checked = obj.quick_enabled; - if (checked) { - setTimeout(function () { - if (selectText().length > 0) { - setTimeout(function () { - objImg.style.display = "block"; - objImg.style.left = left + "px"; - objImg.style.top = top + "px"; - }, 100); - } - }, 200); - }else{ - chrome.runtime.sendMessage({type:'text',content: selectText()}); - } - }); - }; - objImg.onclick = function (ev) { - var text = selectText(); - chrome.runtime.sendMessage(text); - }; - //鼠标松开会触发document的mouseup事件/冒泡 - objImg.onmouseup = function (ev) { - var ev = ev || window.event; - ev.cancelBubble = true; - }; - document.onclick = function (ev) { - objImg.style.display = "none"; - }; -}; +window.onload = function () { + var objImg = new Image(); + objImg.src = "https://flomoapp.com/images/logo-192x192.png"; + objImg.alt = "send Text to flomo"; + objImg.title = "将选中的文字发送到flomo"; + objImg.style.display = "none"; + objImg.style.position = "absolute"; + objImg.style.cursor = "pointer"; + objImg.style.zIndex = "9999999999"; + objImg.style.width = "25px"; + objImg.style.height = "25px"; + objImg.style.borderRadius = "5px"; + objImg.style.border = "1px solid lightgray"; + document.body.appendChild(objImg); + + function selectText() { + if (document.selection) { + //For ie + return document.selection.createRange().text; + } else { + return window.getSelection().toString(); + } + } + document.onmouseup = function (ev) { + var ev = ev || window.event, + left = ev.clientX, + top = ev.clientY; + + chrome.storage.sync.get("quick_enabled", function (obj) { + var checked = obj.quick_enabled; + if (checked) { + setTimeout(function () { + if (selectText().length > 0) { + setTimeout(function () { + objImg.style.display = "block"; + objImg.style.left = left + "px"; + objImg.style.top = top + "px"; + }, 100); + } + }, 200); + }else{ + chrome.runtime.sendMessage({type:'text',content: selectText()}); + } + }); + }; + objImg.onclick = function (ev) { + var text = selectText(); + chrome.runtime.sendMessage(text); + }; + //鼠标松开会触发document的mouseup事件/冒泡 + objImg.onmouseup = function (ev) { + var ev = ev || window.event; + ev.cancelBubble = true; + }; + document.onclick = function (ev) { + objImg.style.display = "none"; + }; +}; diff --git a/flomo-chrome/js/jquery-1.9.1.min.js b/flomo/js/jquery-1.9.1.min.js similarity index 100% rename from flomo-chrome/js/jquery-1.9.1.min.js rename to flomo/js/jquery-1.9.1.min.js diff --git a/flomo-chrome/js/options.js b/flomo/js/options.js similarity index 96% rename from flomo-chrome/js/options.js rename to flomo/js/options.js index f781cf1..29493a6 100644 --- a/flomo-chrome/js/options.js +++ b/flomo/js/options.js @@ -10,7 +10,7 @@ } }; - var tag = localStorage.tag || ""; + var tag = localStorage.tag || "Edge"; document.getElementById("tag").value = tag; document.getElementById("saveTag").onclick = function () { localStorage.tag = document.getElementById("tag").value; diff --git a/flomo-chrome/js/popup.js b/flomo/js/popup.js similarity index 97% rename from flomo-chrome/js/popup.js rename to flomo/js/popup.js index 74867f2..aaef205 100644 --- a/flomo-chrome/js/popup.js +++ b/flomo/js/popup.js @@ -1,10 +1,10 @@ -(function() { - document.addEventListener('DOMContentLoaded', function() { - for (const anchor of document.getElementsByTagName('a')) { - anchor.onclick = () => { - chrome.tabs.create({ active: true, url: anchor.href }); - }; - }; - }); - +(function() { + document.addEventListener('DOMContentLoaded', function() { + for (const anchor of document.getElementsByTagName('a')) { + anchor.onclick = () => { + chrome.tabs.create({ active: true, url: anchor.href }); + }; + }; + }); + })(); \ No newline at end of file diff --git a/flomo-chrome/logo-16.png b/flomo/logo-16.png similarity index 100% rename from flomo-chrome/logo-16.png rename to flomo/logo-16.png diff --git a/flomo-chrome/logo.png b/flomo/logo.png similarity index 100% rename from flomo-chrome/logo.png rename to flomo/logo.png diff --git a/flomo-chrome/logoBig.png b/flomo/logoBig.png similarity index 100% rename from flomo-chrome/logoBig.png rename to flomo/logoBig.png diff --git a/flomo-chrome/manifest.json b/flomo/manifest.json similarity index 93% rename from flomo-chrome/manifest.json rename to flomo/manifest.json index 9175b2e..50ad717 100644 --- a/flomo-chrome/manifest.json +++ b/flomo/manifest.json @@ -1,12 +1,11 @@ { "name": "flomo", "description": "flomo for chrome", - "version": "1.0.1", + "version": "1.0.8", "manifest_version": 2, "icons": { "16": "logo-16.png", - "48": "logo.png", - "128": "logo.png" + "48": "logoBig.png" }, "browser_action": { "default_popup": "popup.html", diff --git a/flomo-chrome/options.html b/flomo/options.html similarity index 92% rename from flomo-chrome/options.html rename to flomo/options.html index 5694ba8..c665da4 100644 --- a/flomo-chrome/options.html +++ b/flomo/options.html @@ -17,7 +17,7 @@
-
flomo for Chrome
+
flomo
@@ -43,7 +43,7 @@
diff --git a/flomo-chrome/popup.html b/flomo/popup.html similarity index 95% rename from flomo-chrome/popup.html rename to flomo/popup.html index 24696c4..a8ca11c 100644 --- a/flomo-chrome/popup.html +++ b/flomo/popup.html @@ -10,7 +10,7 @@
-

flomo for Chrome

+

flomo

Github 设置API 注册 flomo