vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-10-05 17:58:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix wrong state issue when the topic is restored.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-09-27 20:18:12 -03:00
parent f6e5018272
commit 1e5e11a309
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mindplot/src/main/javascript/Designer.js
View File

@ -116,7 +116,6 @@ mindplot.Designer = new Class({
}, },
addEvent:function (type, listener) { addEvent:function (type, listener) {
if (type == mindplot.TopicEvent.EDIT || type == mindplot.TopicEvent.CLICK) { if (type == mindplot.TopicEvent.EDIT || type == mindplot.TopicEvent.CLICK) {
var editor = mindplot.TopicEventDispatcher.getInstance(); var editor = mindplot.TopicEventDispatcher.getInstance();
@ -207,12 +206,8 @@ mindplot.Designer = new Class({
_buildNodeGraph:function (model, readOnly) { _buildNodeGraph:function (model, readOnly) {
var workspace = this._workspace;
// Create node graph ... // Create node graph ...
var topic = mindplot.NodeGraph.create(model, {readOnly:readOnly}); var topic = mindplot.NodeGraph.create(model, {readOnly:readOnly});
// Append it to the workspace ...
this.getModel().addTopic(topic); this.getModel().addTopic(topic);
// Add Topic events ... // Add Topic events ...
@ -248,7 +243,7 @@ mindplot.Designer = new Class({
} }
} }
$assert(targetTopic, "Could not find a topic to connect"); $assert(targetTopic, "Could not find a topic to connect");
topic.connectTo(targetTopic, workspace); topic.connectTo(targetTopic, this._workspace);
} }
topic.addEvent('ontblur', function () { topic.addEvent('ontblur', function () {
@ -602,6 +597,7 @@ mindplot.Designer = new Class({
}); });
var nodeGraph = this._buildNodeGraph(nodeModel, this.isReadOnly()); var nodeGraph = this._buildNodeGraph(nodeModel, this.isReadOnly());
nodeGraph.setVisibility(false);
this._workspace.appendChild(nodeGraph); this._workspace.appendChild(nodeGraph);
for (var i = 0; i < children.length; i++) { for (var i = 0; i < children.length; i++) {

4
mindplot/src/main/javascript/StandaloneActionDispatcher.js
View File

@ -269,8 +269,8 @@ mindplot.CommandContext = new Class({
return mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE); return mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE);
}, },
connect:function (childTopic, parentTopic, isVisible) { connect:function (childTopic, parentTopic) {
childTopic.connectTo(parentTopic, this._designer._workspace, isVisible); childTopic.connectTo(parentTopic, this._designer._workspace);
}, },
disconnect:function (topic) { disconnect:function (topic) {

8
mindplot/src/main/javascript/Topic.js
View File

@ -1023,7 +1023,7 @@ mindplot.Topic = new Class({
model.setOrder(value); model.setOrder(value);
}, },
connectTo:function (targetTopic, workspace, isVisible) { connectTo:function (targetTopic, workspace) {
$assert(!this._outgoingLine, 'Could not connect an already connected node'); $assert(!this._outgoingLine, 'Could not connect an already connected node');
$assert(targetTopic != this, 'Circular connection are not allowed'); $assert(targetTopic != this, 'Circular connection are not allowed');
$assert(targetTopic, 'Parent Graph can not be null'); $assert(targetTopic, 'Parent Graph can not be null');
@ -1040,9 +1040,8 @@ mindplot.Topic = new Class({
// Create a connection line ... // Create a connection line ...
var outgoingLine = new mindplot.ConnectionLine(this, targetTopic); var outgoingLine = new mindplot.ConnectionLine(this, targetTopic);
if ($defined(isVisible)) { outgoingLine.setVisibility(this.isVisible());
outgoingLine.setVisibility(isVisible);
}
this._outgoingLine = outgoingLine; this._outgoingLine = outgoingLine;
workspace.appendChild(outgoingLine); workspace.appendChild(outgoingLine);
@ -1074,7 +1073,6 @@ mindplot.Topic = new Class({
if (this.isInWorkspace()) { if (this.isInWorkspace()) {
mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeConnectEvent, {parentNode:targetTopic.getModel(), childNode:this.getModel()}); mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeConnectEvent, {parentNode:targetTopic.getModel(), childNode:this.getModel()});
} }
}, },
appendChild:function (child) { appendChild:function (child) {

5
mindplot/src/main/javascript/commands/DeleteCommand.js
View File

@ -96,6 +96,11 @@ mindplot.commands.DeleteCommand = new Class({
commandContext.addRelationship(model); commandContext.addRelationship(model);
}.bind(this)); }.bind(this));
// Finally display the topics ...
this._deletedTopicModels.each(function (topicModel) {
var topics = commandContext.findTopics(topicModel.getId());
topics[0].setBranchVisibility(true);
}, this);
// Focus on last recovered topic .. // Focus on last recovered topic ..
if (this._deletedTopicModels.length > 0) { if (this._deletedTopicModels.length > 0) {