From 291d9c99ab72a87c14a9e3c8db79d16a041fc56b Mon Sep 17 00:00:00 2001 From: Vitalii Parfonov Date: Thu, 25 Oct 2018 20:38:24 +0300 Subject: [PATCH] Use styled dialog instead of browser pop-up for goto file in compare widget Signed-off-by: Vitalii Parfonov --- .../code_edit/built-codeEdit-amd.js | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js b/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js index a57579e1..a5b2ea3f 100644 --- a/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js +++ b/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js @@ -30972,13 +30972,26 @@ define("orion/editor/actions", [ //$NON-NLS-0$ var editor = this.editor; var model = editor.getModel(); var line = model.getLineAtOffset(editor.getCaretOffset()); - line = prompt(messages.gotoLinePrompty, line + 1); - if (line) { - line = parseInt(line, 10); - editor.onGotoLine(line - 1, 0); - } - return true; - }, + + if (window["promptIdeCompareWidget"]) { + window["promptIdeCompareWidget"](messages.gotoLine, messages.gotoLinePrompty, line + 1, + function(value) { + if (!value) return; + if (value) { + value = parseInt(value, 10); + editor.onGotoLine(value - 1, 0); + return; + } + }); + } else { + line = prompt(messages.gotoLinePrompty, line + 1); + if (line) { + line = parseInt(line, 10); + editor.onGotoLine(line - 1, 0); + } + } + return true; + }, moveLinesDown: function() { var editor = this.editor; var textView = editor.getTextView();