- Fix undo issues over features.

mindplot/src/main/javascript/Topic.js

@@ -274,7 +274,7 @@ mindplot.Topic = new Class({
         return result;
     },
 
-    addFeature:function (type, attributes) {
+    addFeature:function (type, attributes, featureId) {
         var iconGroup = this.getOrBuildIconGroup();
         this.closeEditors();
 
@@ -282,8 +282,12 @@ mindplot.Topic = new Class({
 
         // Update model ...
         var feature = model.createFeature(type, attributes);
+        if ($defined(featureId)) {
+            feature.setId(featureId);
+        }
         model.addFeature(feature);
 
+
         var result = mindplot.TopicFeature.createIcon(this, feature, this.isReadOnly());
         iconGroup.addIcon(result, type == mindplot.TopicFeature.Icon.id && !this.isReadOnly());
 

mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js

@@ -40,9 +40,7 @@ mindplot.commands.RemoveFeatureFromTopicCommand = new Class({
         var topic = commandContext.findTopics(this._topicId)[0];
 
         var feature = this._oldFeature;
-        var newFeature = topic.addFeature(feature.getType(), feature.getAttributes());
+        topic.addFeature(feature.getType(), feature.getAttributes(), this._featureId);
-        this._featureId = newFeature.getModel().getId();
-
         this._oldFeature = null;
     }
 });

mindplot/src/main/javascript/model/FeatureModel.js

@@ -55,6 +55,10 @@ mindplot.model.FeatureModel = new Class({
         return this._id;
     },
 
+    setId : function(id) {
+        this._id = id;
+    },
+
     getType:function() {
         return this._type;
     }