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

Several issues fixed.

Browse Source
This commit is contained in:
Paulo Veiga 2011-10-09 18:38:41 -03:00
parent 707e1864ef
commit c2670d5140
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ mindplot.BoardEntry = new Class({
}, },
setUpperLimit : function(value) { setUpperLimit : function(value) {
$assert(value, "upper limit can not be null"); $assert(!isNaN(value), "upper limit can not be null");
$assert(!isNaN(value), "illegal value"); $assert(!isNaN(value), "illegal value");
this._upperLimit = value; this._upperLimit = value;
}, },
@ -56,7 +56,7 @@ mindplot.BoardEntry = new Class({
}, },
setLowerLimit : function(value) { setLowerLimit : function(value) {
$assert(value, "upper limit can not be null"); $assert(!isNaN(value), "upper limit can not be null");
$assert(!isNaN(value), "illegal value"); $assert(!isNaN(value), "illegal value");
this._lowerLimit = value; this._lowerLimit = value;
}, },

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

@ -27,10 +27,10 @@ mindplot.ConnectionLine = new Class({
var strokeColor = mindplot.ConnectionLine.getStrokeColor(); var strokeColor = mindplot.ConnectionLine.getStrokeColor();
var line; var line;
var ctrlPoints = this._getCtrlPoints(sourceNode, targetNode);
if (targetNode.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { if (targetNode.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
line = this._createLine(lineType, mindplot.ConnectionLine.CURVED); line = this._createLine(lineType, mindplot.ConnectionLine.CURVED);
if (line.getType() == "CurvedLine") { if (line.getType() == "CurvedLine") {
var ctrlPoints = this._getCtrlPoints(sourceNode, targetNode);
line.setSrcControlPoint(ctrlPoints[0]); line.setSrcControlPoint(ctrlPoints[0]);
line.setDestControlPoint(ctrlPoints[1]); line.setDestControlPoint(ctrlPoints[1]);
} }
@ -38,11 +38,9 @@ mindplot.ConnectionLine = new Class({
} else { } else {
line = this._createLine(lineType, mindplot.ConnectionLine.SIMPLE_CURVED); line = this._createLine(lineType, mindplot.ConnectionLine.SIMPLE_CURVED);
if (line.getType() == "CurvedLine") { if (line.getType() == "CurvedLine") {
var ctrlPoints = this._getCtrlPoints(sourceNode, targetNode);
line.setSrcControlPoint(ctrlPoints[0]); line.setSrcControlPoint(ctrlPoints[0]);
line.setDestControlPoint(ctrlPoints[1]); line.setDestControlPoint(ctrlPoints[1]);
} }
// line = new web2d.PolyLine();
line.setStroke(1, 'solid', strokeColor); line.setStroke(1, 'solid', strokeColor);
} }

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

@ -333,8 +333,10 @@ mindplot.Designer = new Class({
$assert(targetTopic, "targetTopic can not be null"); $assert(targetTopic, "targetTopic can not be null");
// Create a new topic model ... // Create a new topic model ...
// @Todo: Model should not be modified from here ...
var mindmap = this.getMindmap(); var mindmap = this.getMindmap();
var model = mindmap.createRelationship(sourceTopic.getModel().getId(), targetTopic.getModel().getId()); var model = mindmap.createRelationship(sourceTopic.getModel().getId(), targetTopic.getModel().getId());
this._actionDispatcher.connectByRelation(model); this._actionDispatcher.connectByRelation(model);
}, },

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

@ -319,6 +319,8 @@ mindplot.Topic = new Class({
addIcon : function(iconType) { addIcon : function(iconType) {
var iconGroup = this.getOrBuildIconGroup(); var iconGroup = this.getOrBuildIconGroup();
this.closeEditors();
var model = this.getModel(); var model = this.getModel();
// Update model ... // Update model ...