From 4c94f44f3cdb92a35b45112cb656a4a8296cc9bf Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 21 Sep 2014 18:34:27 -0300 Subject: [PATCH] replace old event.control and event.meta by event.ctrlKey and event.metaKey --- mindplot/src/main/javascript/Designer.js | 2 +- mindplot/src/main/javascript/DragTopic.js | 2 +- mindplot/src/main/javascript/Topic.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js index a52489dd..45ee8011 100644 --- a/mindplot/src/main/javascript/Designer.js +++ b/mindplot/src/main/javascript/Designer.js @@ -321,7 +321,7 @@ mindplot.Designer = new Class({ var objects = model.getEntities(); _.each(objects, function(object) { // Disable all nodes on focus but not the current if Ctrl key isn't being pressed - if (!$defined(event) || (!event.control && !event.meta)) { + if (!$defined(event) || (!event.ctrlKey && !event.metaKey)) { if (object.isOnFocus() && object != currentObject) { object.setOnFocus(false); } diff --git a/mindplot/src/main/javascript/DragTopic.js b/mindplot/src/main/javascript/DragTopic.js index 41abb001..d083aff7 100644 --- a/mindplot/src/main/javascript/DragTopic.js +++ b/mindplot/src/main/javascript/DragTopic.js @@ -67,7 +67,7 @@ mindplot.DragTopic = new Class({ }, updateFreeLayout:function (event) { - var isFreeEnabled = (event.meta && Browser.Platform.mac) || (event.control && !Browser.Platform.mac); + var isFreeEnabled = (event.metaKey && Browser.Platform.mac) || (event.ctrlKey && !Browser.Platform.mac); if (this.isFreeLayoutOn() != isFreeEnabled) { var dragPivot = this._getDragPivot(); dragPivot.setVisibility(!isFreeEnabled); diff --git a/mindplot/src/main/javascript/Topic.js b/mindplot/src/main/javascript/Topic.js index 661b439f..5d75bb47 100644 --- a/mindplot/src/main/javascript/Topic.js +++ b/mindplot/src/main/javascript/Topic.js @@ -581,7 +581,7 @@ mindplot.Topic = new Class({ if (!this.isReadOnly()) { // Disable topic selection of readOnly mode ... var value = true; - if ((event.meta && Browser.Platform.mac) || (event.control && !Browser.Platform.mac)) { + if ((event.metaKey && Browser.Platform.mac) || (event.ctrlKey && !Browser.Platform.mac)) { value = !this.isOnFocus(); event.stopPropagation(); event.preventDefault();