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/_locales/he_IL/messages.json

@@ -0,0 +1,67 @@
+{
+  "menuAddToQuickDial": {
+    "message": "הוסף לחיוג מהיר",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "menuNew": {
+    "message": "חדש",
+    "description": "Text of new menu item."
+  },
+
+  "menuNewBookmark": {
+    "message": "מועדף",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "AddBookmarkPrompt": {
+    "message": "הכנס קישור חדש למועדף :",
+    "description": "Text of the add bookmark prompt."
+  },
+
+  "menuNewFolder": {
+    "message": "תיקייה",
+    "description": "Text of add folder menu item."
+  },
+
+  "AddFolderPrompt": {
+    "message": "הכנס שם חדש לתיקייה :",
+    "description": "Text of the add folder prompt."
+  },
+
+  "menuProperties": {
+    "message": "מאפיינים",
+    "description": "Text of properties menu item."
+  },
+
+  "menuRefreshItem": {
+    "message": "רענן",
+    "description": "Text of refresh menu item."
+  },
+
+  "menuCaptureHere": {
+    "message": "צלם מסך כאן",
+    "description": "Text of capture here menu item."
+  },
+
+  "menuCapturePage": {
+    "message": "צלם מסך בלשונית חדשה",
+    "description": "Text of capture menu item."
+  },
+
+  "menuDeleteItem": {
+    "message": "מחק",
+    "description": "Text of delete menu item."
+  },
+
+  "deleteItemConfimation": {
+    "message": "האם למחוק $1 ?",
+    "description": "Text of delete confirmation."
+  },
+
+  "menuSettings": {
+    "message": "הגדרות חיוג מהיר",
+    "description": "Text of settings menu item."
+  }
+
+}

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){
@@ -276,15 +284,121 @@ app.ContextMenus.menuItemClicked = function(info, tab){
 	});
 };
 app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context menu in all pages
+	// Create Add Context menu for all pages
 	if(app.settings.menuShowAdd){
-		browser.contextMenus.create({ // Create Context menu
+		browser.contextMenus.create({
 			id: 'AddToQuickDial',
 			title: browser.i18n.getMessage("menuAddToQuickDial"),
 			contexts: ["all"],
-			documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ]
-		}, function(){});
-		browser.contextMenus.onClicked.addListener(app.ContextMenus.menuItemClicked);
+			documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ],
+			onclick(info, tab) { app.ContextMenus.menuItemClicked(info, tab)	}
+		});
 	}
+	// Create WebExt Page Context menu
+	browser.contextMenus.create({
+		id: "pagemenu",
+		title: "Quick Dial",
+		documentUrlPatterns: [ 'moz-extension://*/dial.html', 'moz-extension://*/dial.html?*' ],
+		contexts: ["page"]
+	});
+	browser.contextMenus.create({
+		id: "pagemenunew",
+		parentId: "pagemenu",
+		title: browser.i18n.getMessage("menuNew")
+	});
+	browser.contextMenus.create({
+		parentId: "pagemenunew",
+		title: browser.i18n.getMessage("menuNewBookmark"),
+		onclick(info, tab) { 
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateBookmark });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "pagemenunew",
+		title: browser.i18n.getMessage("menuNewFolder"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateFolder });	
+		}
+	});
+	browser.contextMenus.create({	parentId: "pagemenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "pagemenu",
+		title: browser.i18n.getMessage("menuSettings"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditSettings });	
+		}
+	});
+	// Create WebExt Link Context menu
+	browser.contextMenus.create({
+		id: "itemmenu",
+		title: "Quick Dial",
+		documentUrlPatterns: [ 'moz-extension://*/dial.html', 'moz-extension://*/dial.html?*' ],
+		contexts: ["link"]
+	});
+	browser.contextMenus.create({
+		id: "itemmenunew",
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuNew")
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenunew",
+		title: browser.i18n.getMessage("menuNewBookmark"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateBookmark });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenunew",
+		title: browser.i18n.getMessage("menuNewFolder"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCreateFolder });	
+		}
+	});
+	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuProperties"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditProperties });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuRefreshItem"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuRefreshNode });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuCaptureHere"),
+		visible: false,
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCaptureHere });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuCapturePage"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuCapturePage });	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuDeleteItem"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuDeleteNode });	
+		}
+	});
+	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuSettings"),
+		onclick(info, tab) {
+			browser.tabs.sendMessage(tab.id, { cmd: app.Messages.Commands.menuEditSettings });	
+		}
+	});
 };
 app.ContextMenus.updateMenu = function(){
 	browser.contextMenus.onClicked.removeListener(app.ContextMenus.menuItemClicked);
@@ -435,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);
 	}
@@ -758,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;
 		}
 	});
 };
@@ -163,10 +195,11 @@ app.GridNodes._changed = function(node){
 
 
 dial.init = function(){
-	dial.initMenus();
+	//dial.initMenus();
 	dial.Title = document.createElement('title');
 	document.head.appendChild(dial.Title);
 };
+/*
 dial.initMenus = function(){
 	document.body.setAttribute('contextmenu', 'page');
 	dial.PageMenu = document.createElement('menu');
@@ -250,6 +283,7 @@ dial.initMenus = function(){
 	dial.ItemMenu.appendChild(dial.ItemMenuSettings);
 	document.body.appendChild(dial.ItemMenu);
 }
+*/
 dial.initStyles = function(){
 	function applyImageMode(imageMode, target){
 		switch(imageMode){
@@ -328,6 +362,7 @@ dial.initGrid = function(){
 			link.appendChild(document.createElement('div'));
 			link.onmousedown = function(){
 				dial._selectedItem = this;
+				/*
 				if(dial._selectedItem.Node){
 					switch(dial._selectedItem.Node.type){
 						case app.GridNodes.GridNodeType.folder:
@@ -339,6 +374,7 @@ dial.initGrid = function(){
 							break;
 					}
 				}
+				*/
 			};
 			
 			function dragstart_handler(ev) {

src/manifest.json

@@ -2,7 +2,7 @@
 
   "manifest_version": 2,
   "name": "Quick Dial",
-  "version": "0.1.19",
+  "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": "52.0"
+      "strict_min_version": "140.0",
+			"data_collection_permissions": {
+				"required": ["none"]
+			}
     }
   },