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

[editor] Add line numbers to the code editor

Johan Ahlen 10 жил өмнө
parent
commit
8fdf151

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/ace/theme-hue.js


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

@@ -1773,6 +1773,7 @@
       var options = ko.unwrap(valueAccessor());
       var snippet = options.snippet;
       var assistHelper = snippet.getAssistHelper();
+      var aceOptions = options.aceOptions || {};
 
       $el.text(snippet.statement_raw());
 
@@ -1814,8 +1815,7 @@
         maxLines: 25
       };
 
-      var userOptions = $.totalStorage("hue.ace.options") || {};
-      $.extend(editorOptions, userOptions);
+      $.extend(editorOptions, aceOptions);
 
       editor.setOptions(editorOptions);
 

+ 0 - 4
desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css

@@ -93,10 +93,6 @@ body {
   border-radius: 0;
 }
 
-.ace_gutter {
-  background: #F1F1F1;
-}
-
 .snippet-left-bar {
   position:absolute;
   display:inline-block;

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

@@ -481,7 +481,11 @@ ${ require.config() }
     <div class="editor span12" data-bind="clickForAceFocus: ace">
       <div class="ace-editor" data-bind="css: {'active-editor': inFocus }, attr: { id: id() }, delayedOverflow, aceEditor: {
           snippet: $data,
-          openIt: '${ _ko("Alt or Ctrl + Click to open it") }'
+          openIt: '${ _ko("Alt or Ctrl + Click to open it") }',
+          aceOptions: {
+            showLineNumbers: $root.editorMode,
+            showGutter: $root.editorMode
+          }
         }"></div>
       </div>
     <div class="clearfix"></div>

+ 20 - 0
tools/ace-editor/lib/ace/theme/hue.css

@@ -78,6 +78,26 @@
   color: #3E999F
 }
 
+.ace_gutter {
+  background: #F1F1F1;
+}
+
+.ace_gutter > .ace_layer {
+  width: 41px !important;
+  border-left: 1px solid #DBE8F1;
+  color: #737373;
+}
+
+.ace_gutter-cell.ace_error {
+  background-color: #f2dede;
+  border-left:1px solid #eed3d7;
+  background-image: none !important;
+}
+
+.ace_gutter_cell {
+  padding-left: 10px !important;
+}
+
 .ace-hue .ace_constant.ace_character,
 .ace-hue .ace_constant.ace_language,
 .ace-hue .ace_constant.ace_numeric,

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно