From 8936faa6a550b71168bfd786f447f5e6512414cf Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 16 Jan 2014 16:35:20 -0800
Subject: [PATCH] Sort layer containers within flatten().

---
 .../src/main/webapp/modules/Client.js         | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
index 0e3f7865f..8fd41b0dc 100644
--- a/guacamole-common-js/src/main/webapp/modules/Client.js
+++ b/guacamole-common-js/src/main/webapp/modules/Client.js
@@ -1298,6 +1298,41 @@ Guacamole.Client = function(tunnel) {
 
         var context = canvas.getContext("2d");
 
+        // Returns sorted array of children
+        function get_children(layer) {
+
+            // Build array of children
+            var children = [];
+            for (var index in layer.children)
+                children.push(layer.children[index]);
+
+            // Sort
+            children.sort(function children_comparator(a, b) {
+
+                // Compare based on Z order
+                var diff = a.z - b.z;
+                if (diff !== 0)
+                    return diff;
+
+                // If Z order identical, use document order
+                var a_element = a.getElement();
+                var b_element = b.getElement();
+                var position = b_element.compareDocumentPosition(a_element);
+
+                if (position & Node.DOCUMENT_POSITION_PRECEDING) return -1;
+                if (position & Node.DOCUMENT_POSITION_FOLLOWING) return  1;
+
+                // Otherwise, assume same
+                return 0;
+
+            });
+
+            // Done
+            return children;
+
+        }
+
+        // Draws the contents of the given layer at the given coordinates
         function draw_layer(layer, x, y) {
 
             // Draw layer
@@ -1311,8 +1346,9 @@ Guacamole.Client = function(tunnel) {
                 context.drawImage(layer.getLayer().getCanvas(), x, y);
 
                 // Draw all children
-                for (var index in layer.children) {
-                    var child = layer.children[index];
+                var children = get_children(layer);
+                for (var i=0; i<children.length; i++) {
+                    var child = children[i];
                     draw_layer(child, x + child.x, y + child.y);
                 }