Version 0.1.20

Locale/hebrew

makebeta

@@ -31,6 +31,7 @@ git checkout beta
 version=$1
 
 sed -i "/\"version\":/c\ \ \"version\": \"$version\"," src/manifest.json
+sed -i 's/quickdial@matmoul.com/quickdialtest@matmoul.com/' src/manifest.json
 
 git commit -a -m "Beta Version $version"
 

src/_locales/de/messages.json

@@ -1,9 +1,4 @@
 {
-  "extensionDescription": {
-    "message": "Quick Dial, eine Schnellwahl-Seite inspiriert von Fast Dial.",
-    "description": "Description of the extension."
-  },
-
   "menuAddToQuickDial": {
     "message": "Zu Quick Dial hinzufügen",
     "description": "Text of add bookmark menu item."

src/_locales/en/messages.json

@@ -1,9 +1,4 @@
 {
-  "extensionDescription": {
-    "message": "Quick Dial, a dial page inspired from fast dial.",
-    "description": "Description of the extension."
-  },
-
   "menuAddToQuickDial": {
     "message": "Add to Quick Dial",
     "description": "Text of add bookmark menu item."

src/_locales/es/messages.json

@@ -0,0 +1,67 @@
+{
+  "menuAddToQuickDial": {
+    "message": "Agregar a Quick Dial",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "menuNew": {
+    "message": "Nuevo",
+    "description": "Text of new menu item."
+  },
+
+  "menuNewBookmark": {
+    "message": "Marcador",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "AddBookmarkPrompt": {
+    "message": "Dirección del nuevo marcador:",
+    "description": "Text of the add bookmark prompt."
+  },
+
+  "menuNewFolder": {
+    "message": "Carpeta",
+    "description": "Text of add folder menu item."
+  },
+
+  "AddFolderPrompt": {
+    "message": "Nombre de la nueva carpeta:",
+    "description": "Text of the add folder prompt."
+  },
+
+  "menuProperties": {
+    "message": "Propiedades",
+    "description": "Text of properties menu item."
+  },
+
+  "menuRefreshItem": {
+    "message": "Actualizar",
+    "description": "Text of refresh menu item."
+  },
+
+  "menuCaptureHere": {
+    "message": "Capturar aquí",
+    "description": "Text of capture here menu item."
+  },
+
+  "menuCapturePage": {
+    "message": "Capturar en una nueva pestaña",
+    "description": "Text of capture menu item."
+  },
+
+  "menuDeleteItem": {
+    "message": "Eliminar",
+    "description": "Text of delete menu item."
+  },
+
+  "deleteItemConfimation": {
+    "message": "¿Eliminar $1 ?",
+    "description": "Text of delete confirmation."
+  },
+
+  "menuSettings": {
+    "message": "Propiedades de Quick Dial",
+    "description": "Text of settings menu item."
+  }
+
+}

src/_locales/fr/messages.json

@@ -1,9 +1,4 @@
 {
-  "extensionDescription": {
-    "message": "Quick Dial, page dial inspirée de fast dial.",
-    "description": "Description of the extension."
-  },
-
   "menuAddToQuickDial": {
     "message": "Ajouter à Quick Dial",
     "description": "Text of add bookmark menu item."

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

@@ -1,9 +1,4 @@
 {
-  "extensionDescription": {
-    "message": "Quick Dial, una dial page inspirata a fast dial.",
-    "description": "Description of the extension."
-  },
-
   "menuAddToQuickDial": {
     "message": "Aggiungi a Quick Dial",
     "description": "Text of add bookmark menu item."

src/_locales/pl/messages.json

@@ -0,0 +1,67 @@
+{
+  "menuAddToQuickDial": {
+    "message": "Dodaj do Quick Dial",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "menuNew": {
+    "message": "Nowy",
+    "description": "Text of new menu item."
+  },
+
+  "menuNewBookmark": {
+    "message": "Zakładka",
+    "description": "Text of add bookmark menu item."
+  },
+
+  "AddBookmarkPrompt": {
+    "message": "Wprowadź nowy adres URL zakładki:",
+    "description": "Text of the add bookmark prompt."
+  },
+
+  "menuNewFolder": {
+    "message": "Folder",
+    "description": "Text of add folder menu item."
+  },
+
+  "AddFolderPrompt": {
+    "message": "Wprowadź nazwę nowego folderu:",
+    "description": "Text of the add folder prompt."
+  },
+
+  "menuProperties": {
+    "message": "Właściwości",
+    "description": "Text of properties menu item."
+  },
+
+  "menuRefreshItem": {
+    "message": "Odśwież",
+    "description": "Text of refresh menu item."
+  },
+
+  "menuCaptureHere": {
+    "message": "Zdjęcie tutaj",
+    "description": "Text of capture here menu item."
+  },
+
+  "menuCapturePage": {
+    "message": "Zdjęcie na nowej karcie",
+    "description": "Text of capture menu item."
+  },
+
+  "menuDeleteItem": {
+    "message": "Usuń",
+    "description": "Text of delete menu item."
+  },
+
+  "deleteItemConfimation": {
+    "message": "Usuń $1 ?",
+    "description": "Text of delete confirmation."
+  },
+
+  "menuSettings": {
+    "message": "Ustawienia Quick Dial",
+    "description": "Text of settings menu item."
+  }
+
+}

src/_locales/pt_BR/messages.json

@@ -0,0 +1,67 @@
+{
+  "menuAddToQuickDial": {
+    "message": "Adicionar ao Quick Dial",
+    "description": "Texto do iten de menu adicionar ao Quick Dial."
+  },
+
+  "menuNew": {
+    "message": "Novo",
+    "description": "Texto do item de menu novo."
+  },
+
+  "menuNewBookmark": {
+    "message": "Favorito",
+    "description": "Texto do iten de menu adicionar favorito."
+  },
+
+  "AddBookmarkPrompt": {
+    "message": "Entre com a url do novo favorito :",
+    "description": "Texto do rótulo adicionar favorito."
+  },
+
+  "menuNewFolder": {
+    "message": "Pasta",
+    "description": "Texto do item de menu adicionar pasta."
+  },
+
+  "AddFolderPrompt": {
+    "message": "Entre com o nome da nova pasta :",
+    "description": "Texto do rótulo adicionar pasta."
+  },
+
+  "menuProperties": {
+    "message": "Propriedades",
+    "description": "Texto do item de menu propriedades."
+  },
+
+  "menuRefreshItem": {
+    "message": "Atualizar",
+    "description": "Texto do item de menu atualizar."
+  },
+
+  "menuCaptureHere": {
+    "message": "Capturar aqui",
+    "description": "Texto do item de menu capturar aqui."
+  },
+
+  "menuCapturePage": {
+    "message": "Capturar em uma nova guia",
+    "description": "Texto do item de menu capturar em uma nova guia."
+  },
+
+  "menuDeleteItem": {
+    "message": "Excluir",
+    "description": "Texto do item de menu excluir."
+  },
+
+  "deleteItemConfimation": {
+    "message": "Excluir $1 ?",
+    "description": "Texto de confirmação da exclusão."
+  },
+
+  "menuSettings": {
+    "message": " Configurações do Quick Dial",
+    "description": "Texto do item de menu configurações."
+  }
+
+}

src/_locales/ru/messages.json

@@ -1,9 +1,4 @@
 {
-  "extensionDescription": {
-    "message": "Quick Dial, вдохновление умершим расширением Fast Dial.",
-    "description": "Description of the extension."
-  },
-
   "menuAddToQuickDial": {
     "message": "Добавить в Quick Dial",
     "description": "Text of add bookmark menu item."

src/_locales/sr/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/_locales/uk/messages.json

@@ -0,0 +1,67 @@
+{
+  "menuAddToQuickDial": {
+    "message": "Додати до Quick Dial",
+    "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": "Введіть URL-адресу нової закладки:",
+    "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": "Налаштування Quick Dial",
+    "description": "Text of settings menu item."
+  }
+
+}

src/html/properties.html

@@ -43,7 +43,7 @@
 					
 						<tr>
 							<td><span>Image :</span></td>
-							<td colspan="2">
+							<td>
 								<select id="ImageMode">
 									<option value="-1">Default</option>
 									<option value="0">Stretch</option>
@@ -57,6 +57,7 @@
 								<button class="hidden" id="ImageCapture">Capture</button>
 								<input id="ImageFile" type="file" style="width:180px;">
 							</td>
+							<td style="width:20px"><input id="ImageLocked" type="checkbox" title="Lock image"></td>
 						</tr>
 						<tr>
 							<td></td>

src/html/settings.html

@@ -58,6 +58,22 @@
 							<td>Preview :</td>
 							<td><div id="BackgroundPreview" style="width: 300px; height: 180px;"></div></td>
 						</tr>
+						<tr>
+							<td>Show "Add to ..." :</td>
+							<td><input id="MenuShowAdd" type="checkbox"></td>
+						</tr>
+
+						<tr>
+							<td>Open QD in new page :</td>
+							<td><input id="ButtonOpenInNewPage" type="checkbox"></td>
+						</tr>
+
+						<tr>
+							<td>Startpage timeout :</td>
+							<td><input id="StartupTimeout" type="number"></td>
+						</tr>
+
+
 					</table>
 				</div>
 				<div class="hidden">
@@ -80,6 +96,24 @@
 							<td><span>Margins :</span></td>
 							<td><input id="GridMargins" type="number" min="0"></td>
 						</tr>
+						<tr>
+							<td><span>Open Bookmarks In :</span></td>
+							<td>
+								<select id="GridOpenBookmarksIn">
+									<option value="0">Default</option>
+									<option value="1">New Tab</option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td><span>Open Folders In :</span></td>
+							<td>
+								<select id="GridOpenFoldersIn">
+									<option value="0">Default</option>
+									<option value="1">New Tab</option>
+								</select>
+							</td>
+						</tr>
 						<tr>
 							<td><span>Back Button :</span></td>
 							<td><input id="GridBackNode" type="checkbox"></td>

src/js/background.js

@@ -4,14 +4,31 @@ app.init = function(){ // Init module
 	app.Settings.init(function(){
 		app.Messages.init();
 		browser.runtime.sendMessage({ cmd: app.Messages.Commands.settingsChanged });
-		browser.browserAction.onClicked.addListener(function(){
+		browser.browserAction.onClicked.addListener(function(e){
-			browser.tabs.create({});
+			if(app.settings.openQuickDialInNewPage) browser.tabs.create({});
+			else browser.tabs.update(e.id, {url: '/dial'}).then();				
 		});
-		app.GridNodes.sync(app.node, app.settings.grid.root, function(){
     browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded });
-			app.Bookmarks.initListener();
     app.ContextMenus.initMenu();
+    window.setTimeout(function(){
+      app.GridNodes.sync(app.node, app.settings.grid.root, function(){
+        app.Bookmarks.initListener();
       });
+    }, 500);
+		
+		// Start page workaround :
+    if(app.settings.startpageTimeout>0){
+      setTimeout(function(){
+        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')});
+            }
+          });
+        });
+      }, app.settings.startpageTimeout);
+    }
+		
 	});
 };
 
@@ -49,6 +66,7 @@ app.Messages.init = function(){ // Init Messages Listeners
 				} else {
 					browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } );
 				}
+				app.ContextMenus.updateMenu();
 				break;
 			case app.Messages.Commands.getNodeByID:
 				var nodes = app.GridNodes.getNodeWithParents(request.id);
@@ -100,13 +118,15 @@ app.Messages.init = function(){ // Init Messages Listeners
 app.Settings = {}; // Settings helper object
 app.Settings.init = function(callback){ // Load settings and nodes
 	browser.storage.local.get().then(function(data){
-		if(Object.keys(data).length == 0) {
+		if(Object.keys(data).length == 0 || ! data.settings) {
 			data = {
 				version: 3,
 				settings: {
 					backgroundColor: '#3c4048',
 					backgroundImage: null,
 					backgroundMode: 0,
+					menuShowAdd: true,
+					openQuickDialInNewPage: true,
 					grid: {
 						margin: 10,
 						rows: 4,
@@ -119,6 +139,8 @@ app.Settings.init = function(callback){ // Load settings and nodes
 						folderIcon: 'url(/img/folder.png)',
 						folderIconMode: 0,
 						loadingIcon: 'url(/img/throbber.gif)',
+						openBookmarkMethod: 0,
+						openFolderMethod: 0,
 						cells: {
 							margin: 4,
 							marginHover: 4,
@@ -210,6 +232,19 @@ app.Settings.init = function(callback){ // Load settings and nodes
 			if(!data.settings.grid.ratioX){
 				data.settings.grid.ratioX = 4;
 				data.settings.grid.ratioY = 3;
+			}
+			if(!(data.settings.menuShowAdd == true) && !(data.settings.menuShowAdd == false)){
+				data.settings.menuShowAdd = true;
+			}
+			if(!data.settings.grid.openBookmarkMethod && data.settings.grid.openBookmarkMethod != 0){
+				data.settings.grid.openBookmarkMethod = 0;
+				data.settings.grid.openFolderMethod = 0;
+			}
+			if(!data.settings.openQuickDialInNewPage && data.settings.openQuickDialInNewPage != false){
+				data.settings.openQuickDialInNewPage = true;
+			}
+			if(!data.settings.startpageTimeout){
+        data.settings.startpageTimeout = 500;
       }
 			//app.Settings.save();
 		}
@@ -223,31 +258,167 @@ app.Settings.update = function(settings, callback){ // Save new settings
 	app.Settings.save(callback);
 };
 app.Settings.save = function(callback){ // Save settings
+  if(! app.settings) return;
 	var data = { version: 4 };
 	data.settings = app.settings;
 	data.node = app.node;
 	browser.storage.local.set(data).then(function(){
 		if(callback) callback();
 	}, function(){ console.log('Error saving settings'); });
-}
+};
 
 app.init();
 
 app.ContextMenus = {} // ContextMenu helper Object
+app.ContextMenus.menuItemClicked = function(info, tab){
+	if (info.menuItemId == "AddToQuickDial") app.GridNodes.createBookmark(app.node, info.pageUrl, tab.title, function(){
+		browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } );
+	});
+};
 app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context menu in all pages
-	browser.contextMenus.create({ // Create Context menu
+	// Create Add Context menu for all pages
+	if(app.settings.menuShowAdd){
+		browser.contextMenus.create({
 			id: 'AddToQuickDial',
 			title: browser.i18n.getMessage("menuAddToQuickDial"),
 			contexts: ["all"],
-		documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ]
+			documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ],
-	}, function(){});
+			onclick(info, tab) { app.ContextMenus.menuItemClicked(info, tab)	}
-	browser.contextMenus.onClicked.addListener(function(info, tab) { // Context menu click event
-		if (info.menuItemId == "AddToQuickDial")
-			app.GridNodes.createBookmark(app.node, info.pageUrl, tab.title, function(){
-				browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } );
 		});
+	}
+	// Create WebExt Page Context menu
+	browser.contextMenus.create({
+		id: "pagemenu",
+		title: "Quick Dial",
+		documentUrlPatterns: [ 'moz-extension://*/dial', 'moz-extension://*/dial?*' ],
+		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.executeScript(tab.id, {
+				code: "window.dial.createBookmark();"
+			});	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "pagemenunew",
+		title: browser.i18n.getMessage("menuNewFolder"),
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				code: "window.dial.createFolder();"
+			});	
+		}
+	});
+	browser.contextMenus.create({	parentId: "pagemenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "pagemenu",
+		title: browser.i18n.getMessage("menuSettings"),
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				code: "window.dial.editSettings();"
+			});	
+		}
+	});
+	// Create WebExt Link Context menu
+	browser.contextMenus.create({
+		id: "itemmenu",
+		title: "Quick Dial",
+		documentUrlPatterns: [ 'moz-extension://*/dial', 'moz-extension://*/dial?*' ],
+		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.executeScript(tab.id, {
+				code: "window.dial.createBookmark();"
+			});	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenunew",
+		title: browser.i18n.getMessage("menuNewFolder"),
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				code: "window.dial.createFolder();"
+			});	
+		}
+	});
+	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuProperties"),
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				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, {
+				code: "window.dial.refreshNode(window.dial._selectedItem);"
+			});	
+		}
+	});
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuCaptureHere"),
+		visible: false,
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				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, {
+				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, {
+				code: "window.dial.deleteNode();"
+			});	
+		}
+	});
+	browser.contextMenus.create({	parentId: "itemmenu", type: "separator" });
+	browser.contextMenus.create({
+		parentId: "itemmenu",
+		title: browser.i18n.getMessage("menuSettings"),
+		onclick(info, tab) {
+			browser.tabs.executeScript(tab.id, {
+				code: "window.dial.editSettings();"
+			});	
+		}
+	});
+};
+app.ContextMenus.updateMenu = function(){
+	browser.contextMenus.onClicked.removeListener(app.ContextMenus.menuItemClicked);
+	browser.contextMenus.removeAll();
+	app.ContextMenus.initMenu();
+};
 
 app.Bookmarks = {} // Bookmarks helper object
 app.Bookmarks._onCreated = function(){ app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); }
