Version 0.1.8

.gitignore

@@ -1 +1,2 @@
 **/src.zip
+/*.zip

makebeta

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [ "$1" == "" ]; then
+	echo "Error: No version provided"
+	echo "./makebeta 0.0.1b1"
+	exit 1
+fi
+
+clear
+branch=$(git rev-parse --abbrev-ref HEAD)
+read -p "Current branch is $branch. Continue ? (y/N)" choice
+case "$choice" in 
+  n|N|'' )
+    echo "Cancel !"
+    exit 1
+  ;;
+  y|Y ) echo "Make beta...";;
+  * )
+    echo "Cancel !"
+    exit 1
+  ;;
+esac
+
+
+
+# Ready to update :
+
+git branch beta
+git checkout beta
+
+version=$1
+
+sed -i "/\"version\":/c\ \ \"version\": \"$version\"," src/manifest.json
+
+git commit -a -m "Beta Version $version"
+
+cd src
+zip -r ../quickdial-beta-$version.zip . -x src.zip
+cd ..
+
+git checkout $branch
+git branch -D beta
+

makerelease

@@ -46,3 +46,7 @@ git tag -a "v$version" -m "Version $version"
 git push --tags
 
 git checkout $branch
+
+cd src
+zip -r ../quickdial-$version.zip . -x src.zip
+cd ..

src/js/background.js

@@ -132,8 +132,8 @@ app.Settings.init = function(callback){ // Load settings and nodes
 							borderSizeHover: 1,
 							title: true,
 							titleHover: true,
-							titleHeight: 15,
+							titleHeight: 16,
-							titleHeightHover: 15,
+							titleHeightHover: 16,
 							titleFontSize: 10,
 							titleFontSizeHover: 10,
 							titleFont: 'Arial, Verdana, Sans-serif',
@@ -191,7 +191,6 @@ app.Settings.init = function(callback){ // Load settings and nodes
 			data.settings.grid.cells.borderSize = 1;
 			data.settings.grid.cells.borderSizeHover = data.settings.grid.cells.borderSize;
 			data.settings.grid.cells.titleHover = data.settings.grid.cells.title;
-			data.settings.grid.cells.titleHeight -= 1;
 			data.settings.grid.cells.titleHeightHover = data.settings.grid.cells.titleHeight;
 			data.settings.grid.cells.titleFontSizeHover = data.settings.grid.cells.titleFontSize;
 			data.settings.grid.cells.titleBorderSize = 1;
@@ -409,7 +408,10 @@ app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes w
 			gridNode.title = bookmarkItem.title;
 			if(bookmarkItem.url){
 				gridNode.type = app.GridNodes.GridNodeType.bookmark;
-				if(!gridNode.url) gridNode.url = bookmarkItem.url;
+				if(gridNode.url != bookmarkItem.url){
+					gridNode.url = bookmarkItem.url;
+					delete gridNode.image;
+				}
 			} else if(bookmarkItem.children){
 				gridNode.type = app.GridNodes.GridNodeType.folder;
 				var EmptyNodes = [];

src/js/dial.js

@@ -342,10 +342,23 @@ dial.initGrid = function(){
 				}
 				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", index);
+				ev.dataTransfer.setData("text/plain", JSON.stringify({parentId: app.node.id, index: index}));
 			}
 			function dragover_handler(ev) {
 				ev.preventDefault();
+				var data = ev.dataTransfer.getData("text");
+				try {
+					data = JSON.parse(data);
+				} catch(e) {
+					data = null;
+				}
+				if(!data){
+					ev.dataTransfer.dropEffect = "none";
+					return;
+				} else if(data.parentId != app.node.id){
+					ev.dataTransfer.dropEffect = "none";
+					return;
+				}
 				if(app.settings.grid.backNode && dial.path != '/'){
 					var gridIndex = 0;
 					if(ev.target.tagName == 'DIV') gridIndex = +(ev.target.parentElement.parentElement.getAttribute('gridindex'));
@@ -359,7 +372,15 @@ dial.initGrid = function(){
 			function drop_handler(ev) {
 				ev.preventDefault();
 				if(ev.buttons == 1) return;
-				var StartIndex = ev.dataTransfer.getData("text");
+				var data = ev.dataTransfer.getData("text");
+				try {
+					data = JSON.parse(data);
+				} catch(e) {
+					data = null;
+				}
+				if(!data) return;
+				else if(data.parentId != app.node.id) return;
+				var StartIndex = data.index;
 				var EndIndex = 0;
 				if(ev.target.tagName == 'DIV'){
 					EndIndex = (dial.page - 1) * (app.settings.grid.rows * app.settings.grid.columns) + +(ev.target.parentElement.parentElement.getAttribute('gridindex'));

src/manifest.json

@@ -2,7 +2,7 @@
 
   "manifest_version": 2,
   "name": "Quick Dial",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "author": "MatMoul",
   "homepage_url": "https://github.com/MatMoul/quickdial-webext",
   "developer": {