Browse Source

[notebook] Drop the code visibility toggle

Johan Ahlen 10 năm trước cách đây
mục cha
commit
efd310f

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

@@ -345,19 +345,8 @@
       $(document).trigger("toggleResultSettings", self);
     };
 
-    self.codeVisible = ko.observable(typeof snippet.codeVisible != "undefined" && snippet.codeVisible != null ? snippet.codeVisible : true);
     self.settingsVisible = ko.observable(typeof snippet.settingsVisible != "undefined" && snippet.settingsVisible != null ? snippet.settingsVisible : false);
 
-    // We need to refresh codemirror the first time it's shown if it's initially hidden otherwise it'll be blank
-    if (!self.codeVisible()) {
-      var subscription = self.codeVisible.subscribe(function(newVal) {
-        if (newVal) {
-          $(document).trigger("refreshCodeMirror", self);
-          subscription.dispose();
-        }
-      });
-    }
-
     self.checkStatusTimeout = null;
 
     self.getContext = function() {

+ 2 - 4
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -376,7 +376,6 @@ ${ require.config() }
     <a class="inactive-action" href="javascript:void(0)" data-bind="visible: status() != 'ready' && status() != 'loading' && errors().length == 0, click: function() { $data.showLogs(! $data.showLogs()); window.setTimeout(redrawFixedHeaders, 100); }, css: {'blue': $data.showLogs}" title="${ _('Show Logs') }"><i class="fa fa-file-text-o"></i></a>
     <span class="execution-timer" data-bind="visible: type() != 'text' && status() != 'ready' && status() != 'loading', text: result.executionTime().toHHMMSS()"></span>
     <a class="inactive-action move-widget" href="javascript:void(0)"><i class="fa fa-arrows"></i></a>
-    <a class="inactive-action" href="javascript:void(0)" data-bind="click: function(){ codeVisible(! codeVisible()) }, visible: type() != 'text'"><i class="fa" data-bind="css: {'fa-compress' : codeVisible, 'fa-expand' : ! codeVisible() }"></i></a>
     <a class="inactive-action" href="javascript:void(0)" data-bind="click: function(){ settingsVisible(! settingsVisible()) }, visible: hasProperties, css: { 'blue' : settingsVisible }"><i class="fa fa-cog"></i></a>
     <a class="inactive-action" href="javascript:void(0)" data-bind="click: function(){ $root.removeSnippet($parent, $data); }"><i class="fa fa-times"></i></a>
   </div>
@@ -386,7 +385,6 @@ ${ require.config() }
   <div class="hover-actions inline pull-right" style="font-size: 15px;">
     <a class="inactive-action" href="javascript:void(0)" data-bind="visible: status() != 'ready' && status() != 'loading' && errors().length == 0, click: function() { $data.showLogs(! $data.showLogs()); window.setTimeout(redrawFixedHeaders, 100); }, css: {'blue': $data.showLogs}" title="${ _('Show Logs') }"><i class="fa fa-file-text-o"></i></a>
     <span class="execution-timer" data-bind="visible: type() != 'text' && status() != 'ready' && status() != 'loading', text: result.executionTime().toHHMMSS()"></span>
-    <a class="inactive-action" href="javascript:void(0)" data-bind="click: function(){ codeVisible(! codeVisible()) }, visible: type() != 'text'"><i class="fa" data-bind="css: {'fa-compress' : codeVisible, 'fa-expand' : ! codeVisible() }"></i></a>
     <a class="inactive-action" href="javascript:void(0)" data-bind="click: function(){ settingsVisible(! settingsVisible()) }, visible: hasProperties, css: { 'blue' : settingsVisible }"><i class="fa fa-cog"></i></a>
   </div>
 </script>
@@ -400,7 +398,7 @@ ${ require.config() }
             <!-- ko template: { if: ! $root.editorMode, name: 'notebook-snippet-type-controls' } --><!-- /ko -->
             <!-- ko template: { if: ['text', 'markdown'].indexOf(type()) == -1, name: 'snippet-execution-controls' } --><!-- /ko -->
           </div>
-          <div class="snippet-body" data-bind="verticalSlide: codeVisible, clickForAceFocus: ace">
+          <div class="snippet-body" data-bind="clickForAceFocus: ace">
             <h5 class="card-heading-print" data-bind="text: name, css: {'visible': name() != ''}"></h5>
 
             <h2 style="margin-left:5px;padding: 3px 0" class="card-heading simple" data-bind="dblclick: function(){ $parent.newSnippetAbove(id()) }, clickForAceFocus: ace">
@@ -718,7 +716,7 @@ ${ require.config() }
 
 
 <script type="text/html" id="executable-snippet-body">
-  <div data-bind="verticalSlide: codeVisible" style="padding:10px;">
+  <div style="padding:10px;">
     <form class="form-horizontal">
       <!-- ko if: type() == 'jar' -->
       <div class="control-group">