Merge pull request #193 from manner82/fix/issue-192-context-menus-sendmessage

Fix context menus on dial page for Firefox 152+ (replace deprecated tabs.executeScript)

src/js/background.js

@@ -6,7 +6,7 @@ app.init = function(){ // Init module
 		browser.runtime.sendMessage({ cmd: app.Messages.Commands.settingsChanged });
 		browser.browserAction.onClicked.addListener(function(e){
 			if(app.settings.openQuickDialInNewPage) browser.tabs.create({});
-			else browser.tabs.update(e.id, {url: '/dial'}).then();				
+			else browser.tabs.update(e.id, {url: '/dial.html'}).then();				
 		});
     browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded });
     app.ContextMenus.initMenu();
@@ -22,7 +22,7 @@ app.init = function(){ // Init module
         browser.tabs.query({}).then( function(tabs) {
           tabs.forEach(function(itm){
             if(itm.url=='about:blank'){
-              browser.tabs.update(itm.id, {url: browser.extension.getURL('dial')});
+              browser.tabs.update(itm.id, {url: browser.runtime.getURL('dial.html')});
             }
           });
         });
@@ -46,7 +46,15 @@ app.Messages.Commands = {
 	refreshNode: 9,
 	capturePage: 10,
 	settingsChanged: 100,
-	gridNodesLoaded: 101
+	gridNodesLoaded: 101,
+	menuCreateBookmark: 200,
+	menuCreateFolder: 201,
+	menuEditSettings: 202,
+	menuEditProperties: 203,
+	menuRefreshNode: 204,
+	menuCaptureHere: 205,
+	menuCapturePage: 206,
+	menuDeleteNode: 207
 };
 app.Messages.init = function(){ // Init Messages Listeners
 	browser.runtime.onMessage.addListener(function(request, sender, sendResponse){
@@ -290,7 +298,7 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 	browser.contextMenus.create({
 		id: "pagemenu",
 		title: "Quick Dial",
-		documentUrlPatterns: [ 'moz-extension://*/dial', 'moz-extension://*/dial?*' ],
+		documentUrlPatterns: [ 'moz-extension://*/dial.html', 'moz-extension://*/dial.html?*' ],
 		contexts: ["page"]
 	});
 	browser.contextMenus.create({
@@ -302,18 +310,14 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		parentId: "pagemenunew",
 		title: browser.i18n.getMessage("menuNewBookmark"),
 		onclick(info, tab) { 
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateBookmark });	
-				code: "window.dial.createBookmark();"
-			});	
 		}
 	});
 	browser.contextMenus.create({
 		parentId: "pagemenunew",
 		title: browser.i18n.getMessage("menuNewFolder"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateFolder });	
-				code: "window.dial.createFolder();"
-			});	
 		}
 	});
 	browser.contextMenus.create({	parentId: "pagemenu", type: "separator" });
@@ -321,16 +325,14 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		parentId: "pagemenu",
 		title: browser.i18n.getMessage("menuSettings"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditSettings });	
-				code: "window.dial.editSettings();"
-			});	
 		}
 	});
 	// Create WebExt Link Context menu
 	browser.contextMenus.create({
 		id: "itemmenu",
 		title: "Quick Dial",
-		documentUrlPatterns: [ 'moz-extension://*/dial', 'moz-extension://*/dial?*' ],
+		documentUrlPatterns: [ 'moz-extension://*/dial.html', 'moz-extension://*/dial.html?*' ],
 		contexts: ["link"]
 	});
 	browser.contextMenus.create({
@@ -342,18 +344,14 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		parentId: "itemmenunew",
 		title: browser.i18n.getMessage("menuNewBookmark"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateBookmark });	
-				code: "window.dial.createBookmark();"
-			});	
 		}
 	});
 	browser.contextMenus.create({
 		parentId: "itemmenunew",
 		title: browser.i18n.getMessage("menuNewFolder"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateFolder });	
-				code: "window.dial.createFolder();"
-			});	
 		}
 	});
 	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
@@ -361,18 +359,14 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		parentId: "itemmenu",
 		title: browser.i18n.getMessage("menuProperties"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditProperties });	
