Merge branch 'master' of repo.wisemapping.org:wisemapping/wiseorg

This commit is contained in:
Paulo Gustavo Veiga 2012-03-14 23:01:52 -03:00
commit 27ad9af1b3

View File

@ -309,7 +309,7 @@ mindplot.Designer = new Class({
}, },
createChildForSelectedNode : function() { createChildForSelectedNode : function() {
console.log("createChildForSelectedNode"); //TODO(gb): Remove trace!!!
var nodes = this.getModel().filterSelectedTopics(); var nodes = this.getModel().filterSelectedTopics();
if (nodes.length <= 0) { if (nodes.length <= 0) {
// If there are more than one node selected, // If there are more than one node selected,
@ -368,8 +368,8 @@ mindplot.Designer = new Class({
createSiblingForSelectedNode : function() { createSiblingForSelectedNode : function() {
var nodes = this.getModel().filterSelectedTopics(); var nodes = this.getModel().filterSelectedTopics();
if (nodes.length <= 0) { if (nodes.length <= 0) {
// If there are more than one node selected, // If there are no nodes selected,
$notify('Could not create a topic. Only one node must be selected.'); $notify('Could not create a topic. At least one node must be selected.');
return; return;
} }
@ -387,6 +387,13 @@ mindplot.Designer = new Class({
} else { } else {
var parentTopic = topic.getOutgoingConnectedTopic(); var parentTopic = topic.getOutgoingConnectedTopic();
var siblingModel = this._createSiblingModel(topic); var siblingModel = this._createSiblingModel(topic);
// Hack: if parent is central topic, add node below not on opposite side.
// This should be done in the layout
if (parentTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
siblingModel.setOrder(topic.getOrder() + 2);
}
var parentTopicId = parentTopic.getId(); var parentTopicId = parentTopic.getId();
this._actionDispatcher.addTopic(siblingModel, parentTopicId, true); this._actionDispatcher.addTopic(siblingModel, parentTopicId, true);