makebeta

@@ -31,7 +31,6 @@ 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,4 +1,9 @@
 {
+  "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,4 +1,9 @@
 {
+  "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

@@ -1,67 +0,0 @@
-{
-  "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,4 +1,9 @@
 {
+  "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

@@ -1,67 +0,0 @@
-{
-  "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,4 +1,9 @@
 {
+  "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

@@ -1,67 +0,0 @@
-{
-  "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

@@ -1,4 +1,9 @@
 {
+  "extensionDescription": {
+    "message": "Quick Dial, uma página de discagem inspirada no Fast Dial.",
+    "description": "Descrição da extensão."
+  },
+
   "menuAddToQuickDial": {
     "message": "Adicionar ao Quick Dial",
     "description": "Texto do iten de menu adicionar ao Quick Dial."

src/_locales/ru/messages.json

@@ -1,4 +1,9 @@
 {
+  "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

@@ -1,4 +1,9 @@
 {
+  "extensionDescription": {
+    "message": "Quick Dial, страница брзог бирања коју инспириса fast dial.",
+    "description": "Description of the extension."
+  },
+
   "menuAddToQuickDial": {
     "message": "Додај у брзо бирање",
     "description": "Text of add bookmark menu item."

src/_locales/uk/messages.json

@@ -1,67 +0,0 @@
-{
-  "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/settings.html

@@ -62,18 +62,6 @@
 							<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">
@@ -96,24 +84,6 @@
 							<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,31 +4,14 @@ 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(e){
+		browser.browserAction.onClicked.addListener(function(){
-			if(app.settings.openQuickDialInNewPage) browser.tabs.create({});
+			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();
 		});
-    browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded });
-    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);
-    }
-		
 	});
 };
 
@@ -118,7 +101,7 @@ 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 || ! data.settings) {
+		if(Object.keys(data).length == 0) {
 			data = {
 				version: 3,
 				settings: {
@@ -126,7 +109,6 @@ app.Settings.init = function(callback){ // Load settings and nodes
 					backgroundImage: null,
 					backgroundMode: 0,
 					menuShowAdd: true,
-					openQuickDialInNewPage: true,
 					grid: {
 						margin: 10,
 						rows: 4,
@@ -139,8 +121,6 @@ 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,
@@ -236,16 +216,6 @@ app.Settings.init = function(callback){ // Load settings and nodes
 			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();
 		}
 		app.settings = data.settings;
@@ -258,7 +228,6 @@ 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;
@@ -276,143 +245,15 @@ 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({
+		browser.contextMenus.create({ // Create Context menu
 			id: 'AddToQuickDial',
 			title: browser.i18n.getMessage("menuAddToQuickDial"),
 			contexts: ["all"],
-			documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ],
+			documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ]
-			onclick(info, tab) { app.ContextMenus.menuItemClicked(info, tab)	}
+		}, function(){});
-		});
+		browser.contextMenus.onClicked.addListener(app.ContextMenus.menuItemClicked);
 	}
-	// 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);
@@ -656,7 +497,7 @@ app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes w
 		delete app.GridNodes._syncing;
 		if(app.GridNodes._needSync == true) {
 			delete app.GridNodes._needSync;
-      app.GridNodes.sync(gridNode, rootPath, callback);
+			app.GridNodes.sync(gridNode, rootPath, callback);
 		} else {
 			app.GridNodes.save();			
 			if(callback) callback();

src/js/dial.js

@@ -7,12 +7,9 @@ var dial = {
 };
 
 document.addEventListener("DOMContentLoaded", function(event) {
-  document.body.style.backgroundColor = utils.getBackgroundColor();
+	document.body.style.backgroundColor = utils.getBackgroundColor();
 	app.init();
 	dial.init();
-  window.setTimeout(function(){
-    if(! app.settings) app.init();
-  }, 500);
 });
 
 window.addEventListener('resize', function(){
@@ -105,7 +102,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){
@@ -163,11 +160,10 @@ 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');
@@ -251,7 +247,6 @@ dial.initMenus = function(){
 	dial.ItemMenu.appendChild(dial.ItemMenuSettings);
 	document.body.appendChild(dial.ItemMenu);
 }
-*/
 dial.initStyles = function(){
 	function applyImageMode(imageMode, target){
 		switch(imageMode){
@@ -281,7 +276,7 @@ dial.initStyles = function(){
 	document.head.appendChild(dial.Style);
 	dial.styles = {};
 	dial.styles.html = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('html { height: 100%; }')].style;
-	dial.styles.body = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('body { user-select: none; -moz-user-select: none; display: flex; width: 100%; height: 100%; margin: 0px; padding: 0px; background-color: ' + app.settings.backgroundColor + '; background-image: ' + app.settings.backgroundImage + '; }')].style;
+	dial.styles.body = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('body { user-select: none; -moz-user-select: none; display: flex;	width: 100%; height: 100%; margin: 0px; padding: 0px; background-color: ' + app.settings.backgroundColor + '; background-image: ' + app.settings.backgroundImage + '; }')].style;
 	applyImageMode(app.settings.backgroundMode, dial.styles.body);
 	dial.styles.grid = {};
 	dial.styles.grid.grid = dial.Style.sheet.cssRules[dial.Style.sheet.insertRule('.Grid { border-collapse: collapse; margin: auto; }')].style;
@@ -294,7 +289,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 + '; 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 + '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;
 	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;
@@ -330,7 +325,6 @@ 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:
@@ -342,7 +336,6 @@ dial.initGrid = function(){
 							break;
 					}
 				}
-				*/
 			};
 			
 			function dragstart_handler(ev) {
@@ -350,7 +343,6 @@ 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}));
@@ -485,7 +477,6 @@ 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');
@@ -495,7 +486,6 @@ 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');
@@ -510,14 +500,6 @@ 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;
@@ -537,14 +519,6 @@ 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/settings.js

@@ -27,16 +27,12 @@ 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;
@@ -88,15 +84,11 @@ app.init = function(){
 		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,13 +2,14 @@
 
   "manifest_version": 2,
   "name": "Quick Dial",
-  "version": "0.1.20",
+  "version": "0.1.12",
   "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",
@@ -43,7 +44,7 @@
   "applications": {
     "gecko": {
       "id": "quickdial@matmoul.com",
-      "strict_min_version": "70.0"
+      "strict_min_version": "52.0"
     }
   },