Skip to content

Commit

Permalink
remove reference to local application service in graph (#64288) (#64405)
Browse files Browse the repository at this point in the history
  • Loading branch information
flash1293 authored Apr 24, 2020
1 parent b57d022 commit 742ef2f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
6 changes: 6 additions & 0 deletions x-pack/plugins/graph/public/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@
-webkit-touch-callout: none;
-webkit-tap-highlight-color: transparent;
}

.gphAppWrapper {
display: flex;
flex-direction: column;
flex-grow: 1;
}
6 changes: 3 additions & 3 deletions x-pack/plugins/graph/public/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies)
};
};

const mainTemplate = (basePath: string) => `<div ng-view class="kbnLocalApplicationWrapper">
const mainTemplate = (basePath: string) => `<div ng-view class="gphAppWrapper">
<base href="${basePath}" />
</div>
`;
Expand All @@ -107,14 +107,14 @@ const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react', 'ui.boo

function mountGraphApp(appBasePath: string, element: HTMLElement) {
const mountpoint = document.createElement('div');
mountpoint.setAttribute('class', 'kbnLocalApplicationWrapper');
mountpoint.setAttribute('class', 'gphAppWrapper');
// eslint-disable-next-line
mountpoint.innerHTML = mainTemplate(appBasePath);
// bootstrap angular into detached element and attach it later to
// make angular-within-angular possible
const $injector = angular.bootstrap(mountpoint, [moduleName]);
element.appendChild(mountpoint);
element.setAttribute('class', 'kbnLocalApplicationWrapper');
element.setAttribute('class', 'gphAppWrapper');
return $injector;
}

Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/graph/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@
@import './main';
@import './angular/templates/index';
@import './components/index';
// Local application mount wrapper styles
@import 'src/legacy/core_plugins/kibana/public/local_application_service/index';

0 comments on commit 742ef2f

Please sign in to comment.