From 41f4a3414c64b1614fd2fbdbb3607152c63a7877 Mon Sep 17 00:00:00 2001
From: John Chen <zhang.z.chen@intel.com>
Date: Fri, 13 Jul 2012 11:33:05 +0800
Subject: [PATCH] [ADM] Redefine the meaning of a container

Now any widget that has at least one zone is a container, even if
the zone can contain only 1 child.
Also modified some code which exist only because of the previous
defintion of container.
---
 src/js/adm.js          | 3 +--
 src/js/composer.js     | 2 +-
 src/js/views/layout.js | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/js/adm.js b/src/js/adm.js
index d9505af4..4fa96567 100644
--- a/src/js/adm.js
+++ b/src/js/adm.js
@@ -1336,8 +1336,7 @@ ADMNode.prototype.isMoveable = function () {
  */
 ADMNode.prototype.isContainer = function () {
     var zones = BWidget.getZones(this.getType());
-    return (zones.length === 1 &&
-            BWidget.getZoneCardinality(this.getType(),zones[0]) === "N");
+    return zones.length > 0;
 };
 
 /**
diff --git a/src/js/composer.js b/src/js/composer.js
index b711783e..64d32b5d 100644
--- a/src/js/composer.js
+++ b/src/js/composer.js
@@ -518,7 +518,7 @@ $(function() {
         });
 
         // Configure "sortable" behaviors
-        targets = $(e.target).subtree('.nrc-sortable-container,body .ui-page');
+        targets = $(e.target).subtree('.nrc-sortable-container');
 
         debug && console.log("Found ["+targets.length+"] sortable targets: ");
 
diff --git a/src/js/views/layout.js b/src/js/views/layout.js
index cb342df0..cb878247 100644
--- a/src/js/views/layout.js
+++ b/src/js/views/layout.js
@@ -374,7 +374,7 @@
             }
 
             // If this node is a "container", make sure it's class reflects this
-            if (admNode.isContainer() || admNode.getType() === 'Header') {
+            if (admNode.isContainer()) {
                 $(domNode).addClass('nrc-sortable-container');
                 if (admNode.getChildrenCount() === 0) {
                     $(domNode).addClass('empty');