Add files via upload

fixes
added sidebar send current link

background.js

@@ -11,29 +11,39 @@ const popupModes = {
 let popupMode;
 
 browser.storage.sync.get({SdAmode:"", Backg:false, Servr:"https://snapdrop.net"}).then(function (result) {
+	sdURL = result.Servr;
+
 	popupMode = result.SdAmode;
 	switch (result.SdAmode) {
 		case popupModes.Sidebar:
 			popupListener();
+			sidebarInit();
+		case popupModes.Winpop:
+		case popupModes.Tab:
+			browser.browserAction.onClicked.addListener(browserActionClick);
 			break;
 		default: //classic popup
 			browser.browserAction.setPopup({popup: 'popup/popup.html'});
 			popupListener();
 			break;
 	}
 
-	sdURL = result.Servr;
-
 	if (result.Backg) {
 		snapdrop = new Snapdrop(sdURL.split("//")[1]);
 		browser.tabs.onUpdated.addListener(handleUpdated);
 		browser.tabs.onRemoved.addListener(handleRemoved);
 	}
 });
 
-browser.browserAction.onClicked.addListener(browserActionClick);
-browser.runtime.onMessage.addListener(_ => {
-	browser.runtime.reload();
+browser.runtime.onMessage.addListener(action => {
+	switch (action) {
+		case "reload":
+			browser.runtime.reload();
+			break;
+		case "sidebarClick":
+			sidebarListener();
+			break;
+	}
 });
 
 function popupListener() {
@@ -45,6 +55,31 @@ function popupListener() {
 			});
 }
 
+function sidebarListener() {
+	browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
+		if (message === "sidebarClick") {
+			browser.tabs.query({active: true}).then(tabs => {
+				sendResponse(tabs[0].url);
+			});
+		}
+		return true;
+	});
+}
+
+function sidebarInit() {
+	try {
+  	browser.contentScripts.register({
+		    matches: [sdURL+'/*'],
+		    js: [{file: "browser-polyfill.js"}, {file: "popup/sidebar.js"}],
+		    allFrames : true,
+		    runAt: "document_idle"
+		  });
+	} catch (error) {
+	  console.log(error);
+	}
+}
+
+
 function browserActionClick() { //only if not 'classic' Popup Mode
 	if (popupMode == popupModes.Sidebar) {
 		browser.sidebarAction.open(); //requieres direct user input handle

manifest.json

@@ -11,7 +11,7 @@
   "homepage_url": "https://github.com/ueen/SnapdropFirefoxAddon",
   "manifest_version": 2,
   "name": "Snapdrop Browser Extension",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "options_ui": {
     "page": "options/options.html"
   },
@@ -21,7 +21,8 @@
     "clipboardWrite",
     "downloads",
     "storage",
-    "tabs"
+    "tabs",
+    "<all_urls>"
   ],
   "browser_specific_settings": {
     "gecko": {

options/options.js

@@ -9,7 +9,7 @@ function saveOptions() {
   document.querySelector("#saveStateOut").textContent = "saved";
   document.querySelector("#saveStateOut").style.opacity = 0;
   document.querySelector("#saveStateOut").addEventListener('transitionend', () => {
-    browser.runtime.sendMessage({action: "reload"});
+    browser.runtime.sendMessage("reload");
     //for chromes floating options
     if (window.chrome) {
       window.close();

popup/popup.js

@@ -1,4 +1,4 @@
-browser.storage.sync.get({Servr:"snapdrop.net"}).then(function (result) {
+browser.storage.sync.get({Servr:"https://snapdrop.net"}).then(function (result) {
 	browser.tabs.query({}).then( tabs => {
 		let sdTabs = tabs.filter(tab => tab.url.includes(result.Servr.split("//")[1]));
 		if (sdTabs.length <= 0) {

popup/sidebar.js

@@ -0,0 +1,8 @@
+//get active tab url for sending via textInput
+document.addEventListener("contextmenu", (ev) => {
+	browser.runtime.sendMessage("sidebarClick").then(response => {
+		if (response != undefined) {
+			document.getElementById("textInput").innerHTML = response;
+		}
+	});
+});