@@ -424,13 +595,15 @@ app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes w
 		function syncNode(gridNode, bookmarkItem){
 			gridNode.id = bookmarkItem.id;
 			gridNode.title = bookmarkItem.title;
-			if(bookmarkItem.url){
+			switch(bookmarkItem.type){
+				case 'bookmark':
 					gridNode.type = app.GridNodes.GridNodeType.bookmark;
 					if(gridNode.url != bookmarkItem.url){
 						gridNode.url = bookmarkItem.url;
 						delete gridNode.image;
 					}
-			} else if(bookmarkItem.children){
+					break;
+				case 'folder':
 					gridNode.type = app.GridNodes.GridNodeType.folder;
 					var EmptyNodes = [];
 					if(! gridNode.children) gridNode.children = [];
@@ -472,8 +645,10 @@ app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes w
 						syncNode(childGridNode, child);
 					}
 					EmptyNodes.length = 0;
-			} else {
+					break;
+				default:
 					gridNode.type = app.GridNodes.GridNodeType.empty;
+					break;
 			}
 		}
 		
@@ -532,8 +707,14 @@ app.GridNodes.updateNode = function(gridNode, value, callback){
 	if(value){
 		if(value.title) gridNode.title = value.title;
 		if(value.titleLocked!=null) gridNode.titleLocked = value.titleLocked;
+		if(value.imageLocked!=null){
+			gridNode.imageLocked = value.imageLocked;
 			if(value.image) gridNode.image = value.image;
 			else delete gridNode.image;
+		} else if(gridNode.imageLocked != true){
+			if(value.image) gridNode.image = value.image;
+			else delete gridNode.image;
+		}
 		if(value.imageMode || value.imageMode == 0) {
 			if(value.imageMode == -1) delete gridNode.imageMode;
 			else gridNode.imageMode = value.imageMode;
@@ -676,12 +857,15 @@ app.GridNodes.refreshNode = function(gridNode, callback){ // Refresh content of
 			break;
 		case app.GridNodes.GridNodeType.bookmark:
 			app.SiteInfos.fromFrame(gridNode.url, function(infos){
+				if(gridNode.imageLocked!=true){
 					if(infos){
 						if(gridNode.titleLocked!=true) gridNode.title = infos.title;
 						gridNode.image = infos.screenshot;
 					} else {
 						gridNode.image = '0';
 					}
+				}
+			
 				delete gridNode.__isLoading;
 				app.GridNodes.saveNode(gridNode);
 				if(callback) callback(infos);
@@ -716,12 +900,14 @@ app.GridNodes.capturePage = function(gridNode, callback){
 			break;
 		case app.GridNodes.GridNodeType.bookmark:
 			app.SiteInfos.fromNewTab(gridNode.url, function(infos){
+				if(gridNode.imageLocked!=true){
 					if(infos){
 						if(gridNode.titleLocked!=true) gridNode.title = infos.title;
 						gridNode.image = infos.screenshot;
 					} else {
 						gridNode.image = '0';
 					}
+				}
 				delete gridNode.__isLoading;
 				app.GridNodes.saveNode(gridNode);
 				if(callback) callback(infos);

src/js/dial.js

@@ -10,6 +10,9 @@ document.addEventListener("DOMContentLoaded", function(event) {
   document.body.style.backgroundColor = utils.getBackgroundColor();
 	app.init();
 	dial.init();
+  window.setTimeout(function(){
+    if(! app.settings) app.init();
+  }, 500);
 });
 
 window.addEventListener('resize', function(){
@@ -102,7 +105,7 @@ app.Messages.getSettings = function(callback){
 		} else {
 			browser.runtime.sendMessage({ cmd: app.Messages.Commands.getSettings }).then(callback, callback);
 		}
-	});
+	}, callback);
 };
 app.Messages.getNode = function(path, callback){
 	browser.runtime.getBackgroundPage().then(function(page){
@@ -160,10 +163,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');
@@ -247,6 +251,7 @@ dial.initMenus = function(){
 	dial.ItemMenu.appendChild(dial.ItemMenuSettings);
 	document.body.appendChild(dial.ItemMenu);
 }
+*/
 dial.initStyles = function(){
 	function applyImageMode(imageMode, target){
 		switch(imageMode){
@@ -289,7 +294,7 @@ dial.initStyles = function(){
 	dial.styles.grid.linkPanelHover = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('.Grid td>a:hover>div:first-child { }')].style;
 	if(app.settings.grid.cells.backgroundColorHover) dial.styles.grid.linkPanelHover.backgroundColor = app.settings.grid.cells.backgroundColorHover;
 	else dial.styles.grid.linkPanelHover.backgroundColor = 'transparent';
-	dial.styles.grid.linkTitle = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('.Grid td>a>div:last-child { height: ' + app.settings.grid.cells.titleHeight + 'px; font-size: ' + app.settings.grid.cells.titleFontSize + 'pt; font-family: ' + app.settings.grid.cells.titleFont + 'pt; text-align: center; overflow: hidden; color: ' + app.settings.grid.cells.titleColor + '; border-top: ' + app.settings.grid.cells.titleBorderSize + 'px solid ' + app.settings.grid.cells.borderColor + '; }')].style;
+	dial.styles.grid.linkTitle = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('.Grid td>a>div:last-child { height: ' + app.settings.grid.cells.titleHeight + 'px; font-size: ' + app.settings.grid.cells.titleFontSize + 'pt; font-family: ' + app.settings.grid.cells.titleFont + '; text-align: center; overflow: hidden; color: ' + app.settings.grid.cells.titleColor + '; border-top: ' + app.settings.grid.cells.titleBorderSize + 'px solid ' + app.settings.grid.cells.borderColor + '; }')].style;
 	if(app.settings.grid.cells.titleBackgroundColor) dial.styles.grid.linkTitle.backgroundColor = app.settings.grid.cells.titleBackgroundColor;
 	else dial.styles.grid.linkTitle.backgroundColor = 'transparent';
 	dial.styles.grid.linkTitleHover = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('.Grid td>a:hover>div:last-child { font-size: ' + app.settings.grid.cells.titleFontSizeHover + 'pt; color: ' + app.settings.grid.cells.titleColorHover + '; border-top-width: ' + app.settings.grid.cells.titleBorderSizeHover + 'px; border-top-color: ' + app.settings.grid.cells.borderColorHover + ' }')].style;
@@ -325,6 +330,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:
@@ -336,6 +342,7 @@ dial.initGrid = function(){
 							break;
 					}
 				}
+				*/
 			};
 			
 			function dragstart_handler(ev) {
@@ -343,6 +350,7 @@ dial.initGrid = function(){
 					ev.preventDefault();
 					return;
 				}
+				if(dial.page == 0) dial.page = 1;
 				var index = (dial.page - 1) * (app.settings.grid.rows * app.settings.grid.columns) + +(ev.target.parentElement.getAttribute('gridindex'));
 				if(app.settings.grid.backNode && dial.path != '/') index -= dial.page;
 				ev.dataTransfer.setData("text/plain", JSON.stringify({parentId: app.node.id, index: index}));
@@ -477,6 +485,7 @@ dial.populateGrid = function(){
 		link.Node = null;
 		link.className = 'Empty';
 		link.childNodes[0].style.backgroundImage = '';
+		if(link.target) delete link.target;
 		link.href = null;
 		link.onclick = null;
 		link.removeAttribute('contextmenu');
@@ -486,6 +495,7 @@ dial.populateGrid = function(){
 		link.className = 'Back';
 		link.childNodes[0].style.backgroundImage = '';
 		link.childNodes[1].innerText = 'Back';
+		if(link.target) delete link.target;
 		link.href = '#';
 		link.onclick = function(){ window.history.back(); }
 		link.removeAttribute('contextmenu');
@@ -500,6 +510,14 @@ dial.populateGrid = function(){
 			else link.childNodes[0].style.backgroundImage = 'url(' + node.image + ')';
 		} else link.childNodes[0].style.backgroundImage = '';
 		link.childNodes[1].innerText = node.title;
+		switch(app.settings.grid.openFolderMethod){
+			case 0:
+				if(link.target) delete link.target;
+				break;
+			case 1:
+				link.target = '_blank';
+				break;
+		}
 		if(dial.path) link.href = '?' + 'bg=' + encodeURIComponent(app.settings.backgroundColor) + '&path=' + encodeURIComponent(dial.path + node.title);
 		else link.href = '?' + 'bg=' + encodeURIComponent(app.settings.backgroundColor) + '&path=' + encodeURIComponent(node.title);
 		link.onclick = null;
@@ -519,6 +537,14 @@ dial.populateGrid = function(){
 			dial.refreshNode(link);
 		}
 		link.childNodes[1].innerText = node.title;
+		switch(app.settings.grid.openBookmarkMethod){
+			case 0:
+				if(link.target) delete link.target;
+				break;
+			case 1:
+				link.target = '_blank';
+				break;
+		}
 		link.href = node.url;
 		link.onclick = null;
 		link.setAttribute('contextmenu', 'item');

src/js/properties.js

@@ -26,6 +26,7 @@ app.init = function(){
 			switch(node.type){
 				case app.GridNodes.GridNodeType.folder:
 					TitleLocked.parentNode.style.display = 'none';
+					ImageLocked.parentNode.style.display = 'none';
 					Url.parentNode.parentNode.style.display = 'none';
 					if(node.image){
 						if(node.image.indexOf('url(')>=0) Image = node.image;
@@ -36,6 +37,7 @@ app.init = function(){
 					break;
 				case app.GridNodes.GridNodeType.bookmark:
 					TitleLocked.checked = (node.titleLocked==true);
+					ImageLocked.checked = (node.imageLocked==true);
 					ImageDefault.style.display = 'none';
 					Url.value = node.url;
 					if(node.image.indexOf('url(')>=0) Image = node.image;
@@ -102,7 +104,7 @@ app.init = function(){
 				app.Messages.updateNode(app.node.id, { title: Title.value, image: Image, imageMode: +(ImageMode.value) })
 				break;
 			case app.GridNodes.GridNodeType.bookmark:
-				app.Messages.updateNode(app.node.id, { title: Title.value, titleLocked: TitleLocked.checked, url: Url.value, image: Image, imageMode: +(ImageMode.value) })
+				app.Messages.updateNode(app.node.id, { title: Title.value, titleLocked: TitleLocked.checked, imageLocked: ImageLocked.checked, url: Url.value, image: Image, imageMode: +(ImageMode.value) })
 				break;
 		}
 	}

src/js/settings.js

@@ -19,6 +19,7 @@ app.init = function(){
 	});
 	app.Messages.getSettings(function(settings){
 		app.settings = settings;
+		MenuShowAdd.checked = app.settings.menuShowAdd;
 		BackgroundColor.value = app.settings.backgroundColor;
 		BackgroundImage = app.settings.backgroundImage;
 		BackgroundMode.value = app.settings.backgroundMode;
@@ -26,12 +27,16 @@ app.init = function(){
 		BackgroundPreview.style.backgroundImage = app.settings.backgroundImage;
 		BackgroundPreview.style.backgroundRepeat = 'no-repeat';
 		BackgroundPreview.style.backgroundSize = '100% 100%';
+		ButtonOpenInNewPage.checked = app.settings.openQuickDialInNewPage;
+    StartupTimeout.value = app.settings.startpageTimeout;
 		GridRoot.value = app.settings.grid.root;
 		GridRows.value = app.settings.grid.rows;
 		GridRatioX.value = app.settings.grid.ratioX;
 		GridRatioY.value = app.settings.grid.ratioY;
 		GridMargins.value = app.settings.grid.margin;
 		GridColumns.value = app.settings.grid.columns;
+		GridOpenBookmarksIn.value = app.settings.grid.openBookmarkMethod;
+		GridOpenFoldersIn.value = app.settings.grid.openFolderMethod;
 		GridBackNode.checked = app.settings.grid.backNode;
 		GridBackMode.value = app.settings.grid.backIconMode;
 		GridBackImage = app.settings.grid.backIcon;
@@ -79,14 +84,19 @@ app.init = function(){
 		window.frameElement.popup.close();
 	}
 	BtnApply.onclick = function(){
+		app.settings.menuShowAdd = MenuShowAdd.checked;
 		app.settings.backgroundColor = BackgroundColor.value;
 		app.settings.backgroundImage = BackgroundImage;
 		app.settings.backgroundMode = +(BackgroundMode.value);
+		app.settings.openQuickDialInNewPage = ButtonOpenInNewPage.checked;
+    app.settings.startpageTimeout = StartupTimeout.value;
 		app.settings.grid.rows = +(GridRows.value);
 		app.settings.grid.margin = +(GridMargins.value);
 		app.settings.grid.columns = +(GridColumns.value);
 		app.settings.grid.ratioX = GridRatioX.value;
 		app.settings.grid.ratioY = GridRatioY.value;
+		app.settings.grid.openBookmarkMethod = +(GridOpenBookmarksIn.value);
+		app.settings.grid.openFolderMethod = +(GridOpenFoldersIn.value);
 		app.settings.grid.backNode = GridBackNode.checked;
 		app.settings.grid.backIconMode = +(GridBackMode.value);
 		app.settings.grid.backIcon = GridBackImage;

src/manifest.json

@@ -2,14 +2,13 @@
 
   "manifest_version": 2,
   "name": "Quick Dial",
-  "version": "0.1.10",
+  "version": "0.1.20",
   "author": "MatMoul",
   "homepage_url": "https://github.com/MatMoul/quickdial-webext",
   "developer": {
     "name": "MatMoul",
     "url": "https://github.com/MatMoul/quickdial-webext"
   },
-  "description": "__MSG_extensionDescription__",
 
   "icons": {
 		"24": "img/24.png",
@@ -44,7 +43,7 @@
   "applications": {
     "gecko": {
       "id": "quickdial@matmoul.com",
-      "strict_min_version": "52.0"
+      "strict_min_version": "70.0"
     }
   },