Merge pull request #5166 from panda01/fix/embed-view

Fix embed view
This commit is contained in:
Khalah Jones Golden 2015-10-30 19:14:50 -04:00
commit c3c662e2ae
4 changed files with 10 additions and 4 deletions

View file

@ -28,6 +28,7 @@
<visualize ng-switch-when="visualization"
vis="savedObj.vis"
search-source="savedObj.searchSource"
show-spy-panel="chrome.getVisible()"
ui-state="uiState"
class="panel-content">
</visualize>

View file

@ -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" ui-state="uiState" search-source="savedVis.searchSource" editable-vis="editableVis"></visualize>
<visualize vis="vis" ui-state="uiState" show-spy-panel="chrome.getVisible()" search-source="savedVis.searchSource" editable-vis="editableVis"></visualize>
</div>
</div>

View file

@ -12,4 +12,4 @@
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>

View file

@ -16,6 +16,7 @@ define(function (require) {
return {
restrict: 'E',
scope : {
showSpyPanel: '=?',
vis: '=',
uiState: '=?',
searchSource: '=?',
@ -27,6 +28,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);