Version 0.1.15

Add Spanish translation

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

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

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

src/html/settings.html

@@ -62,6 +62,14 @@
 							<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>
+
+
+
 					</table>
 				</div>
 				<div class="hidden">
@@ -84,6 +92,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,8 +4,9 @@ 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.tabs.create({});
+		browser.browserAction.onClicked.addListener(function(e){
+			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 });
@@ -101,7 +102,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) {
+		if(Object.keys(data).length == 0 || ! data.settings) {
 			data = {
 				version: 3,
 				settings: {
@@ -109,6 +110,7 @@ app.Settings.init = function(callback){ // Load settings and nodes
 					backgroundImage: null,
 					backgroundMode: 0,
 					menuShowAdd: true,
+					openQuickDialInNewPage: true,
 					grid: {
 						margin: 10,
 						rows: 4,
@@ -121,6 +123,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,
@@ -216,6 +220,13 @@ 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;
+			}
 			//app.Settings.save();
 		}
 		app.settings = data.settings;
@@ -228,6 +239,7 @@ 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;

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){
@@ -477,6 +480,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 +490,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 +505,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 +532,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/settings.js

@@ -27,12 +27,15 @@ app.init = function(){
 		BackgroundPreview.style.backgroundImage = app.settings.backgroundImage;
 		BackgroundPreview.style.backgroundRepeat = 'no-repeat';
 		BackgroundPreview.style.backgroundSize = '100% 100%';
+		ButtonOpenInNewPage.checked = app.settings.openQuickDialInNewPage;
 		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;
@@ -84,11 +87,14 @@ app.init = function(){
 		app.settings.backgroundColor = BackgroundColor.value;
 		app.settings.backgroundImage = BackgroundImage;
 		app.settings.backgroundMode = +(BackgroundMode.value);
+		app.settings.openQuickDialInNewPage = ButtonOpenInNewPage.checked;
 		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.12",
+  "version": "0.1.15",
   "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",