From 30a1e12ad7a83b38a3abcfc6964f302efbff86f3 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Wed, 9 Jan 2019 21:22:40 +0100 Subject: [PATCH] added ".CodeMirror-line" to draggable() cancel operation so that no drag operation is performed over any matchbrackets highlighted text. This fixes #534. --- .../patches/occu/0046-WebUI-ImprovedScriptEditor.patch | 2 +- .../occu/WebUI/www/webui/webui.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor.patch b/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor.patch index 9a84060444..13fdce750b 100644 --- a/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor.patch +++ b/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor.patch @@ -1058,7 +1058,7 @@ if (this.draggable) { - jQuery("#messagebox").draggable(); + jQuery("#messagebox").draggable({ -+ cancel: "input,textarea,button,select,option,.FooterButton,.StdButton,.CodeMirror" ++ cancel: "input,textarea,button,select,option,.FooterButton,.StdButton,.CodeMirror,.CodeMirror-line" + }); } diff --git a/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor/occu/WebUI/www/webui/webui.js b/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor/occu/WebUI/www/webui/webui.js index 72398ee85e..c975143d94 100755 --- a/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor/occu/WebUI/www/webui/webui.js +++ b/buildroot-external/patches/occu/0046-WebUI-ImprovedScriptEditor/occu/WebUI/www/webui/webui.js @@ -22665,7 +22665,7 @@ iseMessageBox.prototype = if (this.draggable) { jQuery("#messagebox").draggable({ - cancel: "input,textarea,button,select,option,.FooterButton,.StdButton,.CodeMirror" + cancel: "input,textarea,button,select,option,.FooterButton,.StdButton,.CodeMirror,.CodeMirror-line" }); }