Эх сурвалжийг харах

HUE-8041 [editor] Editing a long saved query after a reload shouldn't expand the editor automatically

Enrico Berti 7 жил өмнө
parent
commit
ba0cddaeeb

+ 2 - 2
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -2150,7 +2150,7 @@
   ko.bindingHandlers.aceResizer = {
     init: function (element, valueAccessor) {
       var options = ko.unwrap(valueAccessor());
-      var ace = options.ace;
+      var ace = options.snippet.ace;
       var $target = $(options.target);
       var $resizer = $(element);
       var $contentPanel = $(".content-panel");
@@ -2160,7 +2160,7 @@
       var lastEditorSize = $.totalStorage('hue.editor.editor.size') || 131;
       var editorHeight = Math.floor(lastEditorSize / 16);
       $target.height(lastEditorSize);
-      var autoExpand = true;
+      var autoExpand = typeof options.snippet.aceAutoExpand !== 'undefined' ? options.snippet.aceAutoExpand : true;
       var draggedOnce = false;
 
       function throttleChange() {

+ 1 - 0
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -3270,6 +3270,7 @@ var EditorViewModel = (function() {
           notebook.snippets()[0].queries(currentQueries);
         }
         notebook.snippets().forEach(function (snippet) {
+          snippet.aceAutoExpand = false;
           snippet.statement_raw.valueHasMutated();
           if (snippet.result.handle().statements_count > 1 && snippet.result.handle().start != null && snippet.result.handle().end != null) {
             var aceLineOffset = snippet.result.handle().aceLineOffset || 0;

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1728,7 +1728,7 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
 </script>
 
 <script type="text/html" id="snippet-code-resizer${ suffix }">
-  <div class="snippet-code-resizer" data-bind="aceResizer : { ace: ace, target: '.ace-container-resizable', onStart: hideFixedHeaders, onStop: redrawFixedHeaders }">
+  <div class="snippet-code-resizer" data-bind="aceResizer : { snippet: $data, target: '.ace-container-resizable', onStart: hideFixedHeaders, onStop: redrawFixedHeaders }">
     <i class="fa fa-ellipsis-h"></i>
   </div>
 </script>