vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-29 09:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix remove icon.

Browse Source
This commit is contained in:
Paulo Veiga 2011-08-29 20:32:12 -03:00
parent c74d2de32d
commit 55db305b10
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindplot/src/main/javascript/ImageIcon.js
View File

@ -108,7 +108,7 @@ mindplot.ImageIcon = new Class({
remove : function() { remove : function() {
var actionDispatcher = mindplot.ActionDispatcher.getInstance(); var actionDispatcher = mindplot.ActionDispatcher.getInstance();
actionDispatcher.removeIconFromTopic(this._topic.getModel(), this._iconModel); actionDispatcher.removeIconFromTopic(this._topic.getId(), this._iconModel);
} }
}); });

14
mindplot/src/main/javascript/LocalActionDispatcher.js
View File

@ -242,21 +242,15 @@ mindplot.CommandContext = new Class({
}, },
findTopics:function(topicsIds) { findTopics:function(topicsIds) {
var designerTopics = this._designer.getModel().getTopics(); $assert(topicsIds, "topicsIds can not be null");
if (!(topicsIds instanceof Array)) { if (!(topicsIds instanceof Array)) {
topicsIds = [topicsIds]; topicsIds = [topicsIds];
} }
var result = designerTopics.filter(function(topic) { var designerTopics = this._designer.getModel().getTopics();
var found = false; return designerTopics.filter(function(topic) {
if (topic != null) { return topicsIds.contains(topic.getId());
var topicId = topic.getId();
found = topicsIds.contains(topicId);
}
return found;
}); });
return result;
}, },
deleteTopic:function(topic) { deleteTopic:function(topic) {

8
mindplot/src/main/javascript/commands/RemoveIconFromTopicCommand.js
View File

@ -18,11 +18,11 @@
mindplot.commands.RemoveIconFromTopicCommand = new Class({ mindplot.commands.RemoveIconFromTopicCommand = new Class({
Extends:mindplot.Command, Extends:mindplot.Command,
initialize: function(topicId, iconModel) initialize: function(topicIds, iconModel)
{ {
$assert(topicId, 'topicId can not be null'); $assert(topicIds, 'topicIds can not be null');
$assert(iconModel, 'iconId can not be null'); $assert(iconModel, 'iconModel can not be null');
this._objectsIds = topicId; this._objectsIds = topicIds;
this._iconModel = iconModel; this._iconModel = iconModel;
}, },
execute: function(commandContext) execute: function(commandContext)