Merge pull request #5339 from epixa/backport-pr-5166

Backport pull request #5166
elastic · Nov 5, 2015 · 6829404 · 6829404
2 parents 05628ab + 3979f0f
commit 6829404
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.html b/src/plugins/kibana/public/dashboard/components/panel/panel.html
@@ -28,6 +28,7 @@
   <visualize ng-switch-when="visualization"
     vis="savedObj.vis"
     search-source="savedObj.searchSource"
+    show-spy-panel="chrome.getVisible()"
     class="panel-content">
   </visualize>
 

diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -126,8 +126,8 @@
 
   <div class="vis-editor-content">
 
-    <div class="collapsible-sidebar">
-        <vis-editor-sidebar class="vis-editor-sidebar" ng-if="chrome.getVisible()"></vis-editor-sidebar>
+    <div class="collapsible-sidebar" ng-if="chrome.getVisible()">
+        <vis-editor-sidebar class="vis-editor-sidebar"></vis-editor-sidebar>
     </div>
 
     <div class="vis-editor-canvas" ng-class="{ embedded: !chrome.getVisible() }">
@@ -138,7 +138,7 @@
         </div>
       </div>
 
-      <visualize vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
+      <visualize show-spy-panel="chrome.getVisible()" vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
     </div>
   </div>
 

diff --git a/src/ui/public/visualize/visualize.html b/src/ui/public/visualize/visualize.html
@@ -11,4 +11,4 @@ <h4>No results found</h4>
   ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
   class="visualize-chart"></div>
 <!-- <pre>{{chartData | json}}</pre> -->
-<visualize-spy ng-if="vis.type.requiresSearch"></visualize-spy>
+<visualize-spy ng-if="vis.type.requiresSearch && showSpyPanel"></visualize-spy>
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
@@ -16,6 +16,7 @@ define(function (require) {
     return {
       restrict: 'E',
       scope : {
+        showSpyPanel: '=?',
         vis: '=',
         editableVis: '=?',
         esResp: '=?',
@@ -26,6 +27,10 @@ define(function (require) {
         var chart; // set in "vis" watcher
         var minVisChartHeight = 180;
 
+        if (_.isUndefined($scope.showSpyPanel)) {
+          $scope.showSpyPanel = true;
+        }
+
         function getter(selector) {
           return function () {
             var $sel = $el.find(selector);