From 0ffcbe39b7ab249a1c19ecc7a916fed02e90a019 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Fri, 2 May 2014 15:26:17 -0300 Subject: [PATCH] WISE-225 fixed --- mindplot/src/main/javascript/ControlPoint.js | 4 ++-- mindplot/src/main/javascript/Relationship.js | 2 +- mindplot/src/main/javascript/RelationshipPivot.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mindplot/src/main/javascript/ControlPoint.js b/mindplot/src/main/javascript/ControlPoint.js index 99c08e3c..85eff850 100644 --- a/mindplot/src/main/javascript/ControlPoint.js +++ b/mindplot/src/main/javascript/ControlPoint.js @@ -106,7 +106,7 @@ mindplot.ControlPoint = new Class({ this._workspace.getScreenManager().addEvent('mouseup', this._mouseUpFunction); } event.preventDefault(); - event.stop(); + event.stopPropagation(); return false; }, @@ -143,7 +143,7 @@ mindplot.ControlPoint = new Class({ _mouseClick : function(event) { event.preventDefault(); - event.stop(); + event.stopPropagation(); return false; }, diff --git a/mindplot/src/main/javascript/Relationship.js b/mindplot/src/main/javascript/Relationship.js index ee87ce9c..3b9dd065 100644 --- a/mindplot/src/main/javascript/Relationship.js +++ b/mindplot/src/main/javascript/Relationship.js @@ -325,6 +325,6 @@ mindplot.Relationship = new Class({ fireEvent:function (type, event) { var elem = this._line2d; - elem.fireEvent(type, event); + elem.trigger(type, event); } }); diff --git a/mindplot/src/main/javascript/RelationshipPivot.js b/mindplot/src/main/javascript/RelationshipPivot.js index 0d7c1ca7..d869f2c2 100644 --- a/mindplot/src/main/javascript/RelationshipPivot.js +++ b/mindplot/src/main/javascript/RelationshipPivot.js @@ -23,6 +23,7 @@ mindplot.RelationshipPivot = new Class({ this._workspace = workspace; this._designer = designer; + //FIXME: the aim of the migration is remove .bind mootools method, please remove these! this._mouseMoveEvent = this._mouseMove.bind(this); this._onClickEvent = this._cleanOnMouseClick.bind(this); this._onTopicClick = this._connectOnFocus.bind(this); @@ -139,7 +140,7 @@ mindplot.RelationshipPivot = new Class({ return mindplot.util.Shape.calculateRelationShipPointCoordinates(this._sourceTopic, spoint); }, - _connectOnFocus:function (targetTopic) { + _connectOnFocus:function (event, targetTopic) { var sourceTopic = this._sourceTopic; var mindmap = this._designer.getMindmap();