-				code: "window.dial.editProperties(window.dial._selectedItem);"
-			});	
 		}
 	});
 	browser.contextMenus.create({
 		parentId: "itemmenu",
 		title: browser.i18n.getMessage("menuRefreshItem"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuRefreshNode });	
-				code: "window.dial.refreshNode(window.dial._selectedItem);"
-			});	
 		}
 	});
 	browser.contextMenus.create({
@@ -380,27 +374,21 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		title: browser.i18n.getMessage("menuCaptureHere"),
 		visible: false,
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCaptureHere });	
-				code: "window.dial.captureHere(window.dial._selectedItem);"
-			});	
 		}
 	});
 	browser.contextMenus.create({
 		parentId: "itemmenu",
 		title: browser.i18n.getMessage("menuCapturePage"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCapturePage });	
-				code: "window.dial.capturePage(window.dial._selectedItem);"
-			});	
 		}
 	});
 	browser.contextMenus.create({
 		parentId: "itemmenu",
 		title: browser.i18n.getMessage("menuDeleteItem"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuDeleteNode });	
-				code: "window.dial.deleteNode();"
-			});	
 		}
 	});
 	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
@@ -408,9 +396,7 @@ app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context m
 		parentId: "itemmenu",
 		title: browser.i18n.getMessage("menuSettings"),
 		onclick(info, tab) {
-			browser.tabs.executeScript(tab.id, {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditSettings });	
-				code: "window.dial.editSettings();"
-			});	
 		}
 	});
 };
@@ -563,8 +549,8 @@ app.SiteInfos.fromFrame = function(url, callback){ // Retrieve infos from an ifr
 		iframe.style.position = 'absolute';
 		iframe.scrolling = 'no';
 		var content = xmlHttp.responseText.replace('<head>', '<head><base href="' + url + '">');
-		iframe.onload = function(){ pageLoaded(); }
 		document.body.appendChild(iframe);
+		iframe.onload = function(){ pageLoaded(); }
 		iframe.srcdoc = content;
 		setTimeout(function(){ pageLoaded(); }, 6000);
 	}
@@ -886,7 +872,7 @@ app.GridNodes.capturePage = function(gridNode, callback){
 			if(nodes){
 				var path = '';
 				for(var i=1; i<nodes.length; i++) path = path + '/' + nodes[i].title;
-				app.SiteInfos.fromNewTab('/dial?path=' + path, function(infos){
+				app.SiteInfos.fromNewTab('/dial.html?path=' + path, function(infos){
 					if(infos){
 						gridNode.image = infos.screenshot;
 					} else {

src/js/dial.js

@@ -84,7 +84,15 @@ app.Messages.Commands = {
 	refreshNode: 9,
 	capturePage: 10,
 	settingsChanged: 100,
-	gridNodesLoaded: 101
+	gridNodesLoaded: 101,
+	menuCreateBookmark: 200,
+	menuCreateFolder: 201,
+	menuEditSettings: 202,
+	menuEditProperties: 203,
+	menuRefreshNode: 204,
+	menuCaptureHere: 205,
+	menuCapturePage: 206,
+	menuDeleteNode: 207
 };
 app.Messages.init = function(){
 	browser.runtime.onMessage.addListener(function(request, sender, sendResponse){
@@ -95,6 +103,30 @@ app.Messages.init = function(){
 			case app.Messages.Commands.gridNodesLoaded:
 				if(dial.skipUpdate!=true) app.Messages.getNode(dial.path, app.GridNodes._changed);
 				break;
+			case app.Messages.Commands.menuCreateBookmark:
+				dial.createBookmark();
+				break;
+			case app.Messages.Commands.menuCreateFolder:
+				dial.createFolder();
+				break;
+			case app.Messages.Commands.menuEditSettings:
+				dial.editSettings();
+				break;
+			case app.Messages.Commands.menuEditProperties:
+				dial.editProperties(dial._selectedItem);
+				break;
+			case app.Messages.Commands.menuRefreshNode:
+				dial.refreshNode(dial._selectedItem);
+				break;
+			case app.Messages.Commands.menuCaptureHere:
+				dial.captureHere(dial._selectedItem);
+				break;
+			case app.Messages.Commands.menuCapturePage:
+				dial.capturePage(dial._selectedItem);
+				break;
+			case app.Messages.Commands.menuDeleteNode:
+				dial.deleteNode();
+				break;
 		}
 	});
 };

src/manifest.json

@@ -2,7 +2,7 @@
 
   "manifest_version": 2,
   "name": "Quick Dial",
-  "version": "0.1.20",
+  "version": "0.1.24",
   "author": "MatMoul",
   "homepage_url": "https://github.com/MatMoul/quickdial-webext",
   "developer": {
@@ -37,13 +37,16 @@
   },
 
   "chrome_url_overrides" : {
-    "newtab": "dial"
+    "newtab": "dial.html"
   },
 
-  "applications": {
+  "browser_specific_settings": {
     "gecko": {
       "id": "quickdial@matmoul.com",
-      "strict_min_version": "70.0"
+      "strict_min_version": "140.0",
+			"data_collection_permissions": {
+				"required": ["none"]
+			}
     }
   },