Added password for scuttle API. Fixed indentation. Added stub menu actions. Started working on bookmarking with scuttle API.

This commit is contained in:
yohan 2019-09-06 20:20:49 +02:00
parent 3a35cbfda4
commit d6ee98a263
4 changed files with 198 additions and 90 deletions

View File

@ -2,10 +2,19 @@ function onError(error) {
console.log(`Error: ${error}`); console.log(`Error: ${error}`);
} }
function onRemoved() {
console.log('Removed');
}
function onShared_remove(tab) {
console.log('Shared');
//var removing = tab.remove();
//removing.then(onRemoved, onError);
}
function shareURL(selectionContent,currentTab){ function shareURL(selectionContent,currentTab){
browser.storage.local.get(["instance_url","window_width","window_height","remove_querystrings","exceptUrlList"],function(item){ browser.storage.local.get(["instance_url","window_width","window_height","remove_querystrings","exceptUrlList"],function(item){
instance = item["instance_url"]; instance = item["instance_url"];
windowWidth = item["window_width"]; windowWidth = item["window_width"];
windowHeight = item["window_height"]; windowHeight = item["window_height"];
@ -57,6 +66,39 @@ function shareURL(selectionContent,currentTab){
}); });
} }
function shareURL_API(selectionContent,currentTab){
return new Promise((resolve, reject) => {
browser.storage.local.get(["instance_url","username","password","remove_querystrings","exceptUrlList"],function(item){
instance = item["instance_url"];
// Build formData object.
let formData = new FormData();
formData.append('name', 'John');
formData.append('password', 'John123');
fetch(instance+'/api/posts_add.php', { method: 'POST', body: formData })
.then(function (response) {
if (response.ok) {
return response.json();
} else {
return Promise.reject({
status: response.status,
statusText: response.statusText
});
}
})
.then(function (data) {
console.log('success', data);
resolve("OK");
})
.catch(function (error) {
console.log('error', error);
reject("KO");
});
});
})
}
browser.contextMenus.create({ browser.contextMenus.create({
id: "semantic-scuttle", id: "semantic-scuttle",
title: "Add to (Semantic)Scuttle", title: "Add to (Semantic)Scuttle",
@ -77,6 +119,68 @@ browser.contextMenus.create({
contexts: ["all"] contexts: ["all"]
}); });
browser.contextMenus.create({
id: "scuttle-session-save",
title: "Save and close all",
onclick: function(){
browser.tabs.query({}, function(tabs) {
for (let tab of tabs) {
if((tab.url.includes("about:reader?url=") == true) || (tab.url.includes("https://addons.mozilla.org/") == true)){
shareURL_API("",tab).then(onShared_remove, onError);
}
else
{
browser.tabs.sendMessage(tab.id, {method: "getSelection"})
.then(response => shareURL_API(response.response,tab))
.then(onShared_remove)
.catch(onError);
}
}
});
},
contexts: ["all"]
});
browser.contextMenus.create({
id: "scuttle-session-restore",
title: "Select session to restore",
onclick: function(){
browser.tabs.query({ currentWindow: true, active: true }, function(tabs) {
tab = tabs[0];
if((tab.url.includes("about:reader?url=") == true) || (tab.url.includes("https://addons.mozilla.org/") == true)){
shareURL("",tab);
}
else
{
browser.tabs.sendMessage(tab.id, {method: "getSelection"}).then(response => {
shareURL(response.response,tab);
}).catch(onError);
}
});
},
contexts: ["all"]
});
browser.contextMenus.create({
id: "scuttle-selector",
title: "Select urls to add",
onclick: function(){
browser.tabs.query({ currentWindow: true, active: true }, function(tabs) {
tab = tabs[0];
if((tab.url.includes("about:reader?url=") == true) || (tab.url.includes("https://addons.mozilla.org/") == true)){
shareURL("",tab);
}
else
{
browser.tabs.sendMessage(tab.id, {method: "getSelection"}).then(response => {
shareURL(response.response,tab);
}).catch(onError);
}
});
},
contexts: ["all"]
});
browser.contextMenus.create({ browser.contextMenus.create({
id: "my-scuttle", id: "my-scuttle",
title: "My (Semantic)Scuttle", title: "My (Semantic)Scuttle",

View File

@ -10,9 +10,11 @@
<form> <form>
<label>(Semantic)Scuttle instance URL <input type="text" id="instance_url" ></label><br /> <label>(Semantic)Scuttle instance URL <input type="text" id="instance_url" ></label><br />
<label>(Semantic)Scuttle username <input type="text" id="username" ></label><br /> <label>(Semantic)Scuttle username <input type="text" id="username" ></label><br />
<label>(Semantic)Scuttle password <input type="text" id="password" ></label><br />
<label>Window Width <input type="text" id="window_width" ></label><br /> <label>Window Width <input type="text" id="window_width" ></label><br />
<label>Window Height <input type="text" id="window_height" ></label><br /> <label>Window Height <input type="text" id="window_height" ></label><br />
<label>Remove querystrings from URL <input type="checkbox" id="remove_querystrings" ></label><label> Except for (separated by commas) <input type="text" id="exceptUrlList"></label><br /> <label>Remove querystrings from URL <input type="checkbox" id="remove_querystrings" ></label><br />
<label> Except for (separated by commas) <input type="text" id="exceptUrlList"></label><br />
<button type="submit">Save</button> <button type="submit">Save</button>
</form> </form>

View File

@ -3,6 +3,7 @@ function saveOptions(e) {
browser.storage.local.set({ browser.storage.local.set({
instance_url: document.querySelector("#instance_url").value , instance_url: document.querySelector("#instance_url").value ,
username: document.querySelector("#username").value , username: document.querySelector("#username").value ,
password: document.querySelector("#password").value ,
window_width: document.querySelector("#window_width").value , window_width: document.querySelector("#window_width").value ,
window_height: document.querySelector("#window_height").value, window_height: document.querySelector("#window_height").value,
remove_querystrings: document.querySelector("#remove_querystrings").checked, remove_querystrings: document.querySelector("#remove_querystrings").checked,
@ -15,6 +16,7 @@ function restoreOptions() {
function setCurrentChoices(result) { function setCurrentChoices(result) {
document.querySelector("#instance_url").value = result["instance_url"] || "http://semanticscuttle.sourceforge.net/"; document.querySelector("#instance_url").value = result["instance_url"] || "http://semanticscuttle.sourceforge.net/";
document.querySelector("#username").value = result["username"] || "Me"; document.querySelector("#username").value = result["username"] || "Me";
document.querySelector("#password").value = result["password"] || "Password";
document.querySelector("#window_width").value = result["window_width"] || "640"; document.querySelector("#window_width").value = result["window_width"] || "640";
document.querySelector("#window_height").value = result["window_height"] || "480"; document.querySelector("#window_height").value = result["window_height"] || "480";
document.querySelector("#remove_querystrings").checked = result["remove_querystrings"] || false; document.querySelector("#remove_querystrings").checked = result["remove_querystrings"] || false;