vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix f2.

Browse Source 
- Reduce timeout.
This commit is contained in:
Paulo Veiga 2011-08-25 00:17:13 -03:00
parent d114df74f6
commit 9fbe0050df
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mindplot/src/main/javascript/DesignerKeyboard.js
View File

@ -47,8 +47,7 @@ mindplot.DesignerKeyboard = new Class({
'f2' : function() { 'f2' : function() {
var node = this._getSelectedNode(designer); var node = this._getSelectedNode(designer);
if (node) { if (node) {
var topic = nodes[0]; node.showTextEditor();
topic.showTextEditor();
} }
}.bind(this), }.bind(this),
@ -197,7 +196,7 @@ mindplot.DesignerKeyboard = new Class({
var regex = /^(?:shift|control|ctrl|alt|meta)$/; var regex = /^(?:shift|control|ctrl|alt|meta)$/;
var modifiers = ['shift', 'control', 'alt', 'meta']; var modifiers = ['shift', 'control', 'alt', 'meta'];
var excludes = ['esc','capslock','tab','f3','f4','f5','f6','f7','f8','f9','10','11','12']; var excludes = ['esc','capslock','tab','f1','f3','f4','f5','f6','f7','f8','f9','f10','f11','f12'];
$(document).addEvent('keydown', function(event) { $(document).addEvent('keydown', function(event) {
@ -324,7 +323,7 @@ mindplot.DesignerKeyboard = new Class({
}, },
_getSelectedNode : function(designer) { _getSelectedNode : function(designer) {
var nodes = designer.filterSelectedTopics(); var nodes = designer.getModel().filterSelectedTopics();
return (nodes.length > 0) ? nodes[0] : null; return (nodes.length > 0) ? nodes[0] : null;
} }
}); });

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

@ -245,7 +245,7 @@ mindplot.IconGroup.RemoveTip = new Class({
}, },
hide : function() { hide : function() {
this.close(500); this.close(200);
}, },
close : function(delay) { close : function(delay) {

9
mindplot/src/main/javascript/MindmapDesigner.js
View File

@ -298,8 +298,7 @@ mindplot.MindmapDesigner = new Class({
this._actionDispatcher.addTopic(siblingModel, parentTopicId, true); this._actionDispatcher.addTopic(siblingModel, parentTopicId, true);
} }
} },
,
addRelationShip : function(event) { addRelationShip : function(event) {
var screen = this._workspace.getScreenManager(); var screen = this._workspace.getScreenManager();
@ -612,15 +611,15 @@ mindplot.MindmapDesigner = new Class({
deleteCurrentNode : function() { deleteCurrentNode : function() {
var validateFunc = function(selectedObject) { var validateFunc = function(object) {
return selectedObject.getType() == mindplot.RelationshipLine.type || selectedObject.getTopicType() != mindplot.model.NodeModel.CENTRAL_TOPIC_TYPE return object.getType() == mindplot.RelationshipLine.type || object.getTopicType() != mindplot.model.NodeModel.CENTRAL_TOPIC_TYPE
}; };
var validateError = 'Central topic can not be deleted.'; var validateError = 'Central topic can not be deleted.';
var model = this.getModel(); var model = this.getModel();
var topics = model.filterTopicsIds(validateFunc, validateError); var topics = model.filterTopicsIds(validateFunc, validateError);
var rel = model.filterRelationIds(validateFunc, validateError); var rel = model.filterRelationIds(validateFunc, validateError);
if (objects.length > 0) { if (topics.length > 0 || rel.length > 0) {
this._actionDispatcher.deleteTopics({'nodes':topics,'relationship':rel}); this._actionDispatcher.deleteTopics({'nodes':topics,'relationship':rel});
} }