setInteractive now works on non-zero sized Containers. Sorting fixed.

Author: photonstorm

CHANGELOG.md

@@ -6,9 +6,12 @@
 
 ### Updates
 
+* Container.setInteractive can now be called without any arguments as long as you have called Container.setSize first (thanks rex)
+
 ### Bug Fixes
 
 * PluginManager.destroy didn't reference the plugin correctly, throwing an Uncaught TypeError if you tried to destroy a game instance. Fix #3668 (thanks @Telokis)
+* If a Container and its child were both input enabled they will now be sorted correctly in the InputPlugin (thanks rex)
 
 ### Examples, Documentation and TypeScript
 

src/input/InputPlugin.js

@@ -1196,12 +1196,6 @@ var InputPlugin = new Class({
         {
             var gameObject = gameObjects[i];
 
-            if (gameObject.type === 'Container')
-            {
-                console.warn('Container.setInteractive() must specify a Shape');
-                continue;
-            }
-
             var frame = gameObject.frame;
 
             var width = 0;
@@ -1218,6 +1212,12 @@ var InputPlugin = new Class({
                 height = gameObject.height;
             }
 
+            if (gameObject.type === 'Container' && (width === 0 || height === 0))
+            {
+                console.warn('Container.setInteractive() must specify a Shape or call setSize() first');
+                continue;
+            }
+
             if (width !== 0 && height !== 0)
             {
                 gameObject.input = CreateInteractiveObject(gameObject, new Rectangle(0, 0, width, height), callback);
@@ -1410,6 +1410,16 @@ var InputPlugin = new Class({
             //  Quick bail out when both children have the same container
             return childB.parentContainer.getIndex(childB) - childA.parentContainer.getIndex(childA);
         }
+        else if (childA.parentContainer === childB)
+        {
+            //  Quick bail out when childA is a child of childB
+            return -1;
+        }
+        else if (childB.parentContainer === childA)
+        {
+            //  Quick bail out when childA is a child of childB
+            return 1;
+        }
         else
         {
             //  Container index check
@@ -1419,8 +1429,6 @@ var InputPlugin = new Class({
 
             for (var i = 0; i < len; i++)
             {
-                // var indexA = listA[i][0];
-                // var indexB = listB[i][0];
                 var indexA = listA[i];
                 var indexB = listB[i];