merge

1 files changed, 31 insertions, 2 deletions

diff --git a/public/assets/javascripts/rectangles/util/sort.js b/public/assets/javascripts/rectangles/util/sort.js
index 7aa40a2..cf8d6b1 100644
--- a/public/assets/javascripts/rectangles/util/sort.js
+++ b/public/assets/javascripts/rectangles/util/sort.js
@@ -95,9 +95,38 @@
 		return a.x < b.x ? -1 : a.x == b.x ? 0 : 1
 	}
 	sort.compare_z = function (a,b){
-		return a.z > b.z ? -1 : a.z == b.z ? 0 : 1
+		return a.z < b.z ? -1 : a.z == b.z ? 0 : 1
 	}
-	
+	sort.compare_xz = function(a,b){
+		if (a.x < b.x) {
+			return -1
+		}
+		if (a.x > b.x) {
+			return 1
+		}
+		if (a.z < b.z) {
+			return -1
+		}
+		if (a.z > b.z) {
+			return 1
+		}
+		return 0
+	}
+	sort.compare_zx = function(a,b){
+		if (a.z < b.z) {
+			return -1
+		}
+		if (a.z > b.z) {
+			return 1
+		}
+		if (a.x < b.x) {
+			return -1
+		}
+		if (a.x > b.x) {
+			return 1
+		}
+		return 0
+	}	
 	if ("window" in this) {
 		window.sort = sort
 	}