iOS: fixed issue with deleting interfaces where an interface would be…

… run after pressing the delete button
charlieroberts · Oct 3, 2011 · 7ce2a54 · 7ce2a54
1 parent cd70c89
commit 7ce2a54
Showing 1 changed file with 38 additions and 9 deletions.
diff --git a/www/js/InterfaceManager.js b/www/js/InterfaceManager.js
@@ -20,6 +20,8 @@ function InterfaceManager() {
                                   "spacetime.js",
                                   "pitchTracker.js",
                                   ];
+
+        this.listItemFunctions = [];
         window.shouldReadFiles = true;
         window.isLoadingInterfaces = false; // stops database calls from being executed twice, for some reason "get" returns two values.
     }
@@ -195,7 +197,6 @@ function InterfaceManager() {
 	}
 
 	this.editInterfaceList = function() {
-
 		var list = document.getElementById('interfaceList');
 
 		if(list.childNodes.length > 0) {
@@ -204,12 +205,31 @@ function InterfaceManager() {
 
 			for(var i = 0; i < list.childNodes.length; i++) {
 				var item = list.childNodes[i];
-				var deleteButton = document.createElement("div"); // -webkit-border-radius:10px;
-				deleteButton.setAttribute("style", "float:left; margin-right: 5px; position:relative; top:0px; border: #fff 2px solid; -webkit-border-radius:10px; width: 15px; height: 15px; background-color:#f00; color:#fff; font-weight:bold;");
-				deleteButton.innerHTML = "<img style='position:relative; top:-.7em; left:-.65em;' src='images/dash.png'>";
-				deleteButton.setAttribute("ontouchend", "interfaceManager.removeInterface("+i+")");
-				item.insertBefore(deleteButton, item.firstChild);
-				item.setAttribute("ontouchend", null);		
+				var deleteButton = document.createElement("div");
+				$(deleteButton).css({
+                                    "float":                    "left",
+                                    "margin-right":             "5px",
+                                    "position":                 "relative",
+                                    "top":                      "0px",
+                                    "border":                   "#fff 2px solid",
+                                    "-webkit-border-radius":    "10px",
+                                    "width" :                   "15px",
+                                    "height":                   "15px",
+                                    "background-color":         "#f00",
+                                    "color":                    "#fff",
+                                    "font-weight" :             "bold",
+                                    });
+
+                function _touchend(interfaceNumber) { 
+                    return function(e) {
+                        interfaceManager.removeInterface(interfaceNumber);
+                    }
+                }
+
+				$(deleteButton).html("<img style='position:relative; top:-.7em; left:-.65em;' src='images/dash.png'>");
+				$(deleteButton).bind("touchend", _touchend(i), false);
+				$(item).prepend(deleteButton);
+				$(item).unbind("tap");		
 			}
 		}
 	}
@@ -222,7 +242,15 @@ function InterfaceManager() {
 		for(var i = 0; i < list.childNodes.length; i++) {
 			var item = list.childNodes[i];
 			item.removeChild(item.childNodes[0]);
-			item.setAttribute("ontouchend", "interfaceManager.highlight("+ i +"); interfaceManager.selectInterfaceFromList('" + item.innerHTML + "');");		
+
+            function _touchend(interfaceNumber, itemHTML) { 
+                return function(e) {
+                    interfaceManager.highlight(interfaceNumber);
+                    interfaceManager.selectInterfaceFromList(itemHTML);
+                }
+            }
+
+			$(item).bind("tap", _touchend(i, item.innerHTML));
 		}
 	}
 
@@ -288,11 +316,12 @@ function InterfaceManager() {
 	}
 
 	this.removeInterface = function (itemNumber) {
+
         var listItem = $('#interfaceList > li:eq(' + itemNumber +')');
         var arr = listItem.html().split("</div>");
 		var newKey = arr[1];
         interfaceManager.interfaceFiles.remove(newKey);        
-        //console.log("removing " + newKey);
+        console.log("removing " + newKey);
 		listItem.remove();
         $('#interfaceList').listview('refresh');
 	}