From 60ab4c7f5d61ca37653482d9cd6d4662dcd6d448 Mon Sep 17 00:00:00 2001
From: Pablo Luna <lunapablo@gmail.com>
Date: Sat, 16 Apr 2011 15:52:21 +0100
Subject: [PATCH] fixing original layout bugs

---
 mindplot/src/main/javascript/FixedDistanceBoard.js   |  7 ++++++-
 mindplot/src/main/javascript/NodeModel.js            |  2 +-
 mindplot/src/main/javascript/NoteModel.js            |  2 +-
 .../layoutManagers/OriginalLayoutManager.js          | 12 ++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mindplot/src/main/javascript/FixedDistanceBoard.js b/mindplot/src/main/javascript/FixedDistanceBoard.js
index f7055a32..0f5f1e07 100644
--- a/mindplot/src/main/javascript/FixedDistanceBoard.js
+++ b/mindplot/src/main/javascript/FixedDistanceBoard.js
@@ -199,7 +199,12 @@ mindplot.FixedDistanceBoard.prototype.repositionate = function()
     var lowerLimit;
     if (entries.length > 0)
     {
-        var topic = entries[0].getTopic();
+        var l = 0;
+        for(l=0; l<entries.length; l++){
+            if(core.Utils.isDefined(entries[l]))
+                break;
+        }
+        var topic = entries[l].getTopic();
         var firstNodeHeight = topic.getSize().height;
         lowerLimit = refence.y - (height / 2) - (firstNodeHeight / 2) + 1;
     }
diff --git a/mindplot/src/main/javascript/NodeModel.js b/mindplot/src/main/javascript/NodeModel.js
index 5bf155b4..5091f326 100644
--- a/mindplot/src/main/javascript/NodeModel.js
+++ b/mindplot/src/main/javascript/NodeModel.js
@@ -152,7 +152,7 @@ mindplot.NodeModel.prototype._removeLink = function(link)
 
 mindplot.NodeModel.prototype.createNote = function(text)
 {
-    core.assert(text, 'note text must be specified.');
+    core.assert(text!=null, 'note text must be specified.');
     return new mindplot.NoteModel(text, this);
 };
 
diff --git a/mindplot/src/main/javascript/NoteModel.js b/mindplot/src/main/javascript/NoteModel.js
index 099bc426..6f90bf48 100644
--- a/mindplot/src/main/javascript/NoteModel.js
+++ b/mindplot/src/main/javascript/NoteModel.js
@@ -18,7 +18,7 @@
 
 mindplot.NoteModel = function(text, topic)
 {
-    core.assert(text, 'note text can not be null');
+    core.assert(text!=null, 'note text can not be null');
     core.assert(topic, 'mindmap can not be null');
     this._text = text;
     this._topic = topic;
diff --git a/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js b/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js
index c9b0bc9c..499144bb 100644
--- a/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js
+++ b/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js
@@ -25,12 +25,16 @@ mindplot.layoutManagers.OriginalLayoutManager = mindplot.layoutManagers.BaseLayo
                 var order = child.getOrder();
                 if (!core.Utils.isDefined(order))
                 {
-                    order = maxOrder++;
+                    order = ++maxOrder;
+                    child.setOrder(order);
                 }
 
                 if(nodesByOrder.hasKey(order)){
-                    //duplicated order. Change order to next available.
-                    order = maxOrder++;
+                    if(Math.sign(child.getPosition().x) == Math.sign(nodesByOrder.get(order).getPosition().x)){
+                        //duplicated order. Change order to next available.
+                        order = ++maxOrder;
+                        child.setOrder(order);
+                    }
                 }else{
                     nodesByOrder.set(order, child);
                     if(order>maxOrder)
@@ -40,7 +44,7 @@ mindplot.layoutManagers.OriginalLayoutManager = mindplot.layoutManagers.BaseLayo
             }
         }
         nodesByOrder=null;
-        return result;
+        return node.getTopicType()!=mindplot.NodeModel.CENTRAL_TOPIC_TYPE?result:children;
     },
     _nodeResizeEvent:function(